diff --git a/releng.common/maps/wst-common-core.map b/releng.common/maps/wst-common-core.map
index 47034d4..db7ca58 100644
--- a/releng.common/maps/wst-common-core.map
+++ b/releng.common/maps/wst-common-core.map
@@ -3,13 +3,13 @@
 plugin@org.eclipse.wst.command.env.core=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/command/plugins/org.eclipse.wst.command.env.core
 plugin@org.eclipse.wst.command.env=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/command/plugins/org.eclipse.wst.command.env
 
-plugin@org.eclipse.wst.common.emf=v200706071630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.emf
+plugin@org.eclipse.wst.common.emf=v200707061900,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.emf
 plugin@org.eclipse.wst.common.emfworkbench.integration=v200706071630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.emfworkbench.integration
 
 plugin@org.eclipse.wst.common.environment=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.environment
 
 plugin@org.eclipse.wst.common.frameworks=v200706071630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.frameworks
-plugin@org.eclipse.wst.common.modulecore=v200706071630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.modulecore
+plugin@org.eclipse.wst.common.modulecore=v200707031430,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.modulecore
 plugin@org.eclipse.wst.common.project.facet.core=v200706071740,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.project.facet.core
 plugin@org.eclipse.wst.common.uriresolver=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.uriresolver
 
diff --git a/releng.common/maps/wst-common-tests.map b/releng.common/maps/wst-common-tests.map
index 4ea2802..6e448dd 100644
--- a/releng.common/maps/wst-common-tests.map
+++ b/releng.common/maps/wst-common-tests.map
@@ -1,6 +1,6 @@
 !*************** wst-common-tests.map
 
-plugin@org.eclipse.wst.common.tests=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/tests/org.eclipse.wst.common.tests
+plugin@org.eclipse.wst.common.tests=v200707061900,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/tests/org.eclipse.wst.common.tests
 plugin@org.eclipse.wst.common.tests.collector=v200706030600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/tests/org.eclipse.wst.common.tests.collector
 plugin@org.eclipse.wst.common.tests.ui=v200706120315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/tests/org.eclipse.wst.common.tests.ui
 
diff --git a/releng.ejbtools/maps/jst-enterprise-component-features.map b/releng.ejbtools/maps/jst-enterprise-component-features.map
index ec46f0f..cac23a1 100644
--- a/releng.ejbtools/maps/jst-enterprise-component-features.map
+++ b/releng.ejbtools/maps/jst-enterprise-component-features.map
@@ -2,7 +2,7 @@
 
 feature@org.eclipse.jst.enterprise_core.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/features/org.eclipse.jst.enterprise_core.feature
 feature@org.eclipse.jst.enterprise_sdk.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/features/org.eclipse.jst.enterprise_sdk.feature
-feature@org.eclipse.jst.enterprise_tests.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/features/org.eclipse.jst.enterprise_tests.feature
+feature@org.eclipse.jst.enterprise_tests.feature=v200707111738,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/features/org.eclipse.jst.enterprise_tests.feature
 feature@org.eclipse.jst.enterprise_ui.feature=v200706200200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/features/org.eclipse.jst.enterprise_ui.feature
 feature@org.eclipse.jst.enterprise_userdoc.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/features/org.eclipse.jst.enterprise_userdoc.feature
 
diff --git a/releng.jeetools/maps/jst-j2ee-advanced.map b/releng.jeetools/maps/jst-j2ee-advanced.map
index e37c894..3dae1b9 100644
--- a/releng.jeetools/maps/jst-j2ee-advanced.map
+++ b/releng.jeetools/maps/jst-j2ee-advanced.map
@@ -1,8 +1,8 @@
 !*************** jst-j2ee-advanced.map
 
-plugin@org.eclipse.jst.j2ee.ejb=v200706071630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.ejb
+plugin@org.eclipse.jst.j2ee.ejb=v200707092300,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.ejb
 plugin@org.eclipse.jst.ejb.ui=v200706071630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/plugins/org.eclipse.jst.ejb.ui
-plugin@org.eclipse.jst.j2ee.jca=v200706071630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.jca
+plugin@org.eclipse.jst.j2ee.jca=v200707092300,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.jca
 plugin@org.eclipse.jst.j2ee.webservice=v200706121000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.webservice
 plugin@org.eclipse.jst.j2ee.webservice.ui=v200706121000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.webservice.ui
 plugin@org.eclipse.jst.j2ee.jca.ui=v200706071630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.jca.ui
@@ -13,6 +13,6 @@
 plugin@org.eclipse.jst.j2ee.ejb.annotations.xdoclet=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet
 plugin@org.eclipse.jst.j2ee.xdoclet.runtime=v200706120315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/plugins/org.eclipse.jst.j2ee.xdoclet.runtime
 
-plugin@org.eclipse.jst.jee.ejb=v200706111751,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.jee.ejb
-plugin@org.eclipse.jst.jee.ui=v200706111751,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.jee.ui
+plugin@org.eclipse.jst.jee.ejb=v200707092300,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.jee.ejb
+plugin@org.eclipse.jst.jee.ui=v200707111130,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.jee.ui
 !***************
\ No newline at end of file
diff --git a/releng.jeetools/maps/jst-j2ee-basic-tests.map b/releng.jeetools/maps/jst-j2ee-basic-tests.map
index b2ae311..01e6d7e 100644
--- a/releng.jeetools/maps/jst-j2ee-basic-tests.map
+++ b/releng.jeetools/maps/jst-j2ee-basic-tests.map
@@ -1,8 +1,8 @@
 !*************** jst-j2ee-basic-tests.map
 
 plugin@org.eclipse.jst.j2ee.core.tests=v200706071630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/tests/org.eclipse.jst.j2ee.core.tests
-plugin@org.eclipse.jst.j2ee.tests=v200706181357,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/tests/org.eclipse.jst.j2ee.tests
-plugin@org.eclipse.jst.servlet.tests=v200706071630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/servlet/tests/org.eclipse.jst.servlet.tests
+plugin@org.eclipse.jst.j2ee.tests=v200707111130,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/tests/org.eclipse.jst.j2ee.tests
+plugin@org.eclipse.jst.servlet.tests=v200707061900,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/servlet/tests/org.eclipse.jst.servlet.tests
 plugin@org.eclipse.jst.validation.sample=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/tests/org.eclipse.jst.validation.sample
 plugin@org.eclipse.jst.validation.test=v200706071630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/tests/org.eclipse.jst.validation.test
 plugin@org.eclipse.jst.j2ee.core.tests.performance=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/tests/org.eclipse.jst.j2ee.core.tests.performance
diff --git a/releng.jeetools/maps/jst-j2ee-basic.map b/releng.jeetools/maps/jst-j2ee-basic.map
index cf23193..c7484e9 100644
--- a/releng.jeetools/maps/jst-j2ee-basic.map
+++ b/releng.jeetools/maps/jst-j2ee-basic.map
@@ -1,14 +1,14 @@
 !*************** jst-j2ee-basic.map
 
-plugin@org.eclipse.jst.j2ee.navigator.ui=v200706071630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.navigator.ui
-plugin@org.eclipse.jst.j2ee.ui=v200706071630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.ui
+plugin@org.eclipse.jst.j2ee.navigator.ui=v200707111130,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.navigator.ui
+plugin@org.eclipse.jst.j2ee.ui=v200707092300,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.ui
 
-plugin@org.eclipse.jst.j2ee=v200706121630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee
-plugin@org.eclipse.jst.j2ee.core=v200706111630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.core
-plugin@org.eclipse.jst.j2ee.web=v200706071630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.web
+plugin@org.eclipse.jst.j2ee=v200707102030,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee
+plugin@org.eclipse.jst.j2ee.core=v200707061900,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.core
+plugin@org.eclipse.jst.j2ee.web=v200707092300,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.web
 plugin@org.eclipse.jst.servlet.ui=v200706201330,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/servlet/plugins/org.eclipse.jst.servlet.ui
 
-plugin@org.eclipse.jst.jee=v200706121000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.jee
+plugin@org.eclipse.jst.jee=v200707092300,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.jee
 plugin@org.eclipse.jst.jee.web=v200706111751,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.jee.web
 
 plugin@org.eclipse.jst.standard.schemas=v200706221355,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.standard.schemas
diff --git a/releng.webservices/maps/jst-ws-tests.map b/releng.webservices/maps/jst-ws-tests.map
index 002edd4..1bd8c37 100644
--- a/releng.webservices/maps/jst-ws-tests.map
+++ b/releng.webservices/maps/jst-ws-tests.map
@@ -1,8 +1,8 @@
 !*************** jst-ws-tests.map
 
-plugin@org.eclipse.jst.ws.tests=v200705311834,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/tests/org.eclipse.jst.ws.tests
-plugin@org.eclipse.jst.ws.tests.performance=v200706200235,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/tests/org.eclipse.jst.ws.tests.performance
-plugin@org.eclipse.jst.ws.axis.consumption.core.tests=v200705311834,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/tests/org.eclipse.jst.ws.axis.consumption.core.tests
+plugin@org.eclipse.jst.ws.tests=v200707111738,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/tests/org.eclipse.jst.ws.tests
+plugin@org.eclipse.jst.ws.tests.performance=v200707111738,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/tests/org.eclipse.jst.ws.tests.performance
+plugin@org.eclipse.jst.ws.axis.consumption.core.tests=v200707111738,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/tests/org.eclipse.jst.ws.axis.consumption.core.tests
 
 
 !***************
\ No newline at end of file
diff --git a/releng.webservices/maps/wst-ws-tests.map b/releng.webservices/maps/wst-ws-tests.map
index 6ba3f1d..e35d183 100644
--- a/releng.webservices/maps/wst-ws-tests.map
+++ b/releng.webservices/maps/wst-ws-tests.map
@@ -7,6 +7,6 @@
 
 plugin@org.eclipse.wst.wsdl.tests.performance=v200706030435,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/wsdl/tests/org.eclipse.wst.wsdl.tests.performance
 
-plugin@org.eclipse.wst.ws.tests=v200705311823,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/ws/tests/org.eclipse.wst.ws.tests
+plugin@org.eclipse.wst.ws.tests=v200707111738,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/ws/tests/org.eclipse.wst.ws.tests
 
 !***************
\ No newline at end of file
diff --git a/releng/maps/build.cfg b/releng/maps/build.cfg
index 6b53791..2389d74 100644
--- a/releng/maps/build.cfg
+++ b/releng/maps/build.cfg
@@ -1,3 +1 @@
-wtpBuilderVersion=v200707010450
-
-
+wtpBuilderVersion=v200707010440
diff --git a/releng/maps/dependencies.properties b/releng/maps/dependencies.properties
index bf240bb..b1efc52 100644
--- a/releng/maps/dependencies.properties
+++ b/releng/maps/dependencies.properties
@@ -50,8 +50,8 @@
 dita.description = DITA-OT 1.2.1 Binary ASL Distribution
 #######################################################################################
 
-wtp.eclipse.build.id=I20070621-1340
-wtp.eclipse.build.dir=I20070621-1340
+wtp.eclipse.build.id=3.3
+wtp.eclipse.build.dir=R-3.3-200706251500
 
 #######################################################################################
 # Eclipse SDK Dependency
@@ -64,8 +64,8 @@
 eclipse.file.linux-gtk-ppc=eclipse-SDK-${wtp.eclipse.build.id}-linux-gtk-ppc.tar.gz
 eclipse.file.win32-win32-x86=eclipse-SDK-${wtp.eclipse.build.id}-win32.zip
 eclipse.file.macosx-carbon-ppc=eclipse-SDK-${wtp.eclipse.build.id}-macosx-carbon.tar.gz
-eclipse.name = Eclipse SDK v3.3 RC4
-eclipse.description = Eclipse SDK v3.3 RC4
+eclipse.name = Eclipse SDK v3.3
+eclipse.description = Eclipse SDK v3.3
 
 #######################################################################################
 
@@ -92,9 +92,9 @@
 # groupID : emf
 
 
-emf.url  = http://download.eclipse.org/modeling/emf/emf/downloads/drops/2.3.0/S200706200000/
-emf.file = emf-sdo-xsd-SDK-2.3.0RC4.zip
-emf.name = EMF SDO XSD sdk v2.3 RC4
+emf.url  = http://download.eclipse.org/modeling/emf/emf/downloads/drops/2.3.0/R200706262000/
+emf.file = emf-sdo-xsd-SDK-2.3.0.zip
+emf.name = EMF SDO XSD sdk v2.3
 emf.description = ${emf.name}
 
 #######################################################################################
@@ -105,9 +105,9 @@
 # GEF SDK will be used for building the distribution
 # groupID : gef
 
-gef.url  = http://download.eclipse.org/tools/gef/downloads/drops/S-3.3RC4-200706201021
-gef.file = 	GEF-SDK-3.3RC4.zip
-gef.name = GEF SDK 3.3 RC4
+gef.url  = http://download.eclipse.org/tools/gef/downloads/drops/R-3.3-200706281000
+gef.file = 	GEF-SDK-3.3.zip
+gef.name = GEF-SDK-3.3.zip
 gef.description = ${gef.name}
 
 #######################################################################################
@@ -119,8 +119,8 @@
 # groupID : dtp
 
 dtp.url  = http://download.eclipse.org/datatools/downloads/1.5
-dtp.file = dtp-sdk_1.5RC4.zip
-dtp.name = DTP sdk v1.5 RC4
+dtp.file = dtp-sdk_1.5_20070704.zip
+dtp.name = DTP sdk v1.5
 dtp.description = ${dtp.name}
 
 #######################################################################################
diff --git a/releng/maps/jst-doc.map b/releng/maps/jst-doc.map
index aa2f0bd..8fd3c5d 100644
--- a/releng/maps/jst-doc.map
+++ b/releng/maps/jst-doc.map
@@ -11,7 +11,7 @@
 
 !*************** ISV Docs
 
-plugin@org.eclipse.jst.doc.isv=v200707010716,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.doc.isv
+plugin@org.eclipse.jst.doc.isv=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.doc.isv
 
 !*************** Infopops
 
diff --git a/releng/maps/wst-doc.map b/releng/maps/wst-doc.map
index 7479e66..25783c4 100644
--- a/releng/maps/wst-doc.map
+++ b/releng/maps/wst-doc.map
@@ -22,7 +22,7 @@
 
 !*************** ISV Docs
 
-plugin@org.eclipse.wst.doc.isv=v200707010716,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.doc.isv
+plugin@org.eclipse.wst.doc.isv=v200706112015,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.doc.isv
 
 !*************** Infopops
 
diff --git a/releng/maps/wtp-releng.map b/releng/maps/wtp-releng.map
index 1033801..135afd1 100644
--- a/releng/maps/wtp-releng.map
+++ b/releng/maps/wtp-releng.map
@@ -4,6 +4,6 @@
 feature@org.eclipse.wtp.releng.tests.feature=v200706110805,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.wtp/org.eclipse.wtp.releng.tests.feature
 plugin@org.eclipse.callisto.tools.versionchecker=v200706041621,:pserver:anonymous@dev.eclipse.org:/cvsroot/callisto,,org.eclipse.callisto.tools.versionchecker
 plugin@org.eclipse.wtp.releng.tests=v200706201115,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.wtp/org.eclipse.wtp.releng.tests
-plugin@org.eclipse.wtp.releng.tools=v200706302235,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,releng.wtptools/org.eclipse.wtp.releng.tools
+plugin@org.eclipse.wtp.releng.tools=v200706111751,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,releng.wtptools/org.eclipse.wtp.releng.tools
 
 !***************
\ No newline at end of file