Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2016-09-30 15:40:34 -0400
committerAlexander Kurtakov2016-09-30 15:40:34 -0400
commit925a7de7fc98f997653b7676c3f6c94edeb451c8 (patch)
tree397037ab0ed364a433e4c942c7ea8639a802006e
parent22923955066b9cb4fdd61f87a7d77426e3410f67 (diff)
downloadeclipse.platform.releng.aggregator-925a7de7fc98f997653b7676c3f6c94edeb451c8.tar.gz
eclipse.platform.releng.aggregator-925a7de7fc98f997653b7676c3f6c94edeb451c8.tar.xz
eclipse.platform.releng.aggregator-925a7de7fc98f997653b7676c3f6c94edeb451c8.zip
Bug 502962 - Activate build-individual-bundles profile automatically
The only case when bulid-individual-bundles shouldn't be enables is when doing aggregator build (aka full build). For any other place to start building some module one needs this profile enabled as otherwise the build fails with resolution problems. It would also happen new comers who will be able to clone e.g. platform.ui git repo and 'mvn clean verify' will work instead of the current situation where one has to find out the magical -Pbuild-individual-bundles to make it work. Change-Id: Ifb6d990232ca3409eeb257c6092688d0e83eb91f Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
-rw-r--r--eclipse-platform-parent/pom.xml8
-rw-r--r--pom.xml6
2 files changed, 12 insertions, 2 deletions
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index af1feb89..c05c3181 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2014 Eclipse Foundation and others.
+ Copyright (c) 2012, 2016 Eclipse Foundation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
@@ -680,6 +680,12 @@ No need to specify sonatype URL for "Tycho". released versions available on mave
</profile>
<profile>
<id>build-individual-bundles</id>
+ <activation>
+ <property>
+ <!-- Enable if aggregatorBuild property is not set -->
+ <name>!aggregatorBuild</name>
+ </property>
+ </activation>
<properties>
<!--
This eclipse-p2-repo.url is specifically for the build individual bundles profile and Gerrit jobs.
diff --git a/pom.xml b/pom.xml
index 651bdc5c..a3f47a4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2014 Eclipse Foundation.
+ Copyright (c) 2012, 2016 Eclipse Foundation.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
@@ -20,6 +20,10 @@
<artifactId>platform-aggregator</artifactId>
<version>4.7.0-SNAPSHOT</version>
<packaging>pom</packaging>
+ <properties>
+ <!--Property used in parent pom which if defined disables activation of build-individual-bundles profile -->
+ <aggregatorBuild>true</aggregatorBuild>
+ </properties>
<modules>

Back to the top