Author: nickboldt Date: 2012-10-11 16:19:13 -0400 (Thu, 11 Oct 2012) New Revision: 44443 Modified: trunk/build/parent/pom.xml Log: add maximum profile; remove jboss-requirements-composite-mirror profile as it's the same as jbosstools-target-site now; switch osx profile to use nested unified.target instead of jbosstools-target-site repo Modified: trunk/build/parent/pom.xml =================================================================== --- trunk/build/parent/pom.xml 2012-10-11 20:19:06 UTC (rev 44442) +++ trunk/build/parent/pom.xml 2012-10-11 20:19:13 UTC (rev 44443) @@ -38,11 +38,15 @@ <!-- Default coverage filter, to be overriden when necessary --> <coverage.filter>org.jboss.tools.*</coverage.filter> + <!-- to build with the minimum TP, use -Punified.target (on by default); to build with the maximum TP, use -Pmaximum --> + <!-- when building/testing components, use minumum TP --> <targetPlatformGroup>jbosstools-JunoSR0b</targetPlatformGroup> + <!-- building/testing aggregate sites & installers, use maximum TP --> + <!-- TODO: don't forget to update this in ../aggregate/*/associate.properties too (5 files)! --> + <targetPlatformGroup-maximum>jbosstools-JunoSR1</targetPlatformGroup-maximum> <!-- 1a. URL of latest JBT target platform site --> - <!-- minimum TP: use http://download.jboss.org/jbosstools/updates/juno/SR0b/latest/ --> - <!-- latest TP: use http://download.jboss.org/jbosstools/updates/juno/SR1/latest/ --> + <!-- deprecated variable: latest minimum TP (now defined within the unified.target pom) --> <jbosstools-target-site>http://download.jboss.org/jbosstools/updates/ju... <!-- 1b. or use -Plocal.site -Dlocal.site=file:///${HOME}/trunk/build/target-platform/REPO/ --> @@ -64,7 +68,6 @@ <!-- 3a. URL of latest JBT requirements composite mirror --> <!-- TODO: don't forget to update this in ../aggregate/*/associate.properties too (5 files)! --> - <jboss-requirements-composite-mirror>http://download.jboss.org/jbosstoo... <jboss-requirements-composite-soa-tooling-mirror>http://download.jboss.... <!-- 3b., or use -Plocal.requirements -Dlocal.requirements=file:///path/to/mirror/of/composite/requirements/site --> @@ -438,7 +441,7 @@ </repositories> </profile> - <!-- same contents as jboss-requirements-composite-mirror, but locally + <!-- same contents as jbosstools-target-site, but locally available (to improve network lag) --> <profile> <id>local.requirements</id> @@ -482,31 +485,6 @@ </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 - closer to GA so we're only using the TP contents exclusively. --> - <!-- deactivated by default, because target platform should be enough to - compile everything --> - <profile> - <id>jboss-requirements-composite-mirror</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <repositories> - <repository> - <id>jboss-requirements-composite-mirror</id> - <url>${jboss-requirements-composite-mirror}</url> - <layout>p2</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - </repositories> - </profile> - <!-- Contains all the Third Party Extras deps. This is the superset of sites from which the JBDS Extras site is created. --> <profile> @@ -582,6 +560,31 @@ </plugins> </build> </profile> + <profile> + <id>maximum</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <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.${targetPlatformGroup-maximum}</groupId> + <artifactId>unified</artifactId> + <version>${JBT_VERSION}.${BUILD_ALIAS}-SNAPSHOT</version> + <classifier>unified</classifier> + </artifact> + </target> + </configuration> + </plugin> + </plugins> + </build> + </profile> <!-- Target platform file pointing at a single update site located from Jenkins filesystem (mirrored unified.target for performances) --> @@ -685,20 +688,25 @@ <platformSystemProperties> -XstartOnFirstThread </platformSystemProperties> </properties> <!-- This is required to have it working by default under mac osx for swtbot tests --> - <!-- Or better is to use "-Posx,default" --> - <repositories> - <repository> - <id>jbosstools-target-site</id> - <url>${jbosstools-target-site}</url> - <layout>p2</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - </repositories> + <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.${targetPlatformGroup}</groupId> + <artifactId>unified</artifactId> + <version>${JBT_VERSION}.${BUILD_ALIAS}-SNAPSHOT</version> + <classifier>unified</classifier> + </artifact> + </target> + </configuration> + </plugin> + </plugins> + </build> </profile> <profile>