Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Keller2015-08-20 08:07:13 -0400
committerMarkus Keller2015-08-20 08:08:31 -0400
commit803fb88bedb715be74bcaf9f1b3b963194a5521b (patch)
treedb9b94a2ed3b1c4969ce8683ed4f33b46d87aaf4 /org.eclipse.equinox.p2.releng
parentcaf5d6251236bdbd1de6ac66dcd47ff9976ab5ef (diff)
downloadrt.equinox.p2-803fb88bedb715be74bcaf9f1b3b963194a5521b.tar.gz
rt.equinox.p2-803fb88bedb715be74bcaf9f1b3b963194a5521b.tar.xz
rt.equinox.p2-803fb88bedb715be74bcaf9f1b3b963194a5521b.zip
Bug 471835 - Build succeeds, even when "old" parent pom is referred to
Change-Id: I746df8fc1343b4f3baae8d0a218d670d09d3825d Signed-off-by: Markus Keller <markus_keller@ch.ibm.com>
Diffstat (limited to 'org.eclipse.equinox.p2.releng')
-rw-r--r--org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/pom.xml65
1 files changed, 36 insertions, 29 deletions
diff --git a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/pom.xml b/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/pom.xml
index 0de70fc0b..f1ccf4492 100644
--- a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/pom.xml
+++ b/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/pom.xml
@@ -28,34 +28,41 @@
<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/equinox/rt.equinox.p2.git</tycho.scmUrl>
</properties>
- <repositories>
- <repository>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>eclipse-hosted</id>
- <url>https://repo.eclipse.org/content/repositories/eclipse/</url>
- </repository>
- </repositories>
-
-
- <profiles>
- <profile>
- <id>osx</id>
- <activation>
- <property>
- <name>java.vendor.url</name>
- <value>http://www.apple.com/</value>
- </property>
- </activation>
- <properties>
- <tycho.test.jvmArgs>-Xmx800m -XX:MaxPermSize=256m -Dosgi.ws=cocoa -XstartOnFirstThread</tycho.test.jvmArgs>
- <osgi.ws>cocoa</osgi.ws>
- </properties>
- </profile>
- </profiles>
+ <!--
+ To build individual bundles, we specify a repository where to find parent pom,
+ in case it is not in local maven cache already
+ and that parent pom also has fuller individual-bundle profile
+ defined that is combined with this one. -->
+ <profiles>
+ <profile>
+ <id>build-individual-bundles</id>
+ <repositories>
+ <repository>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <id>eclipse-hosted</id>
+ <url>https://repo.eclipse.org/content/repositories/eclipse/</url>
+ </repository>
+ </repositories>
+ </profile>
+
+ <profile>
+ <id>osx</id>
+ <activation>
+ <property>
+ <name>java.vendor.url</name>
+ <value>http://www.apple.com/</value>
+ </property>
+ </activation>
+ <properties>
+ <tycho.test.jvmArgs>-Xmx800m -XX:MaxPermSize=256m -Dosgi.ws=cocoa -XstartOnFirstThread</tycho.test.jvmArgs>
+ <osgi.ws>cocoa</osgi.ws>
+ </properties>
+ </profile>
+ </profiles>
</project>

Back to the top