[jbosstools-commits] JBoss Tools SVN: r39111 - in trunk/build: aggregate/site and 5 other directories.

Author: nickboldt Date: 2012-02-24 08:49:09 -0500 (Fri, 24 Feb 2012) New Revision: 39111 Modified: trunk/build/aggregate/bottests-site/site/associate.properties trunk/build/aggregate/site/associate.properties trunk/build/aggregate/site/sources/associate.properties trunk/build/aggregate/soa-site/associate.properties trunk/build/aggregate/webtools-site/associate.properties trunk/build/parent/pom.xml trunk/build/target-platform/build.xml trunk/build/target-platform/jbds.target trunk/build/target-platform/jbds.target.p2mirror.xml trunk/build/target-platform/multiple.target trunk/build/target-platform/multiple.target.p2mirror.xml trunk/build/target-platform/publish.sh trunk/build/target-platform/target2p2mirror.xml trunk/build/target-platform/targetUpdateFromRepo.xml trunk/build/target-platform/unified.target trunk/build/target-platform/unified.target.p2mirror.xml Log: move trunk to use SR2 composite / TP (JBIDE-10289) Modified: trunk/build/aggregate/bottests-site/site/associate.properties =================================================================== --- trunk/build/aggregate/bottests-site/site/associate.properties 2012-02-24 13:47:49 UTC (rev 39110) +++ trunk/build/aggregate/bottests-site/site/associate.properties 2012-02-24 13:49:09 UTC (rev 39111) @@ -4,4 +4,4 @@ #update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21 # associate sites to add to the resulting repo -associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR1-M/,http://download.jboss.org/jbosstools/updates/development/indigo/,http://dl.google.com/eclipse/plugin/3.7/ +associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR2/,http://download.jboss.org/jbosstools/updates/development/indigo/,http://dl.google.com/eclipse/plugin/3.7/ Modified: trunk/build/aggregate/site/associate.properties =================================================================== --- trunk/build/aggregate/site/associate.properties 2012-02-24 13:47:49 UTC (rev 39110) +++ trunk/build/aggregate/site/associate.properties 2012-02-24 13:49:09 UTC (rev 39111) @@ -4,4 +4,4 @@ #update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21 # associate sites to add to the resulting repo -associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR1-M/,http://dl.google.com/eclipse/plugin/3.7/ +associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR2/,http://dl.google.com/eclipse/plugin/3.7/ Modified: trunk/build/aggregate/site/sources/associate.properties =================================================================== --- trunk/build/aggregate/site/sources/associate.properties 2012-02-24 13:47:49 UTC (rev 39110) +++ trunk/build/aggregate/site/sources/associate.properties 2012-02-24 13:49:09 UTC (rev 39111) @@ -4,4 +4,4 @@ #update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21 # associate sites to add to the resulting repo -associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR1-M/,http://download.jboss.org/jbosstools/updates/development/indigo/,http://dl.google.com/eclipse/plugin/3.7/ +associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR2/,http://download.jboss.org/jbosstools/updates/development/indigo/,http://dl.google.com/eclipse/plugin/3.7/ Modified: trunk/build/aggregate/soa-site/associate.properties =================================================================== --- trunk/build/aggregate/soa-site/associate.properties 2012-02-24 13:47:49 UTC (rev 39110) +++ trunk/build/aggregate/soa-site/associate.properties 2012-02-24 13:49:09 UTC (rev 39111) @@ -4,4 +4,4 @@ #update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21 # associate sites to add to the resulting repo -associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR1-M/,http://download.jboss.org/jbosstools/updates/development/indigo/ +associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR2/,http://download.jboss.org/jbosstools/updates/development/indigo/ Modified: trunk/build/aggregate/webtools-site/associate.properties =================================================================== --- trunk/build/aggregate/webtools-site/associate.properties 2012-02-24 13:47:49 UTC (rev 39110) +++ trunk/build/aggregate/webtools-site/associate.properties 2012-02-24 13:49:09 UTC (rev 39111) @@ -4,4 +4,4 @@ #update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21 # associate sites to add to the resulting repo -associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR1-M/,http://download.jboss.org/jbosstools/updates/development/indigo/ +associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR2/,http://download.jboss.org/jbosstools/updates/development/indigo/ Modified: trunk/build/parent/pom.xml =================================================================== --- trunk/build/parent/pom.xml 2012-02-24 13:47:49 UTC (rev 39110) +++ trunk/build/parent/pom.xml 2012-02-24 13:49:09 UTC (rev 39111) @@ -33,11 +33,11 @@ </target.platform.classifier.local> <!-- 1a. URL of latest JBT target platform site --> - <jbosstools-target-site>http://download.jboss.org/jbosstools/updates/ta... + <jbosstools-target-site>http://download.jboss.org/jbosstools/updates/ta... <!-- 1b. or use -Plocal.site -Dlocal.site=file:///home/$user/trunk/build/target-platform/REPO/ --> <!-- TODO: don't forget to update JBDS .updatesite jobs when this value changes! --> - <local.site>file:///home/hudson/static_build_env/jbds/target-platform_3.3.indigo.SR1-M/e372M-wtp332M.target/</local.site> + <local.site>file:///home/hudson/static_build_env/jbds/target-platform_3.3.indigo.SR2/e372M-wtp332M.target/</local.site> <!-- 2a. URL of latest JBT nightly staging composite site (all the components in once place) --> @@ -52,7 +52,7 @@ <!-- 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-mirror>http://download.jboss.org/jbosstoo... <!-- 3b., or use -Plocal.requirements -Dlocal.requirements=file:///path/to/mirror/of/composite/requirements/site --> <local.requirements>file:///qa/services/http/binaries/RHDS/updates/indigo/</local.requirements> Modified: trunk/build/target-platform/build.xml =================================================================== --- trunk/build/target-platform/build.xml 2012-02-24 13:47:49 UTC (rev 39110) +++ trunk/build/target-platform/build.xml 2012-02-24 13:49:09 UTC (rev 39111) @@ -140,9 +140,12 @@ <!-- NOTE: must use same platform (50M) or SDK (103M - 168M) version as feature version on target platform, or will get install/update conflicts --> <!-- don't forget to increment these files when moving up a version: build.xml, *.target*, publish.sh, target2p2mirror.xml --> + <!-- also jbds/trunk/releng/org.jboss.ide.eclipse.releng/requirements/jbds-target-platform/build.properties + also all devstudio-5.0_*.updatesite jobs (4) need to be pointed at the new Target Platform URL + --> <!-- http://download.eclipse.org/eclipse/downloads/drops/M20120201-1336/downlo... --> - <property name="eclipse.version" value="M20120201-1336" /> - <property name="eclipse.URL" value="http://www.eclipse.org/downloads/download.php?r=1&amp;fil... + <property name="eclipse.version" value="3.7.2" /> + <property name="eclipse.URL" value="http://www.eclipse.org/downloads/download.php?r=1&amp;fil... <if> <equals arg1="${arch}" arg2="x86" /> Modified: trunk/build/target-platform/jbds.target =================================================================== --- trunk/build/target-platform/jbds.target 2012-02-24 13:47:49 UTC (rev 39110) +++ trunk/build/target-platform/jbds.target 2012-02-24 13:49:09 UTC (rev 39111) @@ -11,9 +11,9 @@ <!-- don't forget to increment these files when moving up a version: build.xml, *.target*, publish.sh, target2p2mirror.xml --> - <repository location="http://download.jboss.org/jbosstools/updates/indigo/SR1-M/... - <!-- <repository location="file:///qa/services/http/binaries/RHDS/updates/indigo/SR1-M/"/> --> - <!-- <repository location="http://www.qa.jboss.com/binaries/RHDS/updates/indigo/SR1-M... --> + <repository location="http://download.jboss.org/jbosstools/updates/indigo/SR2/&q... + <!-- <repository location="file:///qa/services/http/binaries/RHDS/updates/indigo/SR2/"/> --> + <!-- <repository location="http://www.qa.jboss.com/binaries/RHDS/updates/indigo/SR2/&... --> <!-- m2e, m2e-wtp + deps --> <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.100.20110804-1717"/> Modified: trunk/build/target-platform/jbds.target.p2mirror.xml =================================================================== --- trunk/build/target-platform/jbds.target.p2mirror.xml 2012-02-24 13:47:49 UTC (rev 39110) +++ trunk/build/target-platform/jbds.target.p2mirror.xml 2012-02-24 13:49:09 UTC (rev 39111) @@ -28,7 +28,7 @@ <p2.mirror destination="file://${repoDir}" verbose="${verbose}"> <slicingOptions includeFeatures="true" followStrict="${followStrict}"/> <source> -<repository location="http://download.jboss.org/jbosstools/updates/indigo/SR1-M/... +<repository location="http://download.jboss.org/jbosstools/updates/indigo/SR2/&q... </source> <iu id="org.eclipse.m2e.sdk.feature.feature.group" version=""/> <iu id="org.eclipse.m2e.feature.feature.group" version=""/> Modified: trunk/build/target-platform/multiple.target =================================================================== --- trunk/build/target-platform/multiple.target 2012-02-24 13:47:49 UTC (rev 39110) +++ trunk/build/target-platform/multiple.target 2012-02-24 13:49:09 UTC (rev 39111) @@ -15,7 +15,7 @@ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> <!-- don't forget to increment these files when moving up a version: build.xml, *.target*, publish.sh, target2p2mirror.xml --> - <repository location="http://download.jboss.org/jbosstools/updates/indigo/SR1-M/... + <repository location="http://download.jboss.org/jbosstools/updates/indigo/SR2/&q... <!-- m2e, m2e-wtp + deps --> <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.100.20110804-1717"/> @@ -339,4 +339,4 @@ <feature id="org.mozilla.xpcom.feature"/> </includeBundles> <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> -</target> \ No newline at end of file +</target> Modified: trunk/build/target-platform/multiple.target.p2mirror.xml =================================================================== --- trunk/build/target-platform/multiple.target.p2mirror.xml 2012-02-24 13:47:49 UTC (rev 39110) +++ trunk/build/target-platform/multiple.target.p2mirror.xml 2012-02-24 13:49:09 UTC (rev 39111) @@ -29,7 +29,7 @@ <slicingOptions includeFeatures="true" followStrict="${followStrict}"/> <source> <repository location="http://download.jboss.org/jbosstools/builds/staging/_compo... -<repository location="http://download.jboss.org/jbosstools/updates/indigo/SR1-M/... +<repository location="http://download.jboss.org/jbosstools/updates/indigo/SR2/&q... </source> <iu id="org.eclipse.m2e.sdk.feature.feature.group" version=""/> <iu id="org.eclipse.m2e.feature.feature.group" version=""/> Modified: trunk/build/target-platform/publish.sh =================================================================== --- trunk/build/target-platform/publish.sh 2012-02-24 13:47:49 UTC (rev 39110) +++ trunk/build/target-platform/publish.sh 2012-02-24 13:49:09 UTC (rev 39111) @@ -3,11 +3,12 @@ # defaults for JBoss Tools # don't forget to increment these files when moving up a version: -# build.xml, *.target*, publish.sh, target2p2mirror.xml; also jbds/trunk/releng/org.jboss.ide.eclipse.releng/requirements/jbds-target-platform/build.properties +# build.xml, *.target*, publish.sh, target2p2mirror.xml; also jbds/trunk/releng/org.jboss.ide.eclipse.releng/requirements/jbds-target-platform/build.properties; +# also all devstudio-5.0_*.updatesite jobs (4) need to be pointed at the new Target Platform URL targetZipFile=e372M-wtp332M.target -repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO_3.3.indigo.SR1-M -destinationPath=/home/hudson/static_build_env/jbds/target-platform_3.3.indigo.SR1-M -DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform_3.3.indigo.SR1-M +repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO_3.3.indigo.SR2 +destinationPath=/home/hudson/static_build_env/jbds/target-platform_3.3.indigo.SR2 +DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform_3.3.indigo.SR2 include="*" exclude="--exclude '.blobstore'" # exclude the .blobstore @@ -22,43 +23,25 @@ '-include') include="$2"; shift 2;; '-exclude') exclude="$2"; shift 2;; - '-jbt_3.3.indigo.SR1-M') + '-jbt_3.3.indigo.SR2') # defaults for JBT (trunk) targetZipFile=e372M-wtp332M.target - repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO_3.3.indigo.SR1-M - destinationPath=/home/hudson/static_build_env/jbds/target-platform_3.3.indigo.SR1-M - DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform_3.3.indigo.SR1-M + repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO_3.3.indigo.SR2 + destinationPath=/home/hudson/static_build_env/jbds/target-platform_3.3.indigo.SR2 + DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform_3.3.indigo.SR2 include="*" exclude="--exclude '.blobstore'" # exclude the .blobstore shift 1;; - '-jbt_3.3.indigo') - # defaults for JBT (stable branch) - targetZipFile=e371-wtp331.target - repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO_3.3.indigo - destinationPath=/home/hudson/static_build_env/jbds/target-platform_3.3.indigo - DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform_3.3.indigo - include="*" - exclude="--exclude '.blobstore'" # exclude the .blobstore - shift 1;; - '-jbds_3.3.indigo.SR1-M') + '-jbds_3.3.indigo.SR2') # defaults for JBDS (trunk) targetZipFile=jbds500-e372M-wtp332M.target - repoDir=/home/hudson/static_build_env/jbds/tools/sources/JBDS-REPO_3.3.indigo.SR1-M - destinationPath=/home/hudson/static_build_env/jbds/jbds-target-platform_3.3.indigo.SR1-M - DESTINATION=/qa/services/http/binaries/RHDS/updates/jbds-target-platform_3.3.indigo.SR1-M + repoDir=/home/hudson/static_build_env/jbds/tools/sources/JBDS-REPO_3.3.indigo.SR2 + destinationPath=/home/hudson/static_build_env/jbds/jbds-target-platform_3.3.indigo.SR2 + DESTINATION=/qa/services/http/binaries/RHDS/updates/jbds-target-platform_3.3.indigo.SR2 include=".blobstore *" # include the .blobstore exclude="" shift 1;; - '-jbds_3.3.indigo') - # defaults for JBDS (stable branch) - targetZipFile=jbds500-e371-wtp331.target - repoDir=/home/hudson/static_build_env/jbds/tools/sources/JBDS-REPO_3.3.indigo - destinationPath=/home/hudson/static_build_env/jbds/jbds-target-platform_3.3.indigo - DESTINATION=/qa/services/http/binaries/RHDS/updates/jbds-target-platform_3.3.indigo - include=".blobstore *" # include the .blobstore - exclude="" - shift 1;; esac done Modified: trunk/build/target-platform/target2p2mirror.xml =================================================================== --- trunk/build/target-platform/target2p2mirror.xml 2012-02-24 13:47:49 UTC (rev 39110) +++ trunk/build/target-platform/target2p2mirror.xml 2012-02-24 13:49:09 UTC (rev 39111) @@ -1,6 +1,8 @@ <project default="custom.build" name="jbosstools target platform p2.mirror generator"> <!-- don't forget to increment these files when moving up a version: - build.xml, *.target*, publish.sh, target2p2mirror.xml; also jbds/trunk/releng/org.jboss.ide.eclipse.releng/requirements/jbds-target-platform/build.properties --> + build.xml, *.target*, publish.sh, target2p2mirror.xml; also jbds/trunk/releng/org.jboss.ide.eclipse.releng/requirements/jbds-target-platform/build.properties; + also all devstudio-5.0_*.updatesite jobs (4) need to be pointed at the new Target Platform URL --> + <property name="targetFile" value="e372M-wtp332M.target" /> <!-- if useLatest = true, omit versions from p2.mirror script to fetch latest version available; Modified: trunk/build/target-platform/targetUpdateFromRepo.xml =================================================================== --- trunk/build/target-platform/targetUpdateFromRepo.xml 2012-02-24 13:47:49 UTC (rev 39110) +++ trunk/build/target-platform/targetUpdateFromRepo.xml 2012-02-24 13:49:09 UTC (rev 39111) @@ -12,7 +12,7 @@ <!-- create a second .target file which replaces all URLs with a single unified (published) one (eg., for jbosstools target platform site), set these properties too --> <property name="unified.targetFile" value="unified.target" /> - <property name="unified.URL" value="http://download.jboss.org/jbosstools/updates/target-platform_... /> + <property name="unified.URL" value="http://download.jboss.org/jbosstools/updates/target-platform_... /> <property name="local.targetFile" value="local.target" /> <property name="local.URL" value="file://${repoDir}" /> Modified: trunk/build/target-platform/unified.target =================================================================== --- trunk/build/target-platform/unified.target 2012-02-24 13:47:49 UTC (rev 39110) +++ trunk/build/target-platform/unified.target 2012-02-24 13:49:09 UTC (rev 39111) @@ -9,13 +9,13 @@ <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/updates/target-platfo... + <repository location="http://download.jboss.org/jbosstools/updates/target-platfo... </location> <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> <!-- don't forget to increment these files when moving up a version: build.xml, *.target*, publish.sh, target2p2mirror.xml --> - <repository location="http://download.jboss.org/jbosstools/updates/target-platfo... + <repository location="http://download.jboss.org/jbosstools/updates/target-platfo... <!-- m2e, m2e-wtp + deps --> <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.100.20110804-1717"/> @@ -339,4 +339,4 @@ <feature id="org.mozilla.xpcom.feature"/> </includeBundles> <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> -</target> \ No newline at end of file +</target> Modified: trunk/build/target-platform/unified.target.p2mirror.xml =================================================================== --- trunk/build/target-platform/unified.target.p2mirror.xml 2012-02-24 13:47:49 UTC (rev 39110) +++ trunk/build/target-platform/unified.target.p2mirror.xml 2012-02-24 13:49:09 UTC (rev 39111) @@ -28,8 +28,8 @@ <p2.mirror destination="file://${repoDir}" verbose="${verbose}"> <slicingOptions includeFeatures="true" followStrict="${followStrict}"/> <source> -<repository location="http://download.jboss.org/jbosstools/updates/target-platfo... -<repository location="http://download.jboss.org/jbosstools/updates/target-platfo... +<repository location="http://download.jboss.org/jbosstools/updates/target-platfo... +<repository location="http://download.jboss.org/jbosstools/updates/target-platfo... </source> <iu id="org.eclipse.m2e.sdk.feature.feature.group" version=""/> <iu id="org.eclipse.m2e.feature.feature.group" version=""/>