Bug 537141 - [CSS] Papyrus should rewire its dependencies to the CSSXMLEngineImpl and related classes4.1.0_M1

- Cloned the required classes into the repository, a better fix should be looked at after M1
- Update the targetplatforms

Change-Id: Id80e53e4a845a1f8aae6689fe46a88167a205023
Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>

17 files changed, 433 insertions, 116 deletions

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF
index bf7ebbcc105..472718fa1a9 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF
@@ -19,7 +19,8 @@ Export-Package: org.eclipse.papyrus.infra.gmfdiag.css,
  org.eclipse.papyrus.infra.gmfdiag.css.spi,
  org.eclipse.papyrus.infra.gmfdiag.css.style,
  org.eclipse.papyrus.infra.gmfdiag.css.style.impl,
- org.eclipse.papyrus.infra.gmfdiag.css.theme
+ org.eclipse.papyrus.infra.gmfdiag.css.theme,
+ org.eclipse.papyrus.internal.infra.gmfdiag.css.xml.engine;x-internal:=true
 Require-Bundle: org.eclipse.e4.ui.css.core;bundle-version="[0.11.0,1.0.0)",
  org.w3c.css.sac;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.emf.appearance;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
@@ -32,7 +33,7 @@ Require-Bundle: org.eclipse.e4.ui.css.core;bundle-version="[0.11.0,1.0.0)",
  org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.0.0,3.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 2.2.1.qualifier
+Bundle-Version: 2.3.0.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.Activator
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/pom.xml b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/pom.xml
index 0faaee1c716..787f390379d 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/pom.xml
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/pom.xml
@@ -7,6 +7,6 @@
 	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.css</artifactId>
-	<version>2.2.1-SNAPSHOT</version>
+	<version>2.3.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CssSvgPostProcessor.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CssSvgPostProcessor.java
index e979ddbc6ab..cde4b9e5dd4 100755
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CssSvgPostProcessor.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CssSvgPostProcessor.java
@@ -26,7 +26,6 @@ import java.util.WeakHashMap;
 import org.eclipse.e4.ui.css.core.engine.CSSEngine;
 import org.eclipse.e4.ui.css.core.impl.dom.CSSStyleRuleImpl;
 import org.eclipse.e4.ui.css.core.impl.sac.ExtendedSelector;
-import org.eclipse.e4.ui.css.xml.engine.CSSXMLEngineImpl;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
@@ -37,6 +36,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.infra.gmfdiag.common.handler.IRefreshHandlerPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.handler.RefreshHandler;
 import org.eclipse.papyrus.infra.gmfdiag.common.service.shape.SVGPostProcessor;
+import org.eclipse.papyrus.internal.infra.gmfdiag.css.xml.engine.CSSXMLEngineImpl;
 import org.eclipse.ui.IEditorPart;
 import org.w3c.css.sac.SelectorList;
 import org.w3c.dom.Element;
@@ -97,11 +97,11 @@ public class CssSvgPostProcessor implements SVGPostProcessor, IRefreshHandlerPar
 	 * Initializes this processor
 	 */
 	public CssSvgPostProcessor() {
-		engine = new CSSXMLEngineImpl();
-		relativePaths = new WeakHashMap<Resource, Map<String, URI>>();
-		loadedSheets = new ArrayList<URI>();
-		failedSheets = new ArrayList<URI>();
-		styledDocuments = new HashMap<SVGDocument, Map<Element, Map<String, String>>>();
+		engine = new CSSXMLEngineImpl(); // FIXME this has been cloned from the Platform_UI repository to fix a problem introduced by Bug 534764
+		relativePaths = new WeakHashMap<>();
+		loadedSheets = new ArrayList<>();
+		failedSheets = new ArrayList<>();
+		styledDocuments = new HashMap<>();
 		RefreshHandler.register(this);
 	}
 
@@ -202,7 +202,7 @@ public class CssSvgPostProcessor implements SVGPostProcessor, IRefreshHandlerPar
 
 		Map<String, URI> resMap = relativePaths.get(model.eResource());
 		if (resMap == null) {
-			resMap = new HashMap<String, URI>();
+			resMap = new HashMap<>();
 			relativePaths.put(model.eResource(), resMap);
 		}
 		URI canonical = resMap.get(uri);
@@ -237,7 +237,7 @@ public class CssSvgPostProcessor implements SVGPostProcessor, IRefreshHandlerPar
 		List<CSSStyleRule> rules = getAllRulesIn(engine.getDocumentCSS());
 		Map<Element, Map<String, String>> originals = styledDocuments.get(document);
 		if (originals == null) {
-			originals = new HashMap<Element, Map<String, String>>();
+			originals = new HashMap<>();
 			styledDocuments.put(document, originals);
 		}
 		applyStyles(document.getDocumentElement(), rules, originals);
@@ -268,7 +268,7 @@ public class CssSvgPostProcessor implements SVGPostProcessor, IRefreshHandlerPar
 			style = getBaseStyle(element);
 			originals.put(element, style);
 		}
-		style = new HashMap<String, String>(style);
+		style = new HashMap<>(style);
 
 		// get the applicable CSS rules
 		List<CSSStyleRule> applicable = getApplicableRules(element, rules);
@@ -300,7 +300,7 @@ public class CssSvgPostProcessor implements SVGPostProcessor, IRefreshHandlerPar
 	 * @return The CSS style rules
 	 */
 	private List<CSSStyleRule> getAllRulesIn(DocumentCSS css) {
-		List<CSSStyleRule> result = new ArrayList<CSSStyleRule>();
+		List<CSSStyleRule> result = new ArrayList<>();
 		for (int i = 0; i != css.getStyleSheets().getLength(); i++) {
 			StyleSheet ss = css.getStyleSheets().item(i);
 			if (ss instanceof CSSStyleSheet) {
@@ -326,7 +326,7 @@ public class CssSvgPostProcessor implements SVGPostProcessor, IRefreshHandlerPar
 	 * @return The matching rules
 	 */
 	private List<CSSStyleRule> getApplicableRules(Element svgElement, List<CSSStyleRule> rules) {
-		List<CSSStyleRule> matching = new ArrayList<CSSStyleRule>();
+		List<CSSStyleRule> matching = new ArrayList<>();
 
 		// Matches the rules using the selectors
 		for (CSSStyleRule rule : rules) {
@@ -363,7 +363,7 @@ public class CssSvgPostProcessor implements SVGPostProcessor, IRefreshHandlerPar
 				}
 			}
 		}
-		List<CSSStyleRule> result = new ArrayList<CSSStyleRule>();
+		List<CSSStyleRule> result = new ArrayList<>();
 		for (int i = 0; i != matching.size(); i++) {
 			if (available[i]) {
 				result.add(matching.get(i));
@@ -380,7 +380,7 @@ public class CssSvgPostProcessor implements SVGPostProcessor, IRefreshHandlerPar
 	 * @return The styling properties in the DOM
 	 */
 	private Map<String, String> getBaseStyle(Element element) {
-		HashMap<String, String> result = new HashMap<String, String>();
+		HashMap<String, String> result = new HashMap<>();
 		String styleValue = element.getAttribute("style");
 		if (styleValue != null && !styleValue.isEmpty()) {
 			String[] props = styleValue.split(";");
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/internal/infra/gmfdiag/css/xml/engine/CSSPropertyBackgroundXMLHandler.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/internal/infra/gmfdiag/css/xml/engine/CSSPropertyBackgroundXMLHandler.java
new file mode 100755
index 00000000000..90b6735b00a
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/internal/infra/gmfdiag/css/xml/engine/CSSPropertyBackgroundXMLHandler.java
@@ -0,0 +1,76 @@
+/*******************************************************************************
+ * Copyright (c) 2008 -2014 Angelo Zerr and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Angelo Zerr <angelo.zerr@gmail.com> - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@gmail.com> - Bug 422702
+ *******************************************************************************/
+package org.eclipse.papyrus.internal.infra.gmfdiag.css.xml.engine;
+
+import org.eclipse.e4.ui.css.core.dom.properties.css2.AbstractCSSPropertyBackgroundHandler;
+import org.eclipse.e4.ui.css.core.dom.properties.css2.ICSSPropertyBackgroundHandler;
+import org.eclipse.e4.ui.css.core.engine.CSSEngine;
+import org.w3c.dom.Element;
+import org.w3c.dom.css.CSSValue;
+
+/**
+ *
+ * @since 2.3.0
+ */
+// FIXME this has been cloned from the Platform_UI repository to fix a problem introduced by Bug 534764
+public class CSSPropertyBackgroundXMLHandler extends
+		AbstractCSSPropertyBackgroundHandler {
+
+	public final static ICSSPropertyBackgroundHandler INSTANCE = new CSSPropertyBackgroundXMLHandler();
+
+	@Override
+	public boolean applyCSSProperty(Object node, String property,
+			CSSValue value, String pseudo, CSSEngine engine) throws Exception {
+		if (node instanceof Element) {
+			super.applyCSSProperty(node, property, value, pseudo,
+					engine);
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public String retrieveCSSPropertyBackgroundAttachment(Object element,
+			String pseudo, CSSEngine engine) throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String retrieveCSSPropertyBackgroundColor(Object element,
+			String pseudo, CSSEngine engine) throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String retrieveCSSPropertyBackgroundImage(Object element,
+			String pseudo, CSSEngine engine) throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String retrieveCSSPropertyBackgroundPosition(Object element,
+			String pseudo, CSSEngine engine) throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String retrieveCSSPropertyBackgroundRepeat(Object element,
+			String pseudo, CSSEngine engine) throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/internal/infra/gmfdiag/css/xml/engine/CSSPropertyFontXMLHandler.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/internal/infra/gmfdiag/css/xml/engine/CSSPropertyFontXMLHandler.java
new file mode 100755
index 00000000000..f64ba6c5b34
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/internal/infra/gmfdiag/css/xml/engine/CSSPropertyFontXMLHandler.java
@@ -0,0 +1,139 @@
+/*******************************************************************************
+ * Copyright (c) 2008 - 2014 Angelo Zerr and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Angelo Zerr <angelo.zerr@gmail.com> - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@gmail.com> - Bug 422702
+ *******************************************************************************/
+package org.eclipse.papyrus.internal.infra.gmfdiag.css.xml.engine;
+
+import org.eclipse.e4.ui.css.core.dom.properties.css2.AbstractCSSPropertyFontHandler;
+import org.eclipse.e4.ui.css.core.dom.properties.css2.ICSSPropertyFontHandler;
+import org.eclipse.e4.ui.css.core.engine.CSSEngine;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.css.CSSPrimitiveValue;
+import org.w3c.dom.css.CSSValue;
+
+/**
+ *
+ * @since 2.3.0
+ */
+// FIXME this has been cloned from the Platform_UI repository to fix a problem introduced by Bug 534764
+public class CSSPropertyFontXMLHandler extends AbstractCSSPropertyFontHandler {
+
+	public final static ICSSPropertyFontHandler INSTANCE = new CSSPropertyFontXMLHandler();
+
+	@Override
+	public boolean applyCSSProperty(Object node, String property,
+			CSSValue value, String pseudo, CSSEngine engine) throws Exception {
+		if (node instanceof Element && ((Node) node).getOwnerDocument() != null) {
+			super.applyCSSProperty(node, property, value, pseudo,
+					engine);
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public void applyCSSPropertyFontSize(Object node, CSSValue value,
+			String pseudo, CSSEngine engine) throws Exception {
+		if (value.getCssValueType() == CSSValue.CSS_PRIMITIVE_VALUE) {
+			Element element = (Element) node;
+			// Add size attribute
+			int size = (int) ((CSSPrimitiveValue) value)
+					.getFloatValue(CSSPrimitiveValue.CSS_PT);
+			element.setAttribute("size", size + "");
+		}
+	}
+
+	@Override
+	public void applyCSSPropertyFontWeight(Object node, CSSValue value,
+			String pseudo, CSSEngine engine) throws Exception {
+		if (value.getCssValueType() == CSSValue.CSS_PRIMITIVE_VALUE) {
+			Element element = (Element) node;
+			String weight = ((CSSPrimitiveValue) value).getStringValue();
+			if ("bold".equals(weight.toLowerCase())) {
+				insertElement(element, "b");
+			}
+		}
+	}
+
+	@Override
+	public void applyCSSPropertyFontStyle(Object node, CSSValue value,
+			String pseudo, CSSEngine engine) throws Exception {
+		if (value.getCssValueType() == CSSValue.CSS_PRIMITIVE_VALUE) {
+			Element element = (Element) node;
+			String style = ((CSSPrimitiveValue) value).getStringValue();
+			if ("italic".equals(style)) {
+				insertElement(element, "i");
+			}
+		}
+	}
+
+	@Override
+	public String retrieveCSSPropertyFontAdjust(Object element, String pseudo,
+			CSSEngine engine) throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String retrieveCSSPropertyFontFamily(Object element, String pseudo,
+			CSSEngine engine) throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String retrieveCSSPropertyFontSize(Object element, String pseudo,
+			CSSEngine engine) throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String retrieveCSSPropertyFontStretch(Object element, String pseudo,
+			CSSEngine engine) throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String retrieveCSSPropertyFontStyle(Object element, String pseudo,
+			CSSEngine engine) throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String retrieveCSSPropertyFontVariant(Object element, String pseudo,
+			CSSEngine engine) throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String retrieveCSSPropertyFontWeight(Object element, String pseudo,
+			CSSEngine engine) throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	private void insertElement(Element element, String elementName) {
+		Element b = element.getOwnerDocument().createElement(elementName);
+		NodeList nodes = element.getChildNodes();
+		for (int i = 0; i < nodes.getLength(); i++) {
+			Node node = nodes.item(i);
+			b.appendChild(node.cloneNode(true));
+			node.getParentNode().removeChild(node);
+		}
+		element.appendChild(b);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/internal/infra/gmfdiag/css/xml/engine/CSSPropertyTextXMLHandler.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/internal/infra/gmfdiag/css/xml/engine/CSSPropertyTextXMLHandler.java
new file mode 100755
index 00000000000..8604871fa9e
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/internal/infra/gmfdiag/css/xml/engine/CSSPropertyTextXMLHandler.java
@@ -0,0 +1,58 @@
+/*******************************************************************************
+ * Copyright (c) 2008 - 2013 Angelo Zerr and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Angelo Zerr <angelo.zerr@gmail.com> - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@gmail.com> - Bug 422702
+ *******************************************************************************/
+package org.eclipse.papyrus.internal.infra.gmfdiag.css.xml.engine;
+
+import org.eclipse.e4.ui.css.core.dom.properties.css2.AbstractCSSPropertyTextHandler;
+import org.eclipse.e4.ui.css.core.dom.properties.css2.ICSSPropertyTextHandler;
+import org.eclipse.e4.ui.css.core.engine.CSSEngine;
+import org.w3c.dom.Element;
+import org.w3c.dom.css.CSSPrimitiveValue;
+import org.w3c.dom.css.CSSValue;
+
+/**
+ *
+ * @since 2.3.0
+ */
+// FIXME this has been cloned from the Platform_UI repository to fix a problem introduced by Bug 534764
+public class CSSPropertyTextXMLHandler extends AbstractCSSPropertyTextHandler {
+
+	public final static ICSSPropertyTextHandler INSTANCE = new CSSPropertyTextXMLHandler();
+
+	@Override
+	public boolean applyCSSProperty(Object node, String property,
+			CSSValue value, String pseudo, CSSEngine engine) throws Exception {
+		if (node instanceof Element) {
+			super.applyCSSProperty(node, property, value, pseudo,
+					engine);
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public void applyCSSPropertyColor(Object node, CSSValue value,
+			String pseudo, CSSEngine engine) throws Exception {
+		if (value.getCssValueType() == CSSValue.CSS_PRIMITIVE_VALUE) {
+			// Add color attribute
+			Element element = (Element) node;
+			CSSPrimitiveValue primitiveValue = (CSSPrimitiveValue) value;
+			element.setAttribute("color", primitiveValue.getStringValue());
+		}
+	}
+
+	public String retrieveCSSPropertyColor(Object node, CSSEngine engine)
+			throws Exception {
+		Element element = (Element) node;
+		return element.getAttribute("color");
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/internal/infra/gmfdiag/css/xml/engine/CSSXMLEngineImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/internal/infra/gmfdiag/css/xml/engine/CSSXMLEngineImpl.java
new file mode 100755
index 00000000000..f60b6a90f46
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/internal/infra/gmfdiag/css/xml/engine/CSSXMLEngineImpl.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2014 Angelo Zerr and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Angelo Zerr <angelo.zerr@gmail.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.papyrus.internal.infra.gmfdiag.css.xml.engine;
+
+import org.eclipse.e4.ui.css.core.dom.properties.css2.ICSSPropertyBackgroundHandler;
+import org.eclipse.e4.ui.css.core.dom.properties.css2.ICSSPropertyFontHandler;
+import org.eclipse.e4.ui.css.core.dom.properties.css2.ICSSPropertyTextHandler;
+import org.eclipse.e4.ui.css.core.engine.CSSEngine;
+import org.eclipse.e4.ui.css.core.impl.engine.CSSEngineImpl;
+
+/**
+ * {@link CSSEngine} implementation to apply style sheet to XML DOM.
+ * 
+ * @since 2.3.0
+ */
+// FIXME this has been cloned from the Platform_UI repository to fix a problem introduced by Bug 534764
+public class CSSXMLEngineImpl extends CSSEngineImpl {
+
+	public CSSXMLEngineImpl() {
+		// Register XML CSS Property Background Handler
+		super.registerCSSPropertyHandler(ICSSPropertyBackgroundHandler.class,
+				CSSPropertyBackgroundXMLHandler.INSTANCE);
+		// Register XML CSS Property Text Handler
+		super.registerCSSPropertyHandler(ICSSPropertyTextHandler.class,
+				CSSPropertyTextXMLHandler.INSTANCE);
+		// Register XML CSS Property Font Handler
+		super.registerCSSPropertyHandler(ICSSPropertyFontHandler.class,
+				CSSPropertyFontXMLHandler.INSTANCE);
+	}
+
+	@Override
+	public void reapply() {
+		// TODO Auto-generated method stub
+	}
+}
\ No newline at end of file
diff --git a/releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target b/releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target
index 49e313e9db9..d01c504c6ab 100755
--- a/releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target
+++ b/releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Tests" sequenceNumber="1530256608">
+<target name="Papyrus Tests" sequenceNumber="1531896337">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.8.0.v20180612-0940"/>
-      <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/milestones/3.8.0/S201806120940"/>
+      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.9.0.v20180717-1158"/>
+      <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/milestones/3.9.0/S201807171158"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/>
@@ -13,17 +13,17 @@
       <repository id="xpand" location="file:/home/data/httpd/download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.4.0.v20180604-1153"/>
-      <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.4"/>
+      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.4.1.v20180715-1224"/>
+      <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.4milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sdk.feature.group" version="4.8.0.v20180611-0826"/>
-      <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.8/R-4.8-201806110500/"/>
+      <unit id="org.eclipse.sdk.feature.group" version="4.9.0.v20180712-2000"/>
+      <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.9-I-builds/I20180712-2000/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.4.0.v20180611-1119"/>
-      <unit id="org.eclipse.ocl.examples.feature.group" version="6.4.0.v20180611-1119"/>
-      <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.4.0/S201806111119"/>
+      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.6.0.v20180716-1317"/>
+      <unit id="org.eclipse.ocl.examples.feature.group" version="6.5.0.v20180716-1317"/>
+      <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.5.0/S201807161317"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.xwt.feature.feature.group" version="1.3.1.I20171018-2059"/>
@@ -43,7 +43,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
-      <repository id="webtools" location="file:/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.10.0/S-3.10.0.RC4-20180611164516/repository/"/>
+      <repository id="webtools" location="file:/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.11.0/I-latest/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.0.201806010809"/>
diff --git a/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target b/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target
index 0df2f94ba61..b574ff75b13 100755
--- a/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target
+++ b/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Tests" sequenceNumber="1530256608">
+<target name="Papyrus Tests" sequenceNumber="1531896337">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.8.0.v20180612-0940"/>
-      <repository id="qvto" location="http://download.eclipse.org/mmt/qvto/updates/milestones/3.8.0/S201806120940"/>
+      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.9.0.v20180717-1158"/>
+      <repository id="qvto" location="http://download.eclipse.org/mmt/qvto/updates/milestones/3.9.0/S201807171158"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/>
@@ -13,17 +13,17 @@
       <repository id="xpand" location="http://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.4.0.v20180604-1153"/>
-      <repository id="uml" location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.4"/>
+      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.4.1.v20180715-1224"/>
+      <repository id="uml" location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.4milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sdk.feature.group" version="4.8.0.v20180611-0826"/>
-      <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.8/R-4.8-201806110500/"/>
+      <unit id="org.eclipse.sdk.feature.group" version="4.9.0.v20180712-2000"/>
+      <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.9-I-builds/I20180712-2000/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.4.0.v20180611-1119"/>
-      <unit id="org.eclipse.ocl.examples.feature.group" version="6.4.0.v20180611-1119"/>
-      <repository id="ocl" location="http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.4.0/S201806111119"/>
+      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.6.0.v20180716-1317"/>
+      <unit id="org.eclipse.ocl.examples.feature.group" version="6.5.0.v20180716-1317"/>
+      <repository id="ocl" location="http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.5.0/S201807161317"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.xwt.feature.feature.group" version="1.3.1.I20171018-2059"/>
@@ -43,7 +43,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
-      <repository id="webtools" location="http://download.eclipse.org/webtools/downloads/drops/R3.10.0/S-3.10.0.RC4-20180611164516/repository/"/>
+      <repository id="webtools" location="http://download.eclipse.org/webtools/downloads/drops/R3.11.0/I-latest/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.0.201806010809"/>
diff --git a/releng/main/targetPlatform/eclipse/org.eclipse.papyrus.main.eclipse.target.target b/releng/main/targetPlatform/eclipse/org.eclipse.papyrus.main.eclipse.target.target
index 9a64d88c93b..6b04d9990bf 100755
--- a/releng/main/targetPlatform/eclipse/org.eclipse.papyrus.main.eclipse.target.target
+++ b/releng/main/targetPlatform/eclipse/org.eclipse.papyrus.main.eclipse.target.target
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Main" sequenceNumber="1530256608">
+<target name="Papyrus Main" sequenceNumber="1531896337">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.8.0.v20180612-0940"/>
-      <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/milestones/3.8.0/S201806120940"/>
+      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.9.0.v20180717-1158"/>
+      <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/milestones/3.9.0/S201807171158"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/>
@@ -13,17 +13,17 @@
       <repository id="xpand" location="file:/home/data/httpd/download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.4.0.v20180604-1153"/>
-      <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.4"/>
+      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.4.1.v20180715-1224"/>
+      <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.4milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sdk.feature.group" version="4.8.0.v20180611-0826"/>
-      <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.8/R-4.8-201806110500/"/>
+      <unit id="org.eclipse.sdk.feature.group" version="4.9.0.v20180712-2000"/>
+      <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.9-I-builds/I20180712-2000/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.4.0.v20180611-1119"/>
-      <unit id="org.eclipse.ocl.examples.feature.group" version="6.4.0.v20180611-1119"/>
-      <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.4.0/S201806111119"/>
+      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.6.0.v20180716-1317"/>
+      <unit id="org.eclipse.ocl.examples.feature.group" version="6.5.0.v20180716-1317"/>
+      <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.5.0/S201807161317"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.xwt.feature.feature.group" version="1.3.1.I20171018-2059"/>
@@ -43,7 +43,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
-      <repository id="webtools" location="file:/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.10.0/S-3.10.0.RC4-20180611164516/repository/"/>
+      <repository id="webtools" location="file:/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.11.0/I-latest/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.0.201806010809"/>
diff --git a/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.target b/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.target
index 483dc25a421..5a2eee4216d 100755
--- a/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.target
+++ b/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.target
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Main" sequenceNumber="1530256608">
+<target name="Papyrus Main" sequenceNumber="1531896337">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.8.0.v20180612-0940"/>
-      <repository id="qvto" location="http://download.eclipse.org/mmt/qvto/updates/milestones/3.8.0/S201806120940"/>
+      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.9.0.v20180717-1158"/>
+      <repository id="qvto" location="http://download.eclipse.org/mmt/qvto/updates/milestones/3.9.0/S201807171158"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/>
@@ -13,17 +13,17 @@
       <repository id="xpand" location="http://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.4.0.v20180604-1153"/>
-      <repository id="uml" location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.4"/>
+      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.4.1.v20180715-1224"/>
+      <repository id="uml" location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.4milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sdk.feature.group" version="4.8.0.v20180611-0826"/>
-      <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.8/R-4.8-201806110500/"/>
+      <unit id="org.eclipse.sdk.feature.group" version="4.9.0.v20180712-2000"/>
+      <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.9-I-builds/I20180712-2000/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.4.0.v20180611-1119"/>
-      <unit id="org.eclipse.ocl.examples.feature.group" version="6.4.0.v20180611-1119"/>
-      <repository id="ocl" location="http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.4.0/S201806111119"/>
+      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.6.0.v20180716-1317"/>
+      <unit id="org.eclipse.ocl.examples.feature.group" version="6.5.0.v20180716-1317"/>
+      <repository id="ocl" location="http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.5.0/S201807161317"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.xwt.feature.feature.group" version="1.3.1.I20171018-2059"/>
@@ -43,7 +43,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
-      <repository id="webtools" location="http://download.eclipse.org/webtools/downloads/drops/R3.10.0/S-3.10.0.RC4-20180611164516/repository/"/>
+      <repository id="webtools" location="http://download.eclipse.org/webtools/downloads/drops/R3.11.0/I-latest/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.0.201806010809"/>
diff --git a/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd b/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd
index db5da77c900..102e0f747d0 100755
--- a/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd
+++ b/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd
@@ -5,7 +5,7 @@ target "Papyrus Main" with requirements source
 
 //updateFrom("QVT Operational",0)
 
-location qvto "http://download.eclipse.org/mmt/qvto/updates/milestones/3.8.0/S201806120940" {
+location qvto "http://download.eclipse.org/mmt/qvto/updates/milestones/3.9.0/S201807171158" {
 	org.eclipse.m2m.qvt.oml.sdk.feature.group
 }
 
@@ -18,19 +18,19 @@ location xpand "http://download.eclipse.org/modeling/m2t/xpand/updates/releases/
 
 //updateFrom("MDT UML2",0) 
 
-location uml "http://download.eclipse.org/modeling/mdt/uml2/updates/5.4" {
+location uml "http://download.eclipse.org/modeling/mdt/uml2/updates/5.4milestones" {
 	org.eclipse.uml2.sdk.feature.group
 }
 
 //updateFrom("Eclipse",0)
 
-location platform "http://download.eclipse.org/eclipse/updates/4.8/R-4.8-201806110500/" {
+location platform "http://download.eclipse.org/eclipse/updates/4.9-I-builds/I20180712-2000/" {
 	org.eclipse.sdk.feature.group
 }
 
 //updateFrom("OCL",0) 
 
-location ocl "http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.4.0/S201806111119" {
+location ocl "http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.5.0/S201807161317" {
 	org.eclipse.ocl.examples.classic.feature.group
 	org.eclipse.ocl.examples.feature.group
 }
@@ -58,7 +58,7 @@ location mwe "http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.9
 
 //updateFrom("WebTools",0) 
 
-location webtools "http://download.eclipse.org/webtools/downloads/drops/R3.10.0/S-3.10.0.RC4-20180611164516/repository/" {
+location webtools "http://download.eclipse.org/webtools/downloads/drops/R3.11.0/I-latest/repository/" {
 	org.eclipse.wst.xml_ui.feature.feature.group lazy 
 }
 
diff --git a/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target b/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target
index 1ec8f72998b..e45d38b9c78 100755
--- a/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target
+++ b/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus RCP" sequenceNumber="1530256610">
+<target name="Papyrus RCP" sequenceNumber="1531896339">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.8.0.v20180612-0940"/>
-      <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/milestones/3.8.0/S201806120940"/>
+      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.9.0.v20180717-1158"/>
+      <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/milestones/3.9.0/S201807171158"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/>
@@ -13,13 +13,13 @@
       <repository id="xpand" location="file:/home/data/httpd/download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.4.0.v20180604-1153"/>
-      <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.4"/>
+      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.4.1.v20180715-1224"/>
+      <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.4milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.4.0.v20180611-1119"/>
-      <unit id="org.eclipse.ocl.examples.feature.group" version="6.4.0.v20180611-1119"/>
-      <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.4.0/S201806111119"/>
+      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.6.0.v20180716-1317"/>
+      <unit id="org.eclipse.ocl.examples.feature.group" version="6.5.0.v20180716-1317"/>
+      <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.5.0/S201807161317"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.xwt.feature.feature.group" version="1.3.1.I20171018-2059"/>
@@ -39,7 +39,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
-      <repository id="webtools" location="file:/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.10.0/S-3.10.0.RC4-20180611164516/repository/"/>
+      <repository id="webtools" location="file:/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.11.0/I-latest/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.0.201806010809"/>
@@ -95,11 +95,11 @@
       <repository id="egit" location="file:/home/data/httpd/download.eclipse.org/egit/updates-5.0"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.8.0.v20180512-1132"/>
-      <unit id="org.eclipse.rcp.configuration.feature.group" version="1.1.100.v20180611-0500"/>
-      <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.0.v20180518-2029"/>
-      <unit id="org.eclipse.sdk.feature.group" version="4.8.0.v20180611-0826"/>
-      <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.8/R-4.8-201806110500/"/>
+      <unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.9.0.v20180703-1525"/>
+      <unit id="org.eclipse.rcp.configuration.feature.group" version="1.1.200.v20180712-2000"/>
+      <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.100.v20180611-1436"/>
+      <unit id="org.eclipse.sdk.feature.group" version="4.9.0.v20180712-2000"/>
+      <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.9-I-builds/I20180712-2000/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.mylyn.ide_feature.feature.group" version="3.24.0.v20170629-2230"/>
diff --git a/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target b/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target
index d7b8ae8d195..94849ec164e 100755
--- a/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target
+++ b/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus RCP" sequenceNumber="1530256610">
+<target name="Papyrus RCP" sequenceNumber="1531896339">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.8.0.v20180612-0940"/>
-      <repository id="qvto" location="http://download.eclipse.org/mmt/qvto/updates/milestones/3.8.0/S201806120940"/>
+      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.9.0.v20180717-1158"/>
+      <repository id="qvto" location="http://download.eclipse.org/mmt/qvto/updates/milestones/3.9.0/S201807171158"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/>
@@ -13,13 +13,13 @@
       <repository id="xpand" location="http://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.4.0.v20180604-1153"/>
-      <repository id="uml" location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.4"/>
+      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.4.1.v20180715-1224"/>
+      <repository id="uml" location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.4milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.4.0.v20180611-1119"/>
-      <unit id="org.eclipse.ocl.examples.feature.group" version="6.4.0.v20180611-1119"/>
-      <repository id="ocl" location="http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.4.0/S201806111119"/>
+      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.6.0.v20180716-1317"/>
+      <unit id="org.eclipse.ocl.examples.feature.group" version="6.5.0.v20180716-1317"/>
+      <repository id="ocl" location="http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.5.0/S201807161317"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.xwt.feature.feature.group" version="1.3.1.I20171018-2059"/>
@@ -39,7 +39,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
-      <repository id="webtools" location="http://download.eclipse.org/webtools/downloads/drops/R3.10.0/S-3.10.0.RC4-20180611164516/repository/"/>
+      <repository id="webtools" location="http://download.eclipse.org/webtools/downloads/drops/R3.11.0/I-latest/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.0.201806010809"/>
@@ -95,11 +95,11 @@
       <repository id="egit" location="http://download.eclipse.org/egit/updates-5.0"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.8.0.v20180512-1132"/>
-      <unit id="org.eclipse.rcp.configuration.feature.group" version="1.1.100.v20180611-0500"/>
-      <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.0.v20180518-2029"/>
-      <unit id="org.eclipse.sdk.feature.group" version="4.8.0.v20180611-0826"/>
-      <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.8/R-4.8-201806110500/"/>
+      <unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.9.0.v20180703-1525"/>
+      <unit id="org.eclipse.rcp.configuration.feature.group" version="1.1.200.v20180712-2000"/>
+      <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.100.v20180611-1436"/>
+      <unit id="org.eclipse.sdk.feature.group" version="4.9.0.v20180712-2000"/>
+      <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.9-I-builds/I20180712-2000/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.mylyn.ide_feature.feature.group" version="3.24.0.v20170629-2230"/>
diff --git a/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.tpd b/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.tpd
index ea356dab6ab..7d9df4d6928 100644
--- a/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.tpd
+++ b/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.tpd
@@ -12,7 +12,7 @@ location egit "http://download.eclipse.org/egit/updates-5.0" {
 
 //updateFrom("Eclipse",0)
 
-location platform "http://download.eclipse.org/eclipse/updates/4.8/R-4.8-201806110500/" {
+location platform "http://download.eclipse.org/eclipse/updates/4.9-I-builds/I20180712-2000/" {
 	org.eclipse.e4.core.tools.feature.feature.group 
 	org.eclipse.rcp.configuration.feature.group 
 	org.eclipse.equinox.executable.feature.group 
diff --git a/releng/toolsmiths/targetPlatform/eclipse/org.eclipse.papyrus.toolsmiths.eclipse.targetplatform.target b/releng/toolsmiths/targetPlatform/eclipse/org.eclipse.papyrus.toolsmiths.eclipse.targetplatform.target
index e5657cdc155..5c5152dd445 100755
--- a/releng/toolsmiths/targetPlatform/eclipse/org.eclipse.papyrus.toolsmiths.eclipse.targetplatform.target
+++ b/releng/toolsmiths/targetPlatform/eclipse/org.eclipse.papyrus.toolsmiths.eclipse.targetplatform.target
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Toolsmiths" sequenceNumber="1530256617">
+<target name="Papyrus Toolsmiths" sequenceNumber="1531896345">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.8.0.v20180612-0940"/>
-      <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/milestones/3.8.0/S201806120940"/>
+      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.9.0.v20180717-1158"/>
+      <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/milestones/3.9.0/S201807171158"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/>
@@ -13,17 +13,17 @@
       <repository id="xpand" location="file:/home/data/httpd/download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.4.0.v20180604-1153"/>
-      <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.4"/>
+      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.4.1.v20180715-1224"/>
+      <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.4milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sdk.feature.group" version="4.8.0.v20180611-0826"/>
-      <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.8/R-4.8-201806110500/"/>
+      <unit id="org.eclipse.sdk.feature.group" version="4.9.0.v20180712-2000"/>
+      <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.9-I-builds/I20180712-2000/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.4.0.v20180611-1119"/>
-      <unit id="org.eclipse.ocl.examples.feature.group" version="6.4.0.v20180611-1119"/>
-      <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.4.0/S201806111119"/>
+      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.6.0.v20180716-1317"/>
+      <unit id="org.eclipse.ocl.examples.feature.group" version="6.5.0.v20180716-1317"/>
+      <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.5.0/S201807161317"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.xwt.feature.feature.group" version="1.3.1.I20171018-2059"/>
@@ -43,7 +43,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
-      <repository id="webtools" location="file:/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.10.0/S-3.10.0.RC4-20180611164516/repository/"/>
+      <repository id="webtools" location="file:/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.11.0/I-latest/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.0.201806010809"/>
diff --git a/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.target b/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.target
index 2a7b6b7451b..d0037752fa7 100755
--- a/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.target
+++ b/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.target
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Toolsmiths" sequenceNumber="1530256617">
+<target name="Papyrus Toolsmiths" sequenceNumber="1531896345">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.8.0.v20180612-0940"/>
-      <repository id="qvto" location="http://download.eclipse.org/mmt/qvto/updates/milestones/3.8.0/S201806120940"/>
+      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.9.0.v20180717-1158"/>
+      <repository id="qvto" location="http://download.eclipse.org/mmt/qvto/updates/milestones/3.9.0/S201807171158"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/>
@@ -13,17 +13,17 @@
       <repository id="xpand" location="http://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.4.0.v20180604-1153"/>
-      <repository id="uml" location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.4"/>
+      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.4.1.v20180715-1224"/>
+      <repository id="uml" location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.4milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sdk.feature.group" version="4.8.0.v20180611-0826"/>
-      <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.8/R-4.8-201806110500/"/>
+      <unit id="org.eclipse.sdk.feature.group" version="4.9.0.v20180712-2000"/>
+      <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.9-I-builds/I20180712-2000/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.4.0.v20180611-1119"/>
-      <unit id="org.eclipse.ocl.examples.feature.group" version="6.4.0.v20180611-1119"/>
-      <repository id="ocl" location="http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.4.0/S201806111119"/>
+      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.6.0.v20180716-1317"/>
+      <unit id="org.eclipse.ocl.examples.feature.group" version="6.5.0.v20180716-1317"/>
+      <repository id="ocl" location="http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.5.0/S201807161317"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.xwt.feature.feature.group" version="1.3.1.I20171018-2059"/>
@@ -43,7 +43,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
-      <repository id="webtools" location="http://download.eclipse.org/webtools/downloads/drops/R3.10.0/S-3.10.0.RC4-20180611164516/repository/"/>
+      <repository id="webtools" location="http://download.eclipse.org/webtools/downloads/drops/R3.11.0/I-latest/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.0.201806010809"/>