cleanup and simplify

1 files changed, 27 insertions, 31 deletions

diff --git a/releng/helios/dependencies.properties b/releng/helios/dependencies.properties
index 3d20cec84..c276f0016 100644
--- a/releng/helios/dependencies.properties
+++ b/releng/helios/dependencies.properties
@@ -39,8 +39,8 @@
 
 #######################################################################################
 
-orbitthirdpartyzip.build.dir=S20100721061755
-orbitthirdpartyzip.build.id=S20100721061755
+orbitthirdpartyzip.build.dir=R20100519200754
+orbitthirdpartyzip.build.id=R20100519200754
 
 orbitthirdpartyzip.mirror.prefixuri=/tools/orbit/downloads/drops/${orbitthirdpartyzip.build.dir}
 orbitthirdpartyzip.url=http://download.eclipse.org${orbitthirdpartyzip.mirror.prefixuri}
@@ -67,10 +67,10 @@ dita.name=SourceForge DITA-OT 1.2.1
 dita.description=DITA-OT 1.2.1 Binary ASL Distribution
 #######################################################################################
 
-wtp.eclipse.build.id=M20100909-0800
-wtp.eclipse.build.dir=M20100909-0800
-eclipse.name=Eclipse SDK v3.7
-eclipse.description=Eclipse SDK v3.7
+wtp.eclipse.build.id=3.6.1
+wtp.eclipse.build.dir=R-3.6.1-201009090800
+eclipse.name=Eclipse SDK v3.6.1
+eclipse.description=Eclipse SDK v3.6.1
 
 #######################################################################################
 # Eclipse SDK Dependency
@@ -115,7 +115,6 @@ eclipseTestFramework.name=Eclipse Test Framework v3.6.
 eclipseTestFramework.description=Infrastructure to assist running automated JUnits.
 eclipseTestFramework.mirror.prefixuri=${eclipse.mirror.prefixuri}
 eclipseTestFramework.build.home=${eclipse.build.home}
-eclipseTestFramework.tobeinstalledfeaturegroups=org.eclipse.test.feature.group
 
 #######################################################################################
 
@@ -138,12 +137,12 @@ eclipsereleng.build.home=${eclipse.build.home}
 # EMF XSD SDK will be used for building the distribution
 # groupID : emf
 
-emf.id=2.6.0
-emf.dir.id=R201006141136
+emf.id=2.6.1
+emf.dir.id=R201009141218
 
-emf.mirror.prefixuri=/modeling/emf/emf/downloads/drops/2.6.0/${emf.dir.id}
+emf.mirror.prefixuri=/modeling/emf/emf/downloads/drops/2.6.x/${emf.dir.id}
 emf.file=emf-runtime-${emf.id}.zip
-emf.name=EMF v2.6 Runtime
+emf.name=EMF v2.6.1 Runtime
 
 emf.url=http://download.eclipse.org${emf.mirror.prefixuri}
 emf.description=Minimum executable code.
@@ -152,9 +151,9 @@ emf.build.home=http://www.eclipse.org/modeling/emf/downloads/
 emfsourcedoc.id=${emf.id}
 emfsourcedoc.dir.id=${emf.dir.id}
 
-emfsourcedoc.mirror.prefixuri=/modeling/emf/emf/downloads/drops/2.6.0/${emfsourcedoc.dir.id}
+emfsourcedoc.mirror.prefixuri=/modeling/emf/emf/downloads/drops/2.6.x/${emfsourcedoc.dir.id}
 emfsourcedoc.file=emf-sourcedoc-${emfsourcedoc.id}.zip
-emfsourcedoc.name=EMF v2.6 Source and Docs
+emfsourcedoc.name=EMF v2.6.1 Source and Docs
 
 emfsourcedoc.url=http://download.eclipse.org${emf.mirror.prefixuri}
 emfsourcedoc.description=Additional download with Source and Documentation.
@@ -165,9 +164,9 @@ emfsourcedoc.build.home=http://www.eclipse.org/modeling/emf/downloads/
 
 emfxsd.id=${emf.id}
 emfxsd.dir.id=${emf.dir.id}
-emfxsd.mirror.prefixuri=/modeling/emf/emf/downloads/drops/2.6.0/${emfxsd.dir.id}
+emfxsd.mirror.prefixuri=/modeling/emf/emf/downloads/drops/2.6.x/${emfxsd.dir.id}
 emfxsd.file=xsd-runtime-${emfxsd.id}.zip
-emfxsd.name=EMF XSD v2.6 Runtime
+emfxsd.name=EMF XSD v2.6.1 Runtime
 
 emfxsd.url=http://download.eclipse.org${emfxsd.mirror.prefixuri}
 emfxsd.description=Minimum executable code.
@@ -175,9 +174,9 @@ emfxsd.build.home=http://www.eclipse.org/modeling/emf/downloads/
 
 emfxsdsourcedoc.id=${emfxsd.id}
 emfxsdsourcedoc.dir.id=${emfxsd.dir.id}
-emfxsdsourcedoc.mirror.prefixuri=/modeling/emf/emf/downloads/drops/2.6.0/${emfsourcedoc.dir.id}
+emfxsdsourcedoc.mirror.prefixuri=/modeling/emf/emf/downloads/drops/2.6.x/${emfsourcedoc.dir.id}
 emfxsdsourcedoc.file=xsd-sourcedoc-${emfsourcedoc.id}.zip
-emfxsdsourcedoc.name=EMF XSD v2.6 Source and Docs
+emfxsdsourcedoc.name=EMF XSD v2.6.1 Source and Docs
 
 emfxsdsourcedoc.url=http://download.eclipse.org${emf.mirror.prefixuri}
 emfxsdsourcedoc.description=Additional download with Source and Documentation.
@@ -186,7 +185,7 @@ emfxsdsourcedoc.build.home=http://www.eclipse.org/modeling/emf/downloads/
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=317256
 emfandxsd.id=${emf.id}
 emfandxsd.dir.id=${emf.dir.id}
-emfandxsd.mirror.prefixuri=/modeling/emf/emf/downloads/drops/2.7.0/${emfandxsd.dir.id}
+emfandxsd.mirror.prefixuri=/modeling/emf/emf/downloads/drops/2.6.x/${emfandxsd.dir.id}
 emfandxsd.file=emf-xsd-SDK-${emfandxsd.id}.zip
 emfandxsd.name=EMF and XSD SDK
 
@@ -203,12 +202,12 @@ emfandxsd.build.home=http://www.eclipse.org/modeling/emf/downloads/
 # GEF SDK will be used for building the distribution
 # groupID : gef
 
-gef.id=3.6.0
-gef.dir.id=R201006161000
+gef.id=3.6.1
+gef.dir.id=R201009132020
 
-gef.mirror.prefixuri=/tools/gef/downloads/drops/3.6.0/${gef.dir.id}
+gef.mirror.prefixuri=/tools/gef/downloads/drops/3.6.1/${gef.dir.id}
 gef.file=GEF-SDK-${gef.id}.zip
-gef.name=GEF SDK 3.6
+gef.name=GEF SDK 3.6.1
 
 gef.url=http://download.eclipse.org${gef.mirror.prefixuri}
 gef.description=GEF Code and Source.
@@ -223,8 +222,8 @@ gef.build.home=http://download.eclipse.org/tools/gef/downloads/
 # groupID : dtp
 
 dtp.mirror.prefixuri=/datatools/downloads/1.8
-dtp.file=dtp-sdk_1.8.0.zip
-dtp.name=DTP sdk v1.8
+dtp.file=dtp-sdk_1.8.1.zip
+dtp.name=DTP sdk v1.8.1
 
 dtp.url=http://download.eclipse.org${dtp.mirror.prefixuri}
 dtp.description=Code and Source.
@@ -358,12 +357,12 @@ jst.build.home=${wst.build.home}
 jst.mirror.prefixuri=${wst.mirror.prefixuri}
 jst.url=${wst.url}
 
-# WTP - used by PAVE
-wtp.file=wtp-sdk-R-3.2.0-20100615235519.zip
+# WTP
+wtp.file=wtp-sdk-R-3.2.2-20100915173744.zip
 wtp.name=WTP
-wtp.description=WTP as pre-req
+wtp.description=WTP for Patch Builds
 wtp.build.home=http://download.eclipse.org/webtools/downloads/
-wtp.mirror.prefixuri=/webtools/downloads/drops/R3.2.0/R-3.2.0-20100615235519
+wtp.mirror.prefixuri=/webtools/downloads/drops/R3.2.2/R-3.2.2-20100915173744
 wtp.url=http://download.eclipse.org${wtp.mirror.prefixuri}
 
 ### DLTK
@@ -375,7 +374,4 @@ dltk.url=http://download.eclipse.org${dltk.mirror.prefixuri}
 dltk.description=DLTK Code and Source.
 dltk.build.home=http://download.eclipse.org/technology/dltk/downloads/
 
-#URL to Internal Reference Tool
-internalRefToolURL=http://dev.eclipse.org/viewcvs/index.cgi/~checkout~/jdt-core-home/tools/internal/internal-200302241157.zip
-internalRefToolFile=internal-200302241157.zip