Author: nickboldt Date: 2012-05-26 01:42:13 -0400 (Sat, 26 May 2012) New Revision: 41459 Modified: branches/jbosstools-3.3.0.CR1/build/parent/pom.xml branches/jbosstools-3.3.0.CR1/build/results/build.xml branches/jbosstools-3.3.0.CR1/build/target-platform/multiple.target branches/jbosstools-3.3.0.CR1/build/target-platform/multiple.target.p2mirror.xml Log: switch to stable_branch for CR1 Modified: branches/jbosstools-3.3.0.CR1/build/parent/pom.xml =================================================================== --- branches/jbosstools-3.3.0.CR1/build/parent/pom.xml 2012-05-26 05:39:29 UTC (rev 41458) +++ branches/jbosstools-3.3.0.CR1/build/parent/pom.xml 2012-05-26 05:42:13 UTC (rev 41459) @@ -36,7 +36,7 @@ <!-- 1a. URL of latest JBT target platform site --> <jbosstools-target-site>http://download.jboss.org/jbosstools/updates/ta... - <!-- 1b. or use -Plocal.site -Dlocal.site=file:///${HOME}/trunk/build/target-platform/REPO/ --> + <!-- 1b. or use -Plocal.site -Dlocal.site=file:///${HOME}/3.3.indigo/build/target-platform/REPO/ --> <!-- TODO: don't forget to update JBDS .updatesite jobs when this value changes! --> <!-- TODO: see also 'hudson' profile below for other default value --> <local.site>file:///${user.home}/.m2/jbosstools-target-platform_3.3.indigo.SR2/</local.site> @@ -44,14 +44,14 @@ <!-- 2a. URL of latest JBT nightly staging composite site (all the components in once place) --> <!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo --> - <jbosstools-nightly-staging-composite>http://download.jboss.org/jbossto... + <jbosstools-nightly-staging-composite>http://download.jboss.org/jbossto... <!-- this site is not enabled by default as SOA Tooling is a downstream project (sorta). --> - <jbosstools-nightly-staging-composite-soa-tooling>http://download.jboss... + <jbosstools-nightly-staging-composite-soa-tooling>http://download.jboss... <!-- 2b. or use -Plocal.composite -Dlocal.composite=file:///path/to/mirror/of/composite/staging/site/ --> <!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo --> - <local.composite>file:///home/hudson/static_build_env/jbds/builds/staging/_composite_/core/trunk/</local.composite> - <local.composite-soa-tooling>file:///home/hudson/static_build_env/jbds/builds/staging/_composite_/soa-tooling/trunk/</local.composite-soa-tooling> + <local.composite>file:///home/hudson/static_build_env/jbds/builds/staging/_composite_/core/3.3.indigo/</local.composite> + <local.composite-soa-tooling>file:///home/hudson/static_build_env/jbds/builds/staging/_composite_/soa-tooling/3.3.indigo/</local.composite-soa-tooling> <!-- 3a. URL of latest JBT requirements composite mirror --> <!-- TODO: don't forget to update this in ../aggregate/*/associate.properties too (5 files)! --> @@ -63,11 +63,11 @@ <!-- 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/... + <jbosstools-nightly>http://download.jboss.org/jbosstools/updates/nightl... + <jbosstools-nightly-tests>http://download.jboss.org/jbosstools/updates/... <!-- these sites are not enabled by default as SOA Tooling is a downstream project (sorta). --> - <jbosstools-nightly-soa-tooling>http://download.jboss.org/jbosstools/up... - <jbosstools-nightly-soa-tooling-tests>http://download.jboss.org/jbossto... + <jbosstools-nightly-soa-tooling>http://download.jboss.org/jbosstools/up... + <jbosstools-nightly-soa-tooling-tests>http://download.jboss.org/jbossto... <!-- 5. extra requirements (for 3rd party "Extras" site) --> <jboss-requirements-composite-extras-mirror>http://download.jboss.org/j... @@ -627,7 +627,7 @@ <!-- 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 + multiple.target using: cd ~/3.3.indigo/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: Modified: branches/jbosstools-3.3.0.CR1/build/results/build.xml =================================================================== --- branches/jbosstools-3.3.0.CR1/build/results/build.xml 2012-05-26 05:39:29 UTC (rev 41458) +++ branches/jbosstools-3.3.0.CR1/build/results/build.xml 2012-05-26 05:42:13 UTC (rev 41459) @@ -115,7 +115,7 @@ <property name="inputRepos" value="2" /> <property name="inputRepo1" value="file://${input.dir}/all/repo/" /> <!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo --> - <property name="inputRepo2" value="http://download.jboss.org/jbosstools/builds/staging/_composit... /> + <property name="inputRepo2" value="http://download.jboss.org/jbosstools/builds/staging/_composit... /> </ant> <ant target="collect.metadata" antfile="${aggregate_site_build.xml}"> </ant> @@ -127,7 +127,7 @@ <ant target="collect.zips" antfile="${aggregate_site_build.xml}"> <property name="inputRepos" value="1" /> <!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo --> - <property name="inputRepo1" value="http://download.jboss.org/jbosstools/builds/staging/_composit... /> + <property name="inputRepo1" value="http://download.jboss.org/jbosstools/builds/staging/_composit... /> </ant> <ant target="collect.metadata" antfile="${aggregate_site_build.xml}"> </ant> Modified: branches/jbosstools-3.3.0.CR1/build/target-platform/multiple.target =================================================================== --- branches/jbosstools-3.3.0.CR1/build/target-platform/multiple.target 2012-05-26 05:39:29 UTC (rev 41458) +++ branches/jbosstools-3.3.0.CR1/build/target-platform/multiple.target 2012-05-26 05:42:13 UTC (rev 41459) @@ -9,7 +9,7 @@ <locations> <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> <!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo --> - <repository location="http://download.jboss.org/jbosstools/builds/staging/_compo... + <repository location="http://download.jboss.org/jbosstools/builds/staging/_compo... </location> <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> Modified: branches/jbosstools-3.3.0.CR1/build/target-platform/multiple.target.p2mirror.xml =================================================================== --- branches/jbosstools-3.3.0.CR1/build/target-platform/multiple.target.p2mirror.xml 2012-05-26 05:39:29 UTC (rev 41458) +++ branches/jbosstools-3.3.0.CR1/build/target-platform/multiple.target.p2mirror.xml 2012-05-26 05:42:13 UTC (rev 41459) @@ -28,7 +28,7 @@ <p2.mirror destination="file://${repoDir}" verbose="${verbose}"> <slicingOptions includeFeatures="true" followStrict="${followStrict}"/> <source> -<repository location="http://download.jboss.org/jbosstools/builds/staging/_compo... +<repository location="http://download.jboss.org/jbosstools/builds/staging/_compo... <repository location="http://download.jboss.org/jbosstools/updates/indigo/SR2/&q... </source> <iu id="org.eclipse.m2e.sdk.feature.feature.group" version=""/>