diff --git a/build/aggregate/bottests-site/site/associate.properties b/build/aggregate/bottests-site/site/associate.properties index e445127..549dd24 100644 --- a/build/aggregate/bottests-site/site/associate.properties +++ b/build/aggregate/bottests-site/site/associate.properties @@ -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/ diff --git a/build/aggregate/site/associate.properties b/build/aggregate/site/associate.properties index bf14d45..6c3bbb9 100644 --- a/build/aggregate/site/associate.properties +++ b/build/aggregate/site/associate.properties @@ -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/ diff --git a/build/aggregate/site/sources/associate.properties b/build/aggregate/site/sources/associate.properties index e445127..549dd24 100644 --- a/build/aggregate/site/sources/associate.properties +++ b/build/aggregate/site/sources/associate.properties @@ -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/ diff --git a/build/aggregate/soa-site/associate.properties b/build/aggregate/soa-site/associate.properties index 8fa6862..6681a96 100644 --- a/build/aggregate/soa-site/associate.properties +++ b/build/aggregate/soa-site/associate.properties @@ -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/ diff --git a/build/parent/pom.xml b/build/parent/pom.xml index b99bd1b..2c976ca 100644 --- a/build/parent/pom.xml +++ b/build/parent/pom.xml @@ -33,11 +33,11 @@ - http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo.SR1-M/latest/ + http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo.SR2/latest/ - file:///home/hudson/static_build_env/jbds/target-platform_3.3.indigo.SR1-M/e372M-wtp332M.target/ + file:///home/hudson/static_build_env/jbds/target-platform_3.3.indigo.SR2/e372M-wtp332M.target/ @@ -51,7 +51,8 @@ file:///home/hudson/static_build_env/jbds/builds/staging/_composite_/3.3.indigo/ - http://download.jboss.org/jbosstools/updates/indigo/SR1-M/ + + http://download.jboss.org/jbosstools/updates/indigo/SR2/ file:///qa/services/http/binaries/RHDS/updates/indigo/ diff --git a/build/target-platform/build.xml b/build/target-platform/build.xml index 76a6bd4..efbd80c 100644 --- a/build/target-platform/build.xml +++ b/build/target-platform/build.xml @@ -140,9 +140,12 @@ To run for JBDS target file WHILE JBT target file is being run: + - - + + diff --git a/build/target-platform/jbds.target b/build/target-platform/jbds.target index 140287f..aa0e91a 100644 --- a/build/target-platform/jbds.target +++ b/build/target-platform/jbds.target @@ -11,13 +11,13 @@ - - - + + + - + @@ -25,7 +25,7 @@ - + @@ -53,26 +53,26 @@ - - - - + + + + - + - + - + - - + + - - + + @@ -81,45 +81,45 @@ - - - + + + - - - + + + - - - - + + + + - + - - - + + + - - - + + + - + - - - - + + + + - - + + @@ -135,15 +135,15 @@ - + - - + + - - + + @@ -151,32 +151,32 @@ - - - + + + - + - - - - + + + + - - + + - - + + - + - - + + @@ -185,10 +185,10 @@ - - - - + + + + @@ -201,20 +201,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -264,8 +264,8 @@ - - + + diff --git a/build/target-platform/jbds.target.p2mirror.xml b/build/target-platform/jbds.target.p2mirror.xml index 84b6f25..6ba15a7 100644 --- a/build/target-platform/jbds.target.p2mirror.xml +++ b/build/target-platform/jbds.target.p2mirror.xml @@ -28,7 +28,7 @@ - + diff --git a/build/target-platform/multiple.target b/build/target-platform/multiple.target index 1d1dcda..79b1a15 100644 --- a/build/target-platform/multiple.target +++ b/build/target-platform/multiple.target @@ -15,11 +15,11 @@ - + - + @@ -27,7 +27,7 @@ - + @@ -35,7 +35,7 @@ - + @@ -55,103 +55,103 @@ - - - - + + + + - - + + - + - + - + - + - + - - + + - - - - + + + + - + - - + + - + - - + + - + - + - + - - + + - - + + - + - - + + - + - + - - - + + + - + - + - + - - + + @@ -169,53 +169,53 @@ - - - + + + - + - - - - - - + + + + + + - + - + - + - + - + - - + + - - - - - + + + + + - - - - + + + + @@ -228,20 +228,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -268,7 +268,7 @@ - + @@ -291,7 +291,7 @@ - + @@ -304,11 +304,11 @@ - - - - - + + + + + diff --git a/build/target-platform/multiple.target.p2mirror.xml b/build/target-platform/multiple.target.p2mirror.xml index 9a098be..bc9858a 100644 --- a/build/target-platform/multiple.target.p2mirror.xml +++ b/build/target-platform/multiple.target.p2mirror.xml @@ -29,7 +29,7 @@ - + diff --git a/build/target-platform/publish.sh b/build/target-platform/publish.sh index 461fc3f..1939b61 100644 --- a/build/target-platform/publish.sh +++ b/build/target-platform/publish.sh @@ -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,40 +23,22 @@ while [ "$#" -gt 0 ]; do '-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 - 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 + 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;; - '-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 - 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 + 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;; diff --git a/build/target-platform/target2p2mirror.xml b/build/target-platform/target2p2mirror.xml index 0ae884c..5fab6a0 100644 --- a/build/target-platform/target2p2mirror.xml +++ b/build/target-platform/target2p2mirror.xml @@ -1,6 +1,8 @@ + 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 --> + - + diff --git a/build/target-platform/unified.target b/build/target-platform/unified.target index aa60633..e5d5182 100644 --- a/build/target-platform/unified.target +++ b/build/target-platform/unified.target @@ -9,17 +9,17 @@ - + - + - + @@ -27,7 +27,7 @@ - + @@ -35,7 +35,7 @@ - + @@ -55,103 +55,103 @@ - - - - + + + + - - + + - + - + - + - + - + - - + + - - - - + + + + - + - - + + - + - - + + - + - + - + - - + + - - + + - + - - + + - + - + - - - + + + - + - + - + - - + + @@ -169,53 +169,53 @@ - - - + + + - + - - - - - - + + + + + + - + - + - + - + - + - - + + - - - - - + + + + + - - - - + + + + @@ -228,20 +228,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -268,7 +268,7 @@ - + @@ -291,7 +291,7 @@ - + @@ -304,11 +304,11 @@ - - - - - + + + + + diff --git a/build/target-platform/unified.target.p2mirror.xml b/build/target-platform/unified.target.p2mirror.xml index 40aa713..4d9d249 100644 --- a/build/target-platform/unified.target.p2mirror.xml +++ b/build/target-platform/unified.target.p2mirror.xml @@ -28,8 +28,8 @@ - - + +