3:38 a.m.
Author: mickael_istria
Date: 2012-09-18 04:38:25 -0400 (Tue, 18 Sep 2012)
New Revision: 43785
Modified:
trunk/build/parent/pom.xml
Log:
JBIDE-12565: update profiles in parent pom.
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2012-09-18 08:05:25 UTC (rev 43784)
+++ trunk/build/parent/pom.xml 2012-09-18 08:38:25 UTC (rev 43785)
@@ -21,10 +21,10 @@
<memoryOptions2>-XX:MaxPermSize=256m</memoryOptions2>
<systemProperties></systemProperties>
<platformSystemProperties></platformSystemProperties>
- <applejdkProperties></applejdkProperties>
-
+ <applejdkProperties></applejdkProperties>
+
<maven.antrun.plugin.version>1.3</maven.antrun.plugin.version>
-
+
<swtbot.test.skip>true</swtbot.test.skip>
<!-- Used to install 3rd-party runtimes for testing -->
<skipRequirements>${skipTests}</skipRequirements>
@@ -33,15 +33,10 @@
<skipPrivateRequirements>true</skipPrivateRequirements>
<requirementsDirectory>${project.build.directory}/requirements</requirementsDirectory>
<!-- Tests Timeout in seconds -->
- <surefire.timeout>2400</surefire.timeout>
+ <surefire.timeout>2400</surefire.timeout>
<!-- Default coverage filter, to be overriden when necessary -->
<coverage.filter>org.jboss.tools.*</coverage.filter>
- <!-- target files available for building: multiple sites, 1 unified site,
- 1 local mirrored site -->
- <target.platform.classifier.unified>unified</target.platform.classifier.unified>
- <target.platform.classifier.local>local</target.platform.classifier.local>
-
<!-- 1a. URL of latest JBT target platform site -->
<jbosstools-target-site>http://download.jboss.org/jbosstools/updates/ta...
@@ -50,7 +45,7 @@
<!-- TODO: see also 'hudson' profile below for other default value -->
<local.site>file:///${user.home}/.m2/jbosstools-target-platform_4.0.juno.SR0a/</local.site>
- <!-- 2a. URL of latest JBT nightly staging composite site (all the components
+ <!-- 2a. URL of latest JBT nightly staging composite site (all the components
in once place) -->
<!-- for trunk use _composite_/trunk; for 4.0_stable_branch, use
_composite_/4.0.juno -->
<jbosstools-nightly-staging-composite>http://download.jboss.org/jbossto...
@@ -70,7 +65,7 @@
<!-- 3b., or use -Plocal.requirements
-Dlocal.requirements=file:///path/to/mirror/of/composite/requirements/site -->
<local.requirements>file:///qa/services/http/binaries/RHDS/updates/juno/</local.requirements>
- <!-- 4. published aggregate update sites go here, for consumption by QE
+ <!-- 4. published aggregate update sites go here, for consumption by QE
and downstream JBDS builds -->
<jbosstools-nightly>http://download.jboss.org/jbosstools/updates/nightl...
<jbosstools-nightly-tests>http://download.jboss.org/jbosstools/updates/...
@@ -81,9 +76,9 @@
<!-- 5. extra requirements (for 3rd party "Extras" site) -->
<jboss-requirements-composite-extras-mirror>http://download.jboss.org/j...
- <!-- JBIDE-12294, JBIDE-12629 latest stable build of m2e, m2e-wtp, and m2e-apt for
use with JBDS product builds -->
+ <!-- JBIDE-12294, JBIDE-12629 latest stable build of m2e, m2e-wtp, and m2e-apt for
use with JBDS product builds -->
<m2e>http://download.jboss.org/jbosstools/updates/requirements/m2eclips...
-
+
</properties>
<build>
@@ -179,9 +174,9 @@
</environments>
</configuration>
</plugin>
-
- <!-- to skip running tests (compile only) use commandline flag: -Dmaven.test.skip
- To allow all tests in a pom to pass/fail, use commandline flag: -fae (fail
+
+ <!-- to skip running tests (compile only) use commandline flag: -Dmaven.test.skip
+ To allow all tests in a pom to pass/fail, use commandline flag: -fae (fail
at end) -->
<plugin>
<groupId>org.eclipse.tycho</groupId>
@@ -197,7 +192,7 @@
<!-- set useUIThread=true for regular ui tests -->
<!-- set useUIThread=false for swtbot tests -->
- <!-- TODO: add new profile to permit running against JBDS product/application
+ <!-- TODO: add new profile to permit running against JBDS product/application
for JBDS tests, against Eclipse SDK for JBT -->
<product>org.eclipse.platform.ide</product>
<application>org.eclipse.ui.ide.workbench</application>
@@ -281,10 +276,10 @@
</executions>
</plugin>
</plugins>
-
+
<pluginManagement>
<plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only.
+ <!--This plugin's configuration is used to store Eclipse m2e settings only.
It has no influence on the Maven build itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
@@ -304,9 +299,9 @@
</goals>
</pluginExecutionFilter>
<action>
- <!-- m2e doesn't know what to do with
jacoco,
+ <!-- m2e doesn't know what to do with
jacoco,
let's ignore it or annoying error markers
appear
- see
http://wiki.eclipse.org/M2E_plugin_execution_not_covered
+ see
http://wiki.eclipse.org/M2E_plugin_execution_not_covered
-->
<ignore></ignore>
</action>
@@ -334,7 +329,7 @@
</configuration>
</plugin>
</plugins>
- </pluginManagement>
+ </pluginManagement>
</build>
<scm>
@@ -353,13 +348,13 @@
<profiles>
- <!-- Latest JBT work-in-progress component builds (CI builds), not yet
+ <!-- Latest JBT work-in-progress component builds (CI builds), not yet
pushed to the above nightly update site -->
<!-- disabled by default because it causes local compilation problems -->
<profile>
<id>jbosstools-nightly-staging-composite</id>
<activation>
- <!-- JBIDE-11663 disable automatic enablement when swtbot.test.skip = false
+ <!-- JBIDE-11663 disable automatic enablement when swtbot.test.skip = false
<property>
<name>swtbot.test.skip</name>
<value>false</value>
@@ -383,7 +378,7 @@
<profile>
<id>jbosstools-nightly-staging-composite-soa-tooling</id>
<activation>
- <!-- JBIDE-11663 disable automatic enablement when swtbot.test.skip = false
+ <!-- JBIDE-11663 disable automatic enablement when swtbot.test.skip = false
<property>
<name>swtbot.test.skip</name>
<value>false</value>
@@ -411,7 +406,7 @@
<profile>
<id>jbosstools-staging-aggregate</id>
<activation>
- <!-- JBIDE-11663 disable automatic enablement when swtbot.test.skip = false
+ <!-- JBIDE-11663 disable automatic enablement when swtbot.test.skip = false
<property>
<name>swtbot.test.skip</name>
<value>false</value>
@@ -444,7 +439,7 @@
</repositories>
</profile>
- <!-- same contents as jboss-requirements-composite-mirror, but locally
+ <!-- same contents as jboss-requirements-composite-mirror, but locally
available (to improve network lag) -->
<profile>
<id>local.requirements</id>
@@ -466,7 +461,7 @@
</repositories>
</profile>
- <!-- same contents as jbosstools-nightly-staging-composite, but locally
+ <!-- same contents as jbosstools-nightly-staging-composite, but locally
available (to improve network lag) -->
<profile>
<id>local.composite</id>
@@ -488,10 +483,10 @@
</repositories>
</profile>
- <!-- Contains all the Eclipse.org deps, mirrored onto download.jboss.org.
- This is the superset of sites from which the TP is created. Should be disabled
+ <!-- Contains all the Eclipse.org deps, mirrored onto download.jboss.org.
+ This is the superset of sites from which the TP is created. Should be disabled
closer to GA so we're only using the TP contents exclusively. -->
- <!-- deactivated by default, because target platform should be enough to
+ <!-- deactivated by default, because target platform should be enough to
compile everything -->
<profile>
<id>jboss-requirements-composite-mirror</id>
@@ -513,7 +508,7 @@
</repositories>
</profile>
- <!-- Contains all the Third Party Extras deps. This is the superset of
+ <!-- Contains all the Third Party Extras deps. This is the superset of
sites from which the JBDS Extras site is created. -->
<profile>
<id>jboss-requirements-composite-extras-mirror</id>
@@ -535,8 +530,33 @@
</repositories>
</profile>
- <!-- Target platform file pointing at a single update site from which to
- resolve. See unified.site if you want to resolve against a site w/o using
+ <!-- Target platform file pointing at the composite target platform
+ AKA multiple.target -->
+ <profile>
+ <id>multiple.target</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <target>
+ <artifact>
+ <groupId>org.jboss.tools.target-platforms</groupId>
+ <artifactId>multiple</artifactId>
+ <version>${JBT_VERSION}.${BUILD_ALIAS}-SNAPSHOT</version>
+ <classifier>multiple</classifier>
+ </artifact>
+ </target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- Target platform file pointing at a single update site from which to
+ resolve. See unified.site if you want to resolve against a site w/o using
the unified.target file -->
<profile>
<id>unified.target</id>
@@ -549,10 +569,10 @@
<configuration>
<target>
<artifact>
- <groupId>org.jboss.tools</groupId>
- <artifactId>org.jboss.tools.target.platform</artifactId>
+ <groupId>org.jboss.tools.target-platforms</groupId>
+ <artifactId>unified</artifactId>
<version>${JBT_VERSION}.${BUILD_ALIAS}-SNAPSHOT</version>
- <classifier>${target.platform.classifier.unified}</classifier>
+ <classifier>unified</classifier>
</artifact>
</target>
</configuration>
@@ -561,12 +581,12 @@
</build>
</profile>
- <!-- To use this profile, must have first created a local.target file,
- which points to a local repo. You can do this by hand or generate it from
- multiple.target using: cd ~/trunk/build/target-platform; ant See also the
- README in target-platform/ folder for additional usage examples. You can
- also run `ant help`. If you want to build the target-platform/pom.xml AND
- generate a local repo + local.target file ALL AT THE SAME TIME, you can do:
+ <!-- To use this profile, must have first created a local.target file,
+ which points to a local repo. You can do this by hand or generate it from
+ multiple.target using: cd ~/trunk/build/target-platform; ant See also the
+ README in target-platform/ folder for additional usage examples. You can
+ also run `ant help`. If you want to build the target-platform/pom.xml AND
+ generate a local repo + local.target file ALL AT THE SAME TIME, you can do:
mvn clean install -Pget.local.target -f /path/to/target-platform/pom.xml -->
<profile>
<id>local.target</id>
@@ -579,10 +599,10 @@
<configuration>
<target>
<artifact>
- <groupId>org.jboss.tools</groupId>
- <artifactId>org.jboss.tools.target.platform</artifactId>
+ <groupId>org.jboss.tools.target-platofms</groupId>
+ <artifactId>local</artifactId>
<version>${JBT_VERSION}.${BUILD_ALIAS}-SNAPSHOT</version>
- <classifier>${target.platform.classifier.local}</classifier>
+ <classifier>local</classifier>
</artifact>
</target>
</configuration>
@@ -591,8 +611,8 @@
</build>
</profile>
- <!-- if you have a local repo mirror of the unified.site, you can use this
- profile with the -Dlocal.site=file:///path/to/repo to resolve dependencies
+ <!-- if you have a local repo mirror of the unified.site, you can use this
+ profile with the -Dlocal.site=file:///path/to/repo to resolve dependencies
without needing to use a local.site file -->
<profile>
<id>local.site</id>
@@ -656,7 +676,7 @@
</repository>
</repositories>
</profile>
-
+
<profile>
<id>hudson</id>
<activation>
@@ -887,7 +907,7 @@
<id>jboss-staging-repository</id>
<name>JBoss Staging Repository</name>
<uniqueVersion>false</uniqueVersion>
- <url>https://repository.jboss.org/nexus/content/groups/staging/</url...
+ <url>https://repository.jboss.org/nexus/content/groups/staging/</url...
</repository>
</distributionManagement>
</project>