v200703070000
diff --git a/releng.dali/maps/dali.map b/releng.dali/maps/dali.map
index 4f468b2..1e80703 100644
--- a/releng.dali/maps/dali.map
+++ b/releng.dali/maps/dali.map
@@ -1,8 +1,8 @@
 !*************** dali.map
 
-feature@org.eclipse.jpa=v200611030000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/assembly/features/org.eclipse.jpa.feature
-feature@org.eclipse.jpa.sdk=v200611010000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/assembly/features/org.eclipse.jpa.sdk
+feature@org.eclipse.jpa=v200703070000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/assembly/features/org.eclipse.jpa
+feature@org.eclipse.jpa.sdk=v200703070000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/assembly/features/org.eclipse.jpa.sdk
 
-plugin@org.eclipse.jst.jpa=v200611030000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/assembly/plugins/org.eclipse.jst.jpa
+plugin@org.eclipse.jpa=v200703070000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/assembly/plugins/org.eclipse.jpa
 
 !*************** 
\ No newline at end of file
diff --git a/releng.dali/maps/dali.tests.map b/releng.dali/maps/dali.tests.map
index 7aa455d..3e5e174 100644
--- a/releng.dali/maps/dali.tests.map
+++ b/releng.dali/maps/dali.tests.map
@@ -1,5 +1,5 @@
 !*************** dali.tests.map
 
-feature@org.eclipse.jpa.tests=v200610300000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/assembly/features/org.eclipse.jpa.tests.feature
+feature@org.eclipse.jpa.tests=v200703070000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/assembly/features/org.eclipse.jpa.tests
 
 !*************** 
diff --git a/releng.dali/maps/dependencies.properties b/releng.dali/maps/dependencies.properties
index a150410..c9b4f6f 100644
--- a/releng.dali/maps/dependencies.properties
+++ b/releng.dali/maps/dependencies.properties
@@ -38,26 +38,12 @@
 # WTP bundle zip to be downloaded
 # WTP SDK will be used for building the distribution
 # groupID : wtp
-#wtp.url  = http://download.eclipse.org/webtools/committers/drops/R2.0/S-2.0M5-200702201908
-#wtp.file = wtp-sdk-S-2.0M5-200702201908.zip
-#wtp.name = WTP sdk v2.0 S-2.0M5-200702201908
-#wtp.description = WTP sdk bundle v2.0 S-2.0M5-200702201908
-wtp.url  = http://download.eclipse.org/webtools/committers/drops/R2.0/S-2.0M5-200702210538
-wtp.file = wtp-sdk-S-2.0M5-200702210538.zip
-wtp.name = WTP sdk v2.0 S-2.0M5-200702210538
-wtp.description = WTP sdk bundle v2.0 S-2.0M5-200702210538
-#######################################################################################
-
-#######################################################################################
-# WST Automated Tests Dependency
-# WTP WST Automated Tests zip to be downloaded
-# groupID : wstAutomatedTests
-#wstAutomatedTests.url  = http://download.eclipse.org/webtools/committers/drops/R2.0/S-2.0M5-200702201908
-#wstAutomatedTests.file = wtp-wst-Automated-Tests-S-2.0M5-200702201908.zip
-#wstAutomatedTests.name = WST Automated Tests v2.0 S-2.0M5-200702201908
-#wstAutomatedTests.description = WST Automated Tests bundle v2.0 S-2.0M5-200702201908
-wstAutomatedTests.url  = http://download.eclipse.org/webtools/committers/drops/R2.0/S-2.0M5-200702210538
-wstAutomatedTests.file = wtp-wst-Automated-Tests-S-2.0M5-200702210538.zip
-wstAutomatedTests.name = WST Automated Tests v2.0 S-2.0M5-200702210538
-wstAutomatedTests.description = WST Automated Tests bundle v2.0 S-2.0M5-200702210538
+#wtp.url  = http://download.eclipse.org/webtools/committers/drops/R2.0/S-2.0M5-200702210538
+#wtp.file = wtp-sdk-S-2.0M5-200702210538.zip
+#wtp.name = WTP sdk v2.0 S-2.0M5-200702210538
+#wtp.description = WTP sdk bundle v2.0 S-2.0M5-200702210538
+wtp.url  = http://download.eclipse.org/webtools/downloads/drops/R2.0/S-2.0M5-200702230758
+wtp.file = wtp-sdk-S-2.0M5-200702230758.zip
+wtp.name = WTP sdk v2.0 S-2.0M5-200702230758
+wtp.description = WTP sdk bundle v2.0 S-2.0M5-200702230758
 #######################################################################################
diff --git a/releng.dali/maps/jpa.map b/releng.dali/maps/jpa.map
index 04337be..8799b95 100644
--- a/releng.dali/maps/jpa.map
+++ b/releng.dali/maps/jpa.map
@@ -1,13 +1,13 @@
 !*************** jpa.map
 
-feature@org.eclipse.jst.jpa.feature=v200702150000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/features/org.eclipse.jst.jpa.feature
-feature@org.eclipse.jst.jpa_sdk.feature=v200701040000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/features/org.eclipse.jst.jpa_sdk.feature
+feature@org.eclipse.jpa.feature=v200703070000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/features/org.eclipse.jpa.feature
+feature@org.eclipse.jpa_sdk.feature=v200703070000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/features/org.eclipse.jpa_sdk.feature
 
-plugin@org.eclipse.jst.jpa.utility=v200702150000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/plugins/org.eclipse.jst.jpa.utility
-plugin@org.eclipse.jst.jpa.db=v200702150001,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/plugins/org.eclipse.jst.jpa.db
-plugin@org.eclipse.jst.jpa.db.ui=v200702150000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/plugins/org.eclipse.jst.jpa.db.ui
-plugin@org.eclipse.jst.jpa.gen=v200702150000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/plugins/org.eclipse.jst.jpa.gen
-plugin@org.eclipse.jst.jpa.core=v200703010000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/plugins/org.eclipse.jst.jpa.core
-plugin@org.eclipse.jst.jpa.ui=v200703010000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/plugins/org.eclipse.jst.jpa.ui
+plugin@org.eclipse.jpa.utility=v200703060000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpa.utility
+plugin@org.eclipse.jpa.db=v200703060000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpa.db
+plugin@org.eclipse.jpa.db.ui=v200703060000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpa.db.ui
+plugin@org.eclipse.jpa.gen=v200703060000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpa.gen
+plugin@org.eclipse.jpa.core=v200703060000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpa.core
+plugin@org.eclipse.jpa.ui=v200703060000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpa.ui
 
 !***************
\ No newline at end of file
diff --git a/releng.dali/maps/jpa.tests.map b/releng.dali/maps/jpa.tests.map
index a22cb43..9bd0eac 100644
--- a/releng.dali/maps/jpa.tests.map
+++ b/releng.dali/maps/jpa.tests.map
@@ -1,8 +1,8 @@
 !*************** jpa.tests.map
 
-feature@org.eclipse.jst.jpa.tests.feature=v200702120000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/features/org.eclipse.jst.jpa.tests.feature
+feature@org.eclipse.jpa.tests.feature=v200703070000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/features/org.eclipse.jpa.tests.feature
 
-plugin@org.eclipse.jst.jpa.utility.tests=v200702280002,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/tests/org.eclipse.jst.jpa.utility.tests
-plugin@org.eclipse.jst.jpa.core.tests=v200702210000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/tests/org.eclipse.jst.jpa.core.tests
+plugin@org.eclipse.jpa.utility.tests=v200703070001,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/tests/org.eclipse.jpa.utility.tests
+plugin@org.eclipse.jpa.core.tests=v200703070001,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/tests/org.eclipse.jpa.core.tests
 
 !*************** 
\ No newline at end of file