Merge branch 'master' of ssh://canderson@git.eclipse.org/gitroot/webtools/webtools.maps.git
diff --git a/releng.sourceediting/maps/jst-jsp-tests.map b/releng.sourceediting/maps/jst-jsp-tests.map
index 5551911..aa834af 100644
--- a/releng.sourceediting/maps/jst-jsp-tests.map
+++ b/releng.sourceediting/maps/jst-jsp-tests.map
@@ -2,7 +2,7 @@
! This map file is for the WTP 3.6 release
! These bundles are currently being developed and released from the master branch
-plugin@org.eclipse.jst.jsp.core.tests=GIT,tag=v201405122054,repo=git://git.eclipse.org/gitroot/sourceediting/webtools.sourceediting.tests.git,path=tests/org.eclipse.jst.jsp.core.tests
+plugin@org.eclipse.jst.jsp.core.tests=GIT,tag=v201405210223,repo=git://git.eclipse.org/gitroot/sourceediting/webtools.sourceediting.tests.git,path=tests/org.eclipse.jst.jsp.core.tests
plugin@org.eclipse.jst.jsp.ui.tests=GIT,tag=v201211191622,repo=git://git.eclipse.org/gitroot/sourceediting/webtools.sourceediting.tests.git,path=tests/org.eclipse.jst.jsp.ui.tests
plugin@org.eclipse.jst.jsp.tests.encoding=GIT,tag=v201008251737,repo=git://git.eclipse.org/gitroot/sourceediting/webtools.sourceediting.tests.git,path=tests/org.eclipse.jst.jsp.tests.encoding
diff --git a/releng/luna/dependencies.properties b/releng/luna/dependencies.properties
index c4b5f60..d1eafc2 100644
--- a/releng/luna/dependencies.properties
+++ b/releng/luna/dependencies.properties
@@ -233,16 +233,16 @@
# Eclipse Modeling Framework (EMF) Transaction Dependency
# groupID : emftransaction
-emftransaction.id=1.7.0
-emftransaction.dir.id=R201306111400
+emftransaction.id=1.8.0M7
+emftransaction.dir.id=S201405051603
-emftransaction.mirror.prefixuri=/modeling/emf/transaction/downloads/drops/1.7.0/${emftransaction.dir.id}
+emftransaction.mirror.prefixuri=/modeling/emf/transaction/downloads/drops/1.8.0/${emftransaction.dir.id}
emftransaction.file=emf-transaction-runtime-${emftransaction.id}.zip
emftransaction.repo=emf-transaction-Update-${emftransaction.id}.zip
#emftransaction.tobeinstalledfeaturegroups=org.eclipse.emf.transaction.feature.group,org.eclipse.emf.workspace.feature.group
-emftransaction.name=EMF Transaction v1.7.0
+emftransaction.name=EMF Transaction v1.8.0
emftransaction.description=(Required for JPA Diagram Editor)
emftransaction.url=http://download.eclipse.org${emftransaction.mirror.prefixuri}
@@ -253,16 +253,16 @@
# Eclipse Modeling Framework (EMF) Validation Dependency
# groupID : emfvalidation
-emfvalidation.id=1.7.0
-emfvalidation.dir.id=R201306111341
+emfvalidation.id=1.8.0M7
+emfvalidation.dir.id=S201405051521
-emfvalidation.mirror.prefixuri=/modeling/emf/validation/downloads/drops/1.7.0/${emfvalidation.dir.id}
+emfvalidation.mirror.prefixuri=/modeling/emf/validation/downloads/drops/1.8.0/${emfvalidation.dir.id}
emfvalidation.file=emf-validation-runtime-${emfvalidation.id}.zip
emfvalidation.repo=emf-validation-Update-${emfvalidation.id}.zip
#emfvalidation.tobeinstalledfeaturegroups=org.eclipse.emf.validation.feature.group
-emfvalidation.name=EMF Validation v1.7.0
+emfvalidation.name=EMF Validation v1.8.0
emfvalidation.description=(Required for JPA Diagram Editor)
emfvalidation.url=http://download.eclipse.org${emfvalidation.mirror.prefixuri}
@@ -272,23 +272,39 @@
#################################################################################
# Graphiti Dependency
# groupID : graphiti
-graphiti.id=0.10.0.201306120936
-graphiti.dir.id=0.10.0
+#Milestones
+graphiti.id=0.11.0M7.201405070848
+graphiti.dir.id=S-0.11.0M7-201405070848
-graphiti.mirror.prefixuri=/graphiti/updates/${graphiti.dir.id}
+graphiti.mirror.prefixuri=/graphiti/updates/milestones/${graphiti.dir.id}
graphiti.mirror.zip.prefixuri=/graphiti/archives/milestones
-graphiti.file=org.eclipse.graphiti.site_0.10.0.201306120936.zip
+graphiti.file=org.eclipse.graphiti.site_${graphiti.id}.zip
graphiti.repo=org.eclipse.graphiti.site_${graphiti.id}.zip
graphiti.tobeinstalledfeaturegroups=org.eclipse.graphiti.feature.feature.group
-graphiti.name=Graphiti v0.10.0
+graphiti.name=Graphiti v0.11.0
graphiti.description=(Required for JPA Diagram Editor)
graphiti.url=http://download.eclipse.org${graphiti.mirror.prefixuri}
graphiti.build.home=http://www.eclipse.org/graphiti/download.php
-
+#Release
+#graphiti.id=0.10.0.201306120936
+#graphiti.dir.id=0.10.0
+#
+#graphiti.mirror.prefixuri=/graphiti/updates/${graphiti.dir.id}
+#graphiti.mirror.zip.prefixuri=/graphiti/archives/milestones
+#graphiti.file=org.eclipse.graphiti.site_0.10.0.201306120936.zip
+#
+#graphiti.repo=org.eclipse.graphiti.site_${graphiti.id}.zip
+#graphiti.tobeinstalledfeaturegroups=org.eclipse.graphiti.feature.feature.group
+#
+#graphiti.name=Graphiti v0.10.0
+#graphiti.description=(Required for JPA Diagram Editor)
+#
+#graphiti.url=http://download.eclipse.org${graphiti.mirror.prefixuri}
+#graphiti.build.home=http://www.eclipse.org/graphiti/download.php
#######################################################################################
# Eclipse Graphical Editing Framework (GEF) Dependency
