[527277] Update plugin.properties

Manual edit for:
- plugins/org.eclipse.sirius.tests.rcptt.properties.edit/plugin.properties
- plugins/org.eclipse.sirius.ext.ide/plugin.properties
- plugins/org.eclipse.sirius.tests.rcptt.properties.editor/plugin.properties
- plugins/org.eclipse.sirius.tests.rcptt.properties/plugin.properties

Bug: 527277
Change-Id: I5c31f153ce2bc57769ac536e0547740086fab0cb
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>

122 files changed, 498 insertions, 249 deletions

diff --git a/packaging/org.eclipse.sirius.tests.product/plugin.properties b/packaging/org.eclipse.sirius.tests.product/plugin.properties
index 2a15977a72..0636e27e35 100644
--- a/packaging/org.eclipse.sirius.tests.product/plugin.properties
+++ b/packaging/org.eclipse.sirius.tests.product/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2016 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.common.acceleo.aql.ide/plugin.properties b/plugins/org.eclipse.sirius.common.acceleo.aql.ide/plugin.properties
index 36e1f13e0a..5a590895f5 100644
--- a/plugins/org.eclipse.sirius.common.acceleo.aql.ide/plugin.properties
+++ b/plugins/org.eclipse.sirius.common.acceleo.aql.ide/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2015 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.common.acceleo.aql/plugin.properties b/plugins/org.eclipse.sirius.common.acceleo.aql/plugin.properties
index 0a53cd7255..2c15489c6a 100644
--- a/plugins/org.eclipse.sirius.common.acceleo.aql/plugin.properties
+++ b/plugins/org.eclipse.sirius.common.acceleo.aql/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2015 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/plugin.properties b/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/plugin.properties
index ea8e446b19..de2c36ebfa 100644
--- a/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/plugin.properties
+++ b/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2007-2013 THALES GLOBAL SERVICES
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.common.acceleo.mtl/plugin.properties b/plugins/org.eclipse.sirius.common.acceleo.mtl/plugin.properties
index 7a9dc05ec3..1dd25a9f52 100644
--- a/plugins/org.eclipse.sirius.common.acceleo.mtl/plugin.properties
+++ b/plugins/org.eclipse.sirius.common.acceleo.mtl/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2013 THALES GLOBAL SERVICES
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.common.interpreter.aql/plugin.properties b/plugins/org.eclipse.sirius.common.interpreter.aql/plugin.properties
index 2b51737c53..790b1ba90a 100644
--- a/plugins/org.eclipse.sirius.common.interpreter.aql/plugin.properties
+++ b/plugins/org.eclipse.sirius.common.interpreter.aql/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2017 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.common.interpreter/plugin.properties b/plugins/org.eclipse.sirius.common.interpreter/plugin.properties
index fda4a5251c..0f73cbe938 100644
--- a/plugins/org.eclipse.sirius.common.interpreter/plugin.properties
+++ b/plugins/org.eclipse.sirius.common.interpreter/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2015, 2016 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.common.ocl/plugin.properties b/plugins/org.eclipse.sirius.common.ocl/plugin.properties
index c1dd0027ca..56fdd1957c 100644
--- a/plugins/org.eclipse.sirius.common.ocl/plugin.properties
+++ b/plugins/org.eclipse.sirius.common.ocl/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2007, 2008 THALES GLOBAL SERVICES
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.common.ui.ext/plugin.properties b/plugins/org.eclipse.sirius.common.ui.ext/plugin.properties
index 48d4d77819..1b88b40d47 100644
--- a/plugins/org.eclipse.sirius.common.ui.ext/plugin.properties
+++ b/plugins/org.eclipse.sirius.common.ui.ext/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2015 OBEO
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.common.ui/plugin.properties b/plugins/org.eclipse.sirius.common.ui/plugin.properties
index abd3c9c137..01adaa3310 100644
--- a/plugins/org.eclipse.sirius.common.ui/plugin.properties
+++ b/plugins/org.eclipse.sirius.common.ui/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2007, 2018 THALES GLOBAL SERVICES
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.common.xtext/plugin.properties b/plugins/org.eclipse.sirius.common.xtext/plugin.properties
index 7d693e5fbb..395c3b5a8f 100644
--- a/plugins/org.eclipse.sirius.common.xtext/plugin.properties
+++ b/plugins/org.eclipse.sirius.common.xtext/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2012 THALES GLOBAL SERVICES
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.common/plugin.properties b/plugins/org.eclipse.sirius.common/plugin.properties
index ce3c217b70..8a259af71c 100644
--- a/plugins/org.eclipse.sirius.common/plugin.properties
+++ b/plugins/org.eclipse.sirius.common/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2007, 2015 THALES GLOBAL SERVICES and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.common/plugin_fr.properties b/plugins/org.eclipse.sirius.common/plugin_fr.properties
index b6148ceef6..ec6badf69f 100644
--- a/plugins/org.eclipse.sirius.common/plugin_fr.properties
+++ b/plugins/org.eclipse.sirius.common/plugin_fr.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2007-2015 THALES GLOBAL SERVICES
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.diagram.elk/plugin.properties b/plugins/org.eclipse.sirius.diagram.elk/plugin.properties
index dfd4666fa4..a6303363ad 100644
--- a/plugins/org.eclipse.sirius.diagram.elk/plugin.properties
+++ b/plugins/org.eclipse.sirius.diagram.elk/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2018 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #     Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.diagram.formatdata/plugin.properties b/plugins/org.eclipse.sirius.diagram.formatdata/plugin.properties
index 3881b1616c..71df6b98a5 100644
--- a/plugins/org.eclipse.sirius.diagram.formatdata/plugin.properties
+++ b/plugins/org.eclipse.sirius.diagram.formatdata/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2007, 2016 THALES GLOBAL SERVICES
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.diagram.layoutdata/plugin.properties b/plugins/org.eclipse.sirius.diagram.layoutdata/plugin.properties
index a3b07374c9..ff37fef936 100644
--- a/plugins/org.eclipse.sirius.diagram.layoutdata/plugin.properties
+++ b/plugins/org.eclipse.sirius.diagram.layoutdata/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2007, 2008 THALES GLOBAL SERVICES
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/plugin.properties b/plugins/org.eclipse.sirius.diagram.sequence.edit/plugin.properties
index 05ef85b270..127e109ed9 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/plugin.properties
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2010 THALES GLOBAL SERVICES
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/plugin.properties b/plugins/org.eclipse.sirius.diagram.sequence.ui/plugin.properties
index 7e08b53b5e..a383ac29bc 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.ui/plugin.properties
+++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2007, 2015 THALES GLOBAL SERVICES
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/plugin.properties b/plugins/org.eclipse.sirius.diagram.sequence/plugin.properties
index 870bcee733..a355eb83db 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/plugin.properties
+++ b/plugins/org.eclipse.sirius.diagram.sequence/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2007, 2017 THALES GLOBAL SERVICES
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.diagram.ui.ext/plugin.properties b/plugins/org.eclipse.sirius.diagram.ui.ext/plugin.properties
index 2ef558b11c..8ab34ca04c 100644
--- a/plugins/org.eclipse.sirius.diagram.ui.ext/plugin.properties
+++ b/plugins/org.eclipse.sirius.diagram.ui.ext/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2015 OBEO
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.diagram.ui/plugin.properties b/plugins/org.eclipse.sirius.diagram.ui/plugin.properties
index 8e040245e4..30dcbccaf8 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/plugin.properties
+++ b/plugins/org.eclipse.sirius.diagram.ui/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2007, 2018 THALES GLOBAL SERVICES.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.diagram/plugin.properties b/plugins/org.eclipse.sirius.diagram/plugin.properties
index f89e3806e7..c429e6872e 100644
--- a/plugins/org.eclipse.sirius.diagram/plugin.properties
+++ b/plugins/org.eclipse.sirius.diagram/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2007, 2018 THALES GLOBAL SERVICES
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.doc/plugin.properties b/plugins/org.eclipse.sirius.doc/plugin.properties
index 0cf419c24d..23c3654a8c 100644
--- a/plugins/org.eclipse.sirius.doc/plugin.properties
+++ b/plugins/org.eclipse.sirius.doc/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2007, 2008 THALES GLOBAL SERVICES
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.ecore.extender/plugin.properties b/plugins/org.eclipse.sirius.ecore.extender/plugin.properties
index a3dcef01e3..0c1a5a76a9 100644
--- a/plugins/org.eclipse.sirius.ecore.extender/plugin.properties
+++ b/plugins/org.eclipse.sirius.ecore.extender/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2013, 2017 THALES GLOBAL SERVICES
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.editor.diagram/plugin.properties b/plugins/org.eclipse.sirius.editor.diagram/plugin.properties
index f2641fb1e6..6833115362 100644
--- a/plugins/org.eclipse.sirius.editor.diagram/plugin.properties
+++ b/plugins/org.eclipse.sirius.editor.diagram/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 #   Copyright (c) 2007, 2013 THALES GLOBAL SERVICES.
 #   All rights reserved. This program and the accompanying materials
-#   are made available under the terms of the Eclipse Public License v1.0
+#   are made available under the terms of the Eclipse Public License 2.0
 #   which accompanies this distribution, and is available at
-#   http://www.eclipse.org/legal/epl-v10.html
+#   https://www.eclipse.org/legal/epl-2.0/
+#
+#   SPDX-License-Identifier: EPL-2.0
 #   Contributors:
 #      Obeo - initial API and implementation
 # ====================================================================
diff --git a/plugins/org.eclipse.sirius.editor.properties.ext.widgets.reference/plugin.properties b/plugins/org.eclipse.sirius.editor.properties.ext.widgets.reference/plugin.properties
index a347b191e9..7ee8d749bf 100644
--- a/plugins/org.eclipse.sirius.editor.properties.ext.widgets.reference/plugin.properties
+++ b/plugins/org.eclipse.sirius.editor.properties.ext.widgets.reference/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2016, 2017 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.editor.properties/plugin.properties b/plugins/org.eclipse.sirius.editor.properties/plugin.properties
index b06c137bfc..89804771ec 100644
--- a/plugins/org.eclipse.sirius.editor.properties/plugin.properties
+++ b/plugins/org.eclipse.sirius.editor.properties/plugin.properties
@@ -2,9 +2,11 @@
 # ====================================================================
 # Copyright (c) 2015, 2017 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.editor.sequence/plugin.properties b/plugins/org.eclipse.sirius.editor.sequence/plugin.properties
index 49be3fe442..88237f62a2 100644
--- a/plugins/org.eclipse.sirius.editor.sequence/plugin.properties
+++ b/plugins/org.eclipse.sirius.editor.sequence/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2007, 2013 THALES GLOBAL SERVICES
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.editor.table/plugin.properties b/plugins/org.eclipse.sirius.editor.table/plugin.properties
index c5aab86c8d..93ea028f0e 100644
--- a/plugins/org.eclipse.sirius.editor.table/plugin.properties
+++ b/plugins/org.eclipse.sirius.editor.table/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2007, 2013 THALES GLOBAL SERVICES
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.editor.tree/plugin.properties b/plugins/org.eclipse.sirius.editor.tree/plugin.properties
index 68c99934b4..b4eabe10d3 100644
--- a/plugins/org.eclipse.sirius.editor.tree/plugin.properties
+++ b/plugins/org.eclipse.sirius.editor.tree/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2013 THALES GLOBAL SERVICES
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.editor.workflow/plugin.properties b/plugins/org.eclipse.sirius.editor.workflow/plugin.properties
index 305aba61e4..d34ecc0746 100644
--- a/plugins/org.eclipse.sirius.editor.workflow/plugin.properties
+++ b/plugins/org.eclipse.sirius.editor.workflow/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2018 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.editor/plugin.properties b/plugins/org.eclipse.sirius.editor/plugin.properties
index 0e9cf76964..1e9a5a0453 100644
--- a/plugins/org.eclipse.sirius.editor/plugin.properties
+++ b/plugins/org.eclipse.sirius.editor/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 #   Copyright (c) 2007, 2018 THALES GLOBAL SERVICES.
 #   All rights reserved. This program and the accompanying materials
-#   are made available under the terms of the Eclipse Public License v1.0
+#   are made available under the terms of the Eclipse Public License 2.0
 #   which accompanies this distribution, and is available at
-#   http://www.eclipse.org/legal/epl-v10.html
+#   https://www.eclipse.org/legal/epl-2.0/
+#
+#   SPDX-License-Identifier: EPL-2.0
 #   
 #   Contributors:
 #      Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.eef.adapters/plugin.properties b/plugins/org.eclipse.sirius.eef.adapters/plugin.properties
index f102c3fee2..6a0d058b4c 100644
--- a/plugins/org.eclipse.sirius.eef.adapters/plugin.properties
+++ b/plugins/org.eclipse.sirius.eef.adapters/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2013 THALES GLOBAL SERVICES
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.ext.base/plugin.properties b/plugins/org.eclipse.sirius.ext.base/plugin.properties
index 638f851c4f..3d3c3ddbd2 100644
--- a/plugins/org.eclipse.sirius.ext.base/plugin.properties
+++ b/plugins/org.eclipse.sirius.ext.base/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2014 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.ext.draw2d/plugin.properties b/plugins/org.eclipse.sirius.ext.draw2d/plugin.properties
index ee8f8f7cbc..ba323512df 100644
--- a/plugins/org.eclipse.sirius.ext.draw2d/plugin.properties
+++ b/plugins/org.eclipse.sirius.ext.draw2d/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2014 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.ext.e3.ui/plugin.properties b/plugins/org.eclipse.sirius.ext.e3.ui/plugin.properties
index aec6796ffe..27f05f890a 100644
--- a/plugins/org.eclipse.sirius.ext.e3.ui/plugin.properties
+++ b/plugins/org.eclipse.sirius.ext.e3.ui/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2014 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.ext.e3/plugin.properties b/plugins/org.eclipse.sirius.ext.e3/plugin.properties
index 0419ff5b76..ce5cb72272 100644
--- a/plugins/org.eclipse.sirius.ext.e3/plugin.properties
+++ b/plugins/org.eclipse.sirius.ext.e3/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2014 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.ext.emf.edit/plugin.properties b/plugins/org.eclipse.sirius.ext.emf.edit/plugin.properties
index 86f35e3528..57f01bc949 100644
--- a/plugins/org.eclipse.sirius.ext.emf.edit/plugin.properties
+++ b/plugins/org.eclipse.sirius.ext.emf.edit/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2014 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.ext.emf.tx/plugin.properties b/plugins/org.eclipse.sirius.ext.emf.tx/plugin.properties
index e7370d3642..b0545c4bae 100644
--- a/plugins/org.eclipse.sirius.ext.emf.tx/plugin.properties
+++ b/plugins/org.eclipse.sirius.ext.emf.tx/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2014 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.ext.emf.ui/plugin.properties b/plugins/org.eclipse.sirius.ext.emf.ui/plugin.properties
index 6efac707bf..7df8373b87 100644
--- a/plugins/org.eclipse.sirius.ext.emf.ui/plugin.properties
+++ b/plugins/org.eclipse.sirius.ext.emf.ui/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2014 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.ext.emf/plugin.properties b/plugins/org.eclipse.sirius.ext.emf/plugin.properties
index c3249462f6..bfbb534bbe 100644
--- a/plugins/org.eclipse.sirius.ext.emf/plugin.properties
+++ b/plugins/org.eclipse.sirius.ext.emf/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2014 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.ext.gef/plugin.properties b/plugins/org.eclipse.sirius.ext.gef/plugin.properties
index aca9075a17..0b2799f497 100644
--- a/plugins/org.eclipse.sirius.ext.gef/plugin.properties
+++ b/plugins/org.eclipse.sirius.ext.gef/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2014 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.ext.gmf.notation/plugin.properties b/plugins/org.eclipse.sirius.ext.gmf.notation/plugin.properties
index d285f7e244..4a87b0d6d0 100644
--- a/plugins/org.eclipse.sirius.ext.gmf.notation/plugin.properties
+++ b/plugins/org.eclipse.sirius.ext.gmf.notation/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2014 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.ext.gmf.runtime/plugin.properties b/plugins/org.eclipse.sirius.ext.gmf.runtime/plugin.properties
index b09adc761c..362c7ecf47 100644
--- a/plugins/org.eclipse.sirius.ext.gmf.runtime/plugin.properties
+++ b/plugins/org.eclipse.sirius.ext.gmf.runtime/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2014 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.ext.ide/plugin.properties b/plugins/org.eclipse.sirius.ext.ide/plugin.properties
index 3660dca9f3..3273f59a9c 100644
--- a/plugins/org.eclipse.sirius.ext.ide/plugin.properties
+++ b/plugins/org.eclipse.sirius.ext.ide/plugin.properties
@@ -1,10 +1,12 @@
 # Copyright (c) 2015, 2018 Obeo.
 # All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.htm
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
 # Contributors: Obeo - initial API and implementation
-
 pluginName=Sirius Ext IDE
 providerName=Eclipse Modeling Project
 
diff --git a/plugins/org.eclipse.sirius.ext.jface/plugin.properties b/plugins/org.eclipse.sirius.ext.jface/plugin.properties
index e056a0e05e..262302d4ca 100644
--- a/plugins/org.eclipse.sirius.ext.jface/plugin.properties
+++ b/plugins/org.eclipse.sirius.ext.jface/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2014 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.ext.swt/plugin.properties b/plugins/org.eclipse.sirius.ext.swt/plugin.properties
index efc80d9931..961660dcaf 100644
--- a/plugins/org.eclipse.sirius.ext.swt/plugin.properties
+++ b/plugins/org.eclipse.sirius.ext.swt/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2014 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.interpreter/plugin.properties b/plugins/org.eclipse.sirius.interpreter/plugin.properties
index a114b83fa1..a7d99555e5 100644
--- a/plugins/org.eclipse.sirius.interpreter/plugin.properties
+++ b/plugins/org.eclipse.sirius.interpreter/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2013 THALES GLOBAL SERVICES
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.properties.core/plugin.properties b/plugins/org.eclipse.sirius.properties.core/plugin.properties
index adf544f62b..314cb565ec 100644
--- a/plugins/org.eclipse.sirius.properties.core/plugin.properties
+++ b/plugins/org.eclipse.sirius.properties.core/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2017 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.properties.defaultrules/plugin.properties b/plugins/org.eclipse.sirius.properties.defaultrules/plugin.properties
index c4d1728564..d7a11a4140 100644
--- a/plugins/org.eclipse.sirius.properties.defaultrules/plugin.properties
+++ b/plugins/org.eclipse.sirius.properties.defaultrules/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2017 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.properties.edit/plugin.properties b/plugins/org.eclipse.sirius.properties.edit/plugin.properties
index 9606d624a6..929cfe6ddf 100644
--- a/plugins/org.eclipse.sirius.properties.edit/plugin.properties
+++ b/plugins/org.eclipse.sirius.properties.edit/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2015, 2016 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.properties.ext.widgets.reference.edit/plugin.properties b/plugins/org.eclipse.sirius.properties.ext.widgets.reference.edit/plugin.properties
index 224cd42a1b..7df00644fd 100644
--- a/plugins/org.eclipse.sirius.properties.ext.widgets.reference.edit/plugin.properties
+++ b/plugins/org.eclipse.sirius.properties.ext.widgets.reference.edit/plugin.properties
@@ -1,8 +1,10 @@
 # Copyright (c) 2016, 2017 Obeo.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.properties.ext.widgets.reference/plugin.properties b/plugins/org.eclipse.sirius.properties.ext.widgets.reference/plugin.properties
index 11742f82dd..f624215c58 100644
--- a/plugins/org.eclipse.sirius.properties.ext.widgets.reference/plugin.properties
+++ b/plugins/org.eclipse.sirius.properties.ext.widgets.reference/plugin.properties
@@ -1,8 +1,10 @@
 # Copyright (c) 2016 Obeo.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.properties/plugin.properties b/plugins/org.eclipse.sirius.properties/plugin.properties
index f17722d7e6..f2e25a5d2d 100644
--- a/plugins/org.eclipse.sirius.properties/plugin.properties
+++ b/plugins/org.eclipse.sirius.properties/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2015, 2016 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.sample.ecore.design/plugin.properties b/plugins/org.eclipse.sirius.sample.ecore.design/plugin.properties
index 5544f49278..1561216099 100644
--- a/plugins/org.eclipse.sirius.sample.ecore.design/plugin.properties
+++ b/plugins/org.eclipse.sirius.sample.ecore.design/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2007, 2013 THALES GLOBAL SERVICES
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.sample.interactions.design/plugin.properties b/plugins/org.eclipse.sirius.sample.interactions.design/plugin.properties
index 35bbf1643e..ae4198dbd1 100644
--- a/plugins/org.eclipse.sirius.sample.interactions.design/plugin.properties
+++ b/plugins/org.eclipse.sirius.sample.interactions.design/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2010, 2014 THALES GLOBAL SERVICES
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.sample.interactions.edit/plugin.properties b/plugins/org.eclipse.sirius.sample.interactions.edit/plugin.properties
index 370db96c1f..ba583968e9 100644
--- a/plugins/org.eclipse.sirius.sample.interactions.edit/plugin.properties
+++ b/plugins/org.eclipse.sirius.sample.interactions.edit/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2010, 2014 THALES GLOBAL SERVICES
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.sample.interactions.editor/plugin.properties b/plugins/org.eclipse.sirius.sample.interactions.editor/plugin.properties
index 5b4c3e94d5..930526a67b 100644
--- a/plugins/org.eclipse.sirius.sample.interactions.editor/plugin.properties
+++ b/plugins/org.eclipse.sirius.sample.interactions.editor/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2010, 2014 THALES GLOBAL SERVICES
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.sample.interactions/plugin.properties b/plugins/org.eclipse.sirius.sample.interactions/plugin.properties
index dbd5907413..75da6a8c4d 100644
--- a/plugins/org.eclipse.sirius.sample.interactions/plugin.properties
+++ b/plugins/org.eclipse.sirius.sample.interactions/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2010, 2014 THALES GLOBAL SERVICES
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.sample.properties.checkbox/plugin.properties b/plugins/org.eclipse.sirius.sample.properties.checkbox/plugin.properties
index 373bd97818..630626ee6c 100644
--- a/plugins/org.eclipse.sirius.sample.properties.checkbox/plugin.properties
+++ b/plugins/org.eclipse.sirius.sample.properties.checkbox/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2015, 2016 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.sample.properties.radio/plugin.properties b/plugins/org.eclipse.sirius.sample.properties.radio/plugin.properties
index 25f56b18b7..c60a4c2213 100644
--- a/plugins/org.eclipse.sirius.sample.properties.radio/plugin.properties
+++ b/plugins/org.eclipse.sirius.sample.properties.radio/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2015, 2016 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.sample.properties.textarea/plugin.properties b/plugins/org.eclipse.sirius.sample.properties.textarea/plugin.properties
index 99c7555638..24d88f1059 100644
--- a/plugins/org.eclipse.sirius.sample.properties.textarea/plugin.properties
+++ b/plugins/org.eclipse.sirius.sample.properties.textarea/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2015, 2016 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.sample.properties/plugin.properties b/plugins/org.eclipse.sirius.sample.properties/plugin.properties
index dc4eba72ac..013fdef8cc 100644
--- a/plugins/org.eclipse.sirius.sample.properties/plugin.properties
+++ b/plugins/org.eclipse.sirius.sample.properties/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2015, 2016 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.samples.family/plugin.properties b/plugins/org.eclipse.sirius.samples.family/plugin.properties
index 4fe8f8f204..a84a2ca61e 100644
--- a/plugins/org.eclipse.sirius.samples.family/plugin.properties
+++ b/plugins/org.eclipse.sirius.samples.family/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2014 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.samples.family/samples/org.eclipse.sirius.sample.basicfamily.design/plugin.properties b/plugins/org.eclipse.sirius.samples.family/samples/org.eclipse.sirius.sample.basicfamily.design/plugin.properties
index fb92c48721..1bd56fa8ab 100644
--- a/plugins/org.eclipse.sirius.samples.family/samples/org.eclipse.sirius.sample.basicfamily.design/plugin.properties
+++ b/plugins/org.eclipse.sirius.samples.family/samples/org.eclipse.sirius.sample.basicfamily.design/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2014 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.samples.family/samples/org.eclipse.sirius.sample.basicfamily.edit/plugin.properties b/plugins/org.eclipse.sirius.samples.family/samples/org.eclipse.sirius.sample.basicfamily.edit/plugin.properties
index 3935929310..5716bc37b0 100644
--- a/plugins/org.eclipse.sirius.samples.family/samples/org.eclipse.sirius.sample.basicfamily.edit/plugin.properties
+++ b/plugins/org.eclipse.sirius.samples.family/samples/org.eclipse.sirius.sample.basicfamily.edit/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2014 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.samples.family/samples/org.eclipse.sirius.sample.basicfamily.editor/plugin.properties b/plugins/org.eclipse.sirius.samples.family/samples/org.eclipse.sirius.sample.basicfamily.editor/plugin.properties
index 3e803f14bb..d8de056ca3 100644
--- a/plugins/org.eclipse.sirius.samples.family/samples/org.eclipse.sirius.sample.basicfamily.editor/plugin.properties
+++ b/plugins/org.eclipse.sirius.samples.family/samples/org.eclipse.sirius.sample.basicfamily.editor/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2014 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.samples.family/samples/org.eclipse.sirius.sample.basicfamily/plugin.properties b/plugins/org.eclipse.sirius.samples.family/samples/org.eclipse.sirius.sample.basicfamily/plugin.properties
index e173bfebf0..e70d3560c2 100644
--- a/plugins/org.eclipse.sirius.samples.family/samples/org.eclipse.sirius.sample.basicfamily/plugin.properties
+++ b/plugins/org.eclipse.sirius.samples.family/samples/org.eclipse.sirius.sample.basicfamily/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2014 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.samples.family/solutions/org.eclipse.sirius.sample.basicfamily.starter.design/plugin.properties b/plugins/org.eclipse.sirius.samples.family/solutions/org.eclipse.sirius.sample.basicfamily.starter.design/plugin.properties
index d70e1fa67d..27a876f14b 100644
--- a/plugins/org.eclipse.sirius.samples.family/solutions/org.eclipse.sirius.sample.basicfamily.starter.design/plugin.properties
+++ b/plugins/org.eclipse.sirius.samples.family/solutions/org.eclipse.sirius.sample.basicfamily.starter.design/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2017 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.server.application/plugin.properties b/plugins/org.eclipse.sirius.server.application/plugin.properties
index de1a0705ed..54e7d92136 100644
--- a/plugins/org.eclipse.sirius.server.application/plugin.properties
+++ b/plugins/org.eclipse.sirius.server.application/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2018 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.server.backend/plugin.properties b/plugins/org.eclipse.sirius.server.backend/plugin.properties
index dfe0712191..ebfe1c8eed 100644
--- a/plugins/org.eclipse.sirius.server.backend/plugin.properties
+++ b/plugins/org.eclipse.sirius.server.backend/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2018 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.server.diagram/plugin.properties b/plugins/org.eclipse.sirius.server.diagram/plugin.properties
index b265fae27e..8230ba0091 100644
--- a/plugins/org.eclipse.sirius.server.diagram/plugin.properties
+++ b/plugins/org.eclipse.sirius.server.diagram/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2018 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.server.frontend.workflow/plugin.properties b/plugins/org.eclipse.sirius.server.frontend.workflow/plugin.properties
index dd6633a2a1..4f2de312e2 100644
--- a/plugins/org.eclipse.sirius.server.frontend.workflow/plugin.properties
+++ b/plugins/org.eclipse.sirius.server.frontend.workflow/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2018 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.server.frontend/plugin.properties b/plugins/org.eclipse.sirius.server.frontend/plugin.properties
index 8f077e7d76..b17d010d6a 100644
--- a/plugins/org.eclipse.sirius.server.frontend/plugin.properties
+++ b/plugins/org.eclipse.sirius.server.frontend/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2018 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.server.graphql/plugin.properties b/plugins/org.eclipse.sirius.server.graphql/plugin.properties
index d19b8eae9d..b0a8e7f3e1 100644
--- a/plugins/org.eclipse.sirius.server.graphql/plugin.properties
+++ b/plugins/org.eclipse.sirius.server.graphql/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2018 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.server.images/plugin.properties b/plugins/org.eclipse.sirius.server.images/plugin.properties
index 9e5eb7eb8c..2fd6944485 100644
--- a/plugins/org.eclipse.sirius.server.images/plugin.properties
+++ b/plugins/org.eclipse.sirius.server.images/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2018 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.server.ui.autostart/plugin.properties b/plugins/org.eclipse.sirius.server.ui.autostart/plugin.properties
index 77b436a9d6..05c250a19b 100644
--- a/plugins/org.eclipse.sirius.server.ui.autostart/plugin.properties
+++ b/plugins/org.eclipse.sirius.server.ui.autostart/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2018 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.server/plugin.properties b/plugins/org.eclipse.sirius.server/plugin.properties
index 1a4cfbed7c..5680a23fd2 100644
--- a/plugins/org.eclipse.sirius.server/plugin.properties
+++ b/plugins/org.eclipse.sirius.server/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2018 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.services.common/plugin.properties b/plugins/org.eclipse.sirius.services.common/plugin.properties
index 5bcafb2388..b0c6153b05 100644
--- a/plugins/org.eclipse.sirius.services.common/plugin.properties
+++ b/plugins/org.eclipse.sirius.services.common/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2018 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.services.diagram/plugin.properties b/plugins/org.eclipse.sirius.services.diagram/plugin.properties
index b884a49673..33d3ece860 100644
--- a/plugins/org.eclipse.sirius.services.diagram/plugin.properties
+++ b/plugins/org.eclipse.sirius.services.diagram/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2018 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.services.graphql/plugin.properties b/plugins/org.eclipse.sirius.services.graphql/plugin.properties
index ed38c41c04..a70d991fb5 100644
--- a/plugins/org.eclipse.sirius.services.graphql/plugin.properties
+++ b/plugins/org.eclipse.sirius.services.graphql/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2018 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.synchronizer/plugin.properties b/plugins/org.eclipse.sirius.synchronizer/plugin.properties
index 08e15785e5..40b37c7720 100644
--- a/plugins/org.eclipse.sirius.synchronizer/plugin.properties
+++ b/plugins/org.eclipse.sirius.synchronizer/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2013 THALES GLOBAL SERVICES
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.table.ui.ext/plugin.properties b/plugins/org.eclipse.sirius.table.ui.ext/plugin.properties
index 0442f79226..ff40b6c02c 100644
--- a/plugins/org.eclipse.sirius.table.ui.ext/plugin.properties
+++ b/plugins/org.eclipse.sirius.table.ui.ext/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2015 OBEO
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.table.ui/plugin.properties b/plugins/org.eclipse.sirius.table.ui/plugin.properties
index 6c65873785..ff921696b3 100644
--- a/plugins/org.eclipse.sirius.table.ui/plugin.properties
+++ b/plugins/org.eclipse.sirius.table.ui/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2007, 2017 THALES GLOBAL SERVICES
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.table/plugin.properties b/plugins/org.eclipse.sirius.table/plugin.properties
index 983c8e9eff..30aa9e8b76 100644
--- a/plugins/org.eclipse.sirius.table/plugin.properties
+++ b/plugins/org.eclipse.sirius.table/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2007, 2015 THALES GLOBAL SERVICES
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.tests.junit.support/plugin.properties b/plugins/org.eclipse.sirius.tests.junit.support/plugin.properties
index f178408e84..11d6de02c8 100644
--- a/plugins/org.eclipse.sirius.tests.junit.support/plugin.properties
+++ b/plugins/org.eclipse.sirius.tests.junit.support/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2007, 2014 THALES GLOBAL SERVICES
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.tests.junit.xtext/plugin.properties b/plugins/org.eclipse.sirius.tests.junit.xtext/plugin.properties
index 659767a4e9..8696a8a85a 100644
--- a/plugins/org.eclipse.sirius.tests.junit.xtext/plugin.properties
+++ b/plugins/org.eclipse.sirius.tests.junit.xtext/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2018 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.tests.junit/plugin.properties b/plugins/org.eclipse.sirius.tests.junit/plugin.properties
index 432c0e8731..2d1b25b618 100644
--- a/plugins/org.eclipse.sirius.tests.junit/plugin.properties
+++ b/plugins/org.eclipse.sirius.tests.junit/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2010, 2014 THALES GLOBAL SERVICES
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.tests.rcptt.properties.edit/plugin.properties b/plugins/org.eclipse.sirius.tests.rcptt.properties.edit/plugin.properties
index 60706c3949..50a6a92692 100644
--- a/plugins/org.eclipse.sirius.tests.rcptt.properties.edit/plugin.properties
+++ b/plugins/org.eclipse.sirius.tests.rcptt.properties.edit/plugin.properties
@@ -1,9 +1,12 @@
-# Copyright (c) 2016 Obeo.
+# Copyright (c) 2016, 2018 Obeo.
 # All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.htm
-
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors: Obeo - initial API and implementation
 pluginName = Sirius Properties Tests Edit Support
 providerName = Eclipse Modeling Project
 
diff --git a/plugins/org.eclipse.sirius.tests.rcptt.properties.editor/plugin.properties b/plugins/org.eclipse.sirius.tests.rcptt.properties.editor/plugin.properties
index d50b0a7f34..090b3ff310 100644
--- a/plugins/org.eclipse.sirius.tests.rcptt.properties.editor/plugin.properties
+++ b/plugins/org.eclipse.sirius.tests.rcptt.properties.editor/plugin.properties
@@ -1,8 +1,12 @@
-# Copyright (c) 2016 Obeo.
+# Copyright (c) 2016, 2018 Obeo.
 # All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.htm
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors: Obeo - initial API and implementation
 
 pluginName = Sirius Properties Tests Editor
 providerName = Eclipse Modeling Project
diff --git a/plugins/org.eclipse.sirius.tests.rcptt.properties.samples/plugin.properties b/plugins/org.eclipse.sirius.tests.rcptt.properties.samples/plugin.properties
index 95da2aae5d..3b552313dd 100644
--- a/plugins/org.eclipse.sirius.tests.rcptt.properties.samples/plugin.properties
+++ b/plugins/org.eclipse.sirius.tests.rcptt.properties.samples/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2016 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.tests.rcptt.properties/plugin.properties b/plugins/org.eclipse.sirius.tests.rcptt.properties/plugin.properties
index 5caaaeb223..e782b72aca 100644
--- a/plugins/org.eclipse.sirius.tests.rcptt.properties/plugin.properties
+++ b/plugins/org.eclipse.sirius.tests.rcptt.properties/plugin.properties
@@ -1,8 +1,12 @@
-# Copyright (c) 2016 Obeo.
+# Copyright (c) 2016, 2018 Obeo.
 # All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.htm
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors: Obeo - initial API and implementation
 
 pluginName = Sirius Properties Tests Model
 providerName = Eclipse Modeling Project
diff --git a/plugins/org.eclipse.sirius.tests.sample.benchmark/plugin.properties b/plugins/org.eclipse.sirius.tests.sample.benchmark/plugin.properties
index 46fc0becf9..8300eb6316 100644
--- a/plugins/org.eclipse.sirius.tests.sample.benchmark/plugin.properties
+++ b/plugins/org.eclipse.sirius.tests.sample.benchmark/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2010, 2014 THALES GLOBAL SERVICES
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.tests.sample.component.design/plugin.properties b/plugins/org.eclipse.sirius.tests.sample.component.design/plugin.properties
index 3d772d8794..9fcfdde6be 100644
--- a/plugins/org.eclipse.sirius.tests.sample.component.design/plugin.properties
+++ b/plugins/org.eclipse.sirius.tests.sample.component.design/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2015 Obeo.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.tests.sample.component/plugin.properties b/plugins/org.eclipse.sirius.tests.sample.component/plugin.properties
index 6030e2460f..9d9a075496 100644
--- a/plugins/org.eclipse.sirius.tests.sample.component/plugin.properties
+++ b/plugins/org.eclipse.sirius.tests.sample.component/plugin.properties
@@ -1,8 +1,10 @@
 # Copyright (c) 2015 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.tests.sample.docbook.design/plugin.properties b/plugins/org.eclipse.sirius.tests.sample.docbook.design/plugin.properties
index 4b388f8e26..899e181592 100644
--- a/plugins/org.eclipse.sirius.tests.sample.docbook.design/plugin.properties
+++ b/plugins/org.eclipse.sirius.tests.sample.docbook.design/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2010, 2014 THALES GLOBAL SERVICES
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.tests.sample.docbook.edit/plugin.properties b/plugins/org.eclipse.sirius.tests.sample.docbook.edit/plugin.properties
index 9d1bf7eab9..2375383ab2 100644
--- a/plugins/org.eclipse.sirius.tests.sample.docbook.edit/plugin.properties
+++ b/plugins/org.eclipse.sirius.tests.sample.docbook.edit/plugin.properties
@@ -1,8 +1,10 @@
 # Copyright (c) 2015 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.tests.sample.docbook.editor/plugin.properties b/plugins/org.eclipse.sirius.tests.sample.docbook.editor/plugin.properties
index 8a2515ca2b..06dc364160 100644
--- a/plugins/org.eclipse.sirius.tests.sample.docbook.editor/plugin.properties
+++ b/plugins/org.eclipse.sirius.tests.sample.docbook.editor/plugin.properties
@@ -1,8 +1,10 @@
 # Copyright (c) 2015 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.tests.sample.docbook/plugin.properties b/plugins/org.eclipse.sirius.tests.sample.docbook/plugin.properties
index 3a7eb26113..1c447039d8 100644
--- a/plugins/org.eclipse.sirius.tests.sample.docbook/plugin.properties
+++ b/plugins/org.eclipse.sirius.tests.sample.docbook/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2010, 2014 THALES GLOBAL SERVICES
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.tests.sample.migration.design/plugin.properties b/plugins/org.eclipse.sirius.tests.sample.migration.design/plugin.properties
index 9f54904e74..ae9eb172fb 100644
--- a/plugins/org.eclipse.sirius.tests.sample.migration.design/plugin.properties
+++ b/plugins/org.eclipse.sirius.tests.sample.migration.design/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2010, 2014 THALES GLOBAL SERVICES
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.tests.sample.migration/plugin.properties b/plugins/org.eclipse.sirius.tests.sample.migration/plugin.properties
index f0a67f804f..feeeef794f 100644
--- a/plugins/org.eclipse.sirius.tests.sample.migration/plugin.properties
+++ b/plugins/org.eclipse.sirius.tests.sample.migration/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2010, 2014 THALES GLOBAL SERVICES
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.tests.sample.scxml.design/plugin.properties b/plugins/org.eclipse.sirius.tests.sample.scxml.design/plugin.properties
index 1d649c6afb..cc8d90ef53 100644
--- a/plugins/org.eclipse.sirius.tests.sample.scxml.design/plugin.properties
+++ b/plugins/org.eclipse.sirius.tests.sample.scxml.design/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2015 Obeo.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.tests.sample.scxml/plugin.properties b/plugins/org.eclipse.sirius.tests.sample.scxml/plugin.properties
index fd45feffff..8337b90286 100644
--- a/plugins/org.eclipse.sirius.tests.sample.scxml/plugin.properties
+++ b/plugins/org.eclipse.sirius.tests.sample.scxml/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2015 Obeo.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.tests.server/plugin.properties b/plugins/org.eclipse.sirius.tests.server/plugin.properties
index 18783aae47..3f4ebfbf79 100644
--- a/plugins/org.eclipse.sirius.tests.server/plugin.properties
+++ b/plugins/org.eclipse.sirius.tests.server/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2018 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.tests.services.graphql/plugin.properties b/plugins/org.eclipse.sirius.tests.services.graphql/plugin.properties
index cac8ccf500..2571ceeb72 100644
--- a/plugins/org.eclipse.sirius.tests.services.graphql/plugin.properties
+++ b/plugins/org.eclipse.sirius.tests.services.graphql/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2018 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.tests.swtbot.support/plugin.properties b/plugins/org.eclipse.sirius.tests.swtbot.support/plugin.properties
index 6fc381e75b..d0e2cc5014 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot.support/plugin.properties
+++ b/plugins/org.eclipse.sirius.tests.swtbot.support/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2007, 2014 THALES GLOBAL SERVICES
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/plugin.properties b/plugins/org.eclipse.sirius.tests.swtbot/plugin.properties
index e6dcae8e92..1f38178a4c 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/plugin.properties
+++ b/plugins/org.eclipse.sirius.tests.swtbot/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2010, 2017 THALES GLOBAL SERVICES
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/plugin_fr.properties b/plugins/org.eclipse.sirius.tests.swtbot/plugin_fr.properties
index 2a5158620b..7a32a665b2 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/plugin_fr.properties
+++ b/plugins/org.eclipse.sirius.tests.swtbot/plugin_fr.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2016, 2017 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.tests.tree/plugin.properties b/plugins/org.eclipse.sirius.tests.tree/plugin.properties
index c546c489ef..8fa37640c2 100644
--- a/plugins/org.eclipse.sirius.tests.tree/plugin.properties
+++ b/plugins/org.eclipse.sirius.tests.tree/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2010, 2014 THALES GLOBAL SERVICES
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.tests.ui.properties/plugin.properties b/plugins/org.eclipse.sirius.tests.ui.properties/plugin.properties
index cd3af79cf9..67392f8f70 100644
--- a/plugins/org.eclipse.sirius.tests.ui.properties/plugin.properties
+++ b/plugins/org.eclipse.sirius.tests.ui.properties/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2016 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.tree.ui.ext/plugin.properties b/plugins/org.eclipse.sirius.tree.ui.ext/plugin.properties
index 18933e74e5..a3c5b21136 100644
--- a/plugins/org.eclipse.sirius.tree.ui.ext/plugin.properties
+++ b/plugins/org.eclipse.sirius.tree.ui.ext/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2015 OBEO
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.tree.ui/plugin.properties b/plugins/org.eclipse.sirius.tree.ui/plugin.properties
index 87828d3b41..d3350cbdfe 100644
--- a/plugins/org.eclipse.sirius.tree.ui/plugin.properties
+++ b/plugins/org.eclipse.sirius.tree.ui/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2013, 2017 THALES GLOBAL SERVICES
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.tree/plugin.properties b/plugins/org.eclipse.sirius.tree/plugin.properties
index a52a0913cb..60580a31ac 100644
--- a/plugins/org.eclipse.sirius.tree/plugin.properties
+++ b/plugins/org.eclipse.sirius.tree/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2013, 2015 THALES GLOBAL SERVICES and others
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.ui.debug/plugin.properties b/plugins/org.eclipse.sirius.ui.debug/plugin.properties
index a9c51853f7..c28a2c27ec 100644
--- a/plugins/org.eclipse.sirius.ui.debug/plugin.properties
+++ b/plugins/org.eclipse.sirius.ui.debug/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2007, 1025 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.ui.editor/plugin.properties b/plugins/org.eclipse.sirius.ui.editor/plugin.properties
index 5f4717df6c..8c2e8d7a35 100644
--- a/plugins/org.eclipse.sirius.ui.editor/plugin.properties
+++ b/plugins/org.eclipse.sirius.ui.editor/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2017 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.ui.ext/plugin.properties b/plugins/org.eclipse.sirius.ui.ext/plugin.properties
index 6cd715540c..8ac1aacdda 100644
--- a/plugins/org.eclipse.sirius.ui.ext/plugin.properties
+++ b/plugins/org.eclipse.sirius.ui.ext/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2015 OBEO
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.ui.properties.ext.widgets.reference/plugin.properties b/plugins/org.eclipse.sirius.ui.properties.ext.widgets.reference/plugin.properties
index d9a6557ff1..65fa301ebe 100644
--- a/plugins/org.eclipse.sirius.ui.properties.ext.widgets.reference/plugin.properties
+++ b/plugins/org.eclipse.sirius.ui.properties.ext.widgets.reference/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2016 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.ui.properties/plugin.properties b/plugins/org.eclipse.sirius.ui.properties/plugin.properties
index 95678a6ed1..c0540d9eac 100644
--- a/plugins/org.eclipse.sirius.ui.properties/plugin.properties
+++ b/plugins/org.eclipse.sirius.ui.properties/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2015, 2017 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.ui/plugin.properties b/plugins/org.eclipse.sirius.ui/plugin.properties
index 36317f9ad9..f2081c418c 100644
--- a/plugins/org.eclipse.sirius.ui/plugin.properties
+++ b/plugins/org.eclipse.sirius.ui/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2007, 2018 THALES GLOBAL SERVICES and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.workflow.model/plugin.properties b/plugins/org.eclipse.sirius.workflow.model/plugin.properties
index 33f6743278..5c4135396b 100644
--- a/plugins/org.eclipse.sirius.workflow.model/plugin.properties
+++ b/plugins/org.eclipse.sirius.workflow.model/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2018 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius.workflow.ui.page/plugin.properties b/plugins/org.eclipse.sirius.workflow.ui.page/plugin.properties
index 294ec2ec49..75853c221d 100644
--- a/plugins/org.eclipse.sirius.workflow.ui.page/plugin.properties
+++ b/plugins/org.eclipse.sirius.workflow.ui.page/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2018 Obeo
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.sirius/plugin.properties b/plugins/org.eclipse.sirius/plugin.properties
index ae704d7738..2c7c3b0822 100644
--- a/plugins/org.eclipse.sirius/plugin.properties
+++ b/plugins/org.eclipse.sirius/plugin.properties
@@ -1,9 +1,11 @@
 # ====================================================================
 # Copyright (c) 2007, 2018 THALES GLOBAL SERVICES and others
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #    Obeo - initial API and implementation