Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuentin Le Menez2018-07-31 05:30:04 -0400
committerptessier2018-08-22 08:52:35 -0400
commit6f6dae5425ecbdf133f65979645b2ec69237f121 (patch)
tree6116d4131ce2d24e91e8fe18e207e6f9c948c8fb
parentc62deb99053e5af1760e3d3cbf8cd18e8077fa8d (diff)
downloadorg.eclipse.papyrus-6f6dae5425ecbdf133f65979645b2ec69237f121.tar.gz
org.eclipse.papyrus-6f6dae5425ecbdf133f65979645b2ec69237f121.tar.xz
org.eclipse.papyrus-6f6dae5425ecbdf133f65979645b2ec69237f121.zip
Bug 537653 - [EPL] Edti properties files
- move the plugin.properties files to the new EPL2.0 license - move the build.properties files to the new EPL2.0 license when available Change-Id: Ie860b3d74eb82ce5542b6fbe1f2bfcc67cea02f4 Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>
-rw-r--r--examples/core/org.eclipse.papyrus.example.core.lifecycleevents/plugin.properties6
-rw-r--r--examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/plugin.properties6
-rw-r--r--examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/plugin.properties6
-rw-r--r--examples/emf/org.eclipse.papyrus.outline.emftree/plugin.properties6
-rw-r--r--examples/infra/org.eclipse.papyrus.example.infra.servicesregistry.retrieval/plugin.properties6
-rw-r--r--examples/others/org.eclipse.papyrus.example.text.instance/build.properties6
-rw-r--r--examples/others/org.eclipse.papyrus.example.text.instance/plugin.properties6
-rw-r--r--examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/plugin.properties6
-rw-r--r--examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/plugin.properties6
-rw-r--r--examples/uml/org.eclipse.papyrus.uml.diagram.emftree/plugin.properties6
-rw-r--r--examples/user/org.eclipse.papyrus.examples.user.qvto/plugin.properties6
-rw-r--r--plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/plugin.properties6
-rw-r--r--plugins/doc/org.eclipse.papyrus.customization.paletteconfiguration.doc/plugin.properties6
-rwxr-xr-xplugins/doc/org.eclipse.papyrus.doctemplate.doc/plugin.properties6
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.architecture.doc/plugin.properties6
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/plugin.properties6
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.internationalization.doc/plugin.properties6
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.nattable.doc/plugin.properties6
-rw-r--r--plugins/doc/org.eclipse.papyrus.req.reqif.doc/plugin.properties6
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/build.properties6
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/plugin.properties6
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/build.properties6
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/plugin.properties6
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/build.properties6
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/plugin.properties6
-rw-r--r--plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/plugin.properties6
-rw-r--r--plugins/editor/org.eclipse.papyrus.editor/plugin.properties6
-rw-r--r--plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.doc/OSGI-INF/l10n/bundle.properties6
-rw-r--r--plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/messages.properties6
-rw-r--r--plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/plugin.properties6
-rw-r--r--plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/custom/presentation/messages.properties6
-rw-r--r--plugins/facet/editor/org.eclipse.papyrus.emf.facet.doc/OSGI-INF/l10n/bundle.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.aggregate.doc/OSGI-INF/l10n/bundle.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.aggregate.doc/build.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.common.core/OSGI-INF/l10n/bundle.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.common.core/build.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/OSGI-INF/l10n/bundle.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/build.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/src/org/eclipse/papyrus/emf/facet/common/sdk/core/internal/messages.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/OSGI-INF/l10n/bundle.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/build.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/messages.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/OSGI-INF/l10n/bundle.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/build.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/build.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/plugin.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/OSGI-INF/l10n/bundle.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/build.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/plugin.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/OSGI-INF/l10n/bundle.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/build.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/OSGI-INF/l10n/bundle.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/messages.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/OSGI-INF/l10n/bundle.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/build.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/messages.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/OSGI-INF/l10n/bundle.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/build.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/OSGI-INF/l10n/bundle.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/build.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/src/org/eclipse/papyrus/emf/facet/efacet/core/internal/messages.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.efacet.doc/OSGI-INF/l10n/bundle.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.efacet.doc/build.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.efacet.edit/build.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.efacet.edit/plugin.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.efacet.editor/build.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.efacet.editor/plugin.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/build.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/plugin.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/OSGI-INF/l10n/bundle.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/build.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/OSGI-INF/l10n/bundle.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/src/org/eclipse/papyrus/emf/facet/efacet/sdk/ui/internal/messages.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/OSGI-INF/l10n/bundle.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/build.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/src/org/eclipse/papyrus/emf/facet/efacet/ui/internal/messages.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.efacet/OSGI-INF/l10n/bundle.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.efacet/build.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.query.java.core/OSGI-INF/l10n/bundle.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.query.java.core/build.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/plugin.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui/OSGI-INF/l10n/bundle.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui/build.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui/src/org/eclipse/papyrus/emf/facet/query/java/sdk/ui/internal/messages.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.query.java/OSGI-INF/l10n/bundle.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.query.java/build.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.core/OSGI-INF/l10n/bundle.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.core/build.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/build.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/plugin.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui/OSGI-INF/l10n/bundle.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui/build.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui/src/org/eclipse/papyrus/emf/facet/query/ocl/sdk/ui/internal/messages.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.util.core/OSGI-INF/l10n/bundle.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.util.core/build.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.util.core/src/org/eclipse/papyrus/emf/facet/util/core/internal/messages.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/OSGI-INF/l10n/bundle.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/build.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/OSGI-INF/l10n/bundle.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/build.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.doc/build.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.ui/build.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.ui/src/org/eclipse/papyrus/emf/facet/util/emf/ui/internal/messages.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/OSGI-INF/l10n/bundle.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/build.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.util.pde.core/build.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.util.swt/OSGI-INF/l10n/bundle.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.util.swt/build.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/OSGI-INF/l10n/bundle.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/build.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/src/org/eclipse/papyrus/emf/facet/util/ui/internal/messages.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/OSGI-INF/l10n/bundle.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/build.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/src/org/eclipse/papyrus/emf/facet/widgets/celleditors/ecore/messages.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/build.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/plugin.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/src/org/eclipse/papyrus/emf/facet/widgets/celleditors/internal/messages.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.widgets/OSGI-INF/l10n/bundle.properties6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.widgets/build.properties6
-rw-r--r--plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/build.properties6
-rw-r--r--plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/plugin.properties6
-rw-r--r--plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/build.properties6
-rw-r--r--plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/plugin.properties6
-rw-r--r--plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/plugin.properties6
-rw-r--r--plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/build.properties6
-rw-r--r--plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/plugin.properties6
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/build.properties6
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/plugin.properties6
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/build.properties6
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/plugin.properties6
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.log/plugin.properties6
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/plugin.properties6
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core/build.properties6
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core/plugin.properties6
-rw-r--r--plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/build.properties6
-rw-r--r--plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/plugin.properties6
-rw-r--r--plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/build.properties6
-rw-r--r--plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/plugin.properties6
-rwxr-xr-xplugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/build.properties6
-rwxr-xr-xplugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/plugin.properties6
-rwxr-xr-xplugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/build.properties6
-rwxr-xr-xplugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/plugin.properties6
-rwxr-xr-xplugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/build.properties6
-rwxr-xr-xplugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/plugin.properties6
-rwxr-xr-xplugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/build.properties6
-rwxr-xr-xplugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/plugin.properties6
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/plugin.properties6
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/plugin.properties6
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/plugin.properties6
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/build.properties6
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/plugin.properties6
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/build.properties6
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.emf/plugin.properties6
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/messages/messages.properties6
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/plugin.properties6
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/internal/emf/messages/messages.properties6
-rw-r--r--plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/build.properties6
-rw-r--r--plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/plugin.properties6
-rw-r--r--plugins/infra/filters/org.eclipse.papyrus.infra.filters/build.properties6
-rw-r--r--plugins/infra/filters/org.eclipse.papyrus.infra.filters/plugin.properties6
-rw-r--r--plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/build.properties6
-rw-r--r--plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/plugin.properties6
-rw-r--r--plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/build.properties6
-rw-r--r--plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/plugin.properties6
-rw-r--r--plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/build.properties6
-rw-r--r--plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/plugin.properties6
-rw-r--r--plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/build.properties6
-rw-r--r--plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/plugin.properties6
-rw-r--r--plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/build.properties6
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/plugin.properties6
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/plugin.properties6
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/plugin.properties6
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.properties6
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/messages/messages.properties6
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/plugin.properties6
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/build.properties6
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/plugin.properties6
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/plugin.properties6
-rwxr-xr-xplugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/plugin.properties6
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/messages/messages.properties6
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/plugin.properties6
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/plugin.properties6
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/plugin.properties6
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/plugin.properties6
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/build.properties6
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/plugin.properties6
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/build.properties6
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/plugin.properties6
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/build.properties6
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/plugin.properties6
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/build.properties6
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/plugin.properties6
-rwxr-xr-xplugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/plugin.properties6
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/build.properties6
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/plugin.properties6
-rw-r--r--plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/plugin.properties6
-rw-r--r--plugins/infra/internationalization/org.eclipse.papyrus.infra.editor.welcome.internationalization/build.properties6
-rw-r--r--plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/messages/messages.properties6
-rw-r--r--plugins/infra/misc/org.eclipse.papyrus.infra.sync/build.properties6
-rw-r--r--plugins/infra/misc/org.eclipse.papyrus.infra.sync/plugin.properties6
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/plugin.properties6
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/plugin.properties6
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/build.properties6
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/plugin.properties6
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/build.properties6
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.properties6
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/build.properties6
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/plugin.properties6
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/plugin.properties6
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/plugin.properties6
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/build.properties6
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/plugin.properties6
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/build.properties6
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/plugin.properties6
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/messages/messages.properties6
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/plugin.properties6
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/build.properties6
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/plugin.properties6
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/build.properties6
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/plugin.properties6
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/plugin.properties6
-rw-r--r--plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/plugin.properties6
-rw-r--r--plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/plugin.properties6
-rw-r--r--plugins/infra/properties/org.eclipse.papyrus.infra.properties/plugin.properties6
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/plugin.properties6
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/plugin.properties6
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/build.properties6
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/plugin.properties6
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/messages/messages.properties6
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/plugin.properties6
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/plugin.properties6
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.edit/plugin.properties6
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/plugin.properties6
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/plugin.properties6
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/plugin.properties6
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/src/org/eclipse/papyrus/infra/services/markerlistener/internal/messages/messages.properties6
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/plugin.properties6
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/plugin.properties6
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/messages.properties6
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/plugin.properties6
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.validation/plugin.properties6
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types.core/plugin.properties6
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types.edit/build.properties6
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types.edit/plugin.properties6
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types.editor/build.properties6
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types.editor/plugin.properties6
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/build.properties6
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/plugin.properties6
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types.ui/plugin.properties6
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types/build.properties6
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types/plugin.properties6
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.newchild.ui/plugin.properties6
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/plugin.properties6
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/build.properties6
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/plugin.properties6
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/plugin.properties6
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/ui/messages.properties6
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/plugin.properties6
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/preferences/messages.properties6
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/messages.properties6
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/plugin.properties6
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.widgets/plugin.properties6
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/messages/messages.properties6
-rwxr-xr-xplugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/messages.properties6
-rwxr-xr-xplugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/plugin.properties6
-rw-r--r--plugins/sdk/org.eclipse.papyrus.sdk/about.properties9
-rw-r--r--plugins/sdk/org.eclipse.papyrus.sdk/build.properties6
-rw-r--r--plugins/sdk/org.eclipse.papyrus.sdk/plugin.properties6
-rw-r--r--plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/build.properties6
-rw-r--r--plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/plugin.properties6
-rw-r--r--plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/build.properties6
-rw-r--r--plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/plugin.properties6
-rw-r--r--plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/plugin.properties6
-rw-r--r--plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/plugin.properties6
-rw-r--r--plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/build.properties6
-rw-r--r--plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/plugin.properties6
-rw-r--r--plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/build.properties6
-rw-r--r--plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/plugin.properties6
-rw-r--r--plugins/toolsmiths/org.eclipse.papyrus.codegen/plugin.properties6
-rw-r--r--plugins/toolsmiths/org.eclipse.papyrus.def/plugin.properties6
-rw-r--r--plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/build.properties6
-rw-r--r--plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/plugin.properties6
-rwxr-xr-xplugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/plugin.properties6
-rw-r--r--plugins/toolsmiths/org.eclipse.papyrus.dev.types/build.properties6
-rw-r--r--plugins/toolsmiths/org.eclipse.papyrus.dev.types/plugin.properties6
-rw-r--r--plugins/toolsmiths/org.eclipse.papyrus.dev.ui/plugin.properties6
-rw-r--r--plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/plugin.properties6
-rw-r--r--plugins/toolsmiths/org.eclipse.papyrus.releng.dev.release/OSGI-INF/l10n/bundle.properties6
-rw-r--r--plugins/toolsmiths/org.eclipse.papyrus.releng.main.release/OSGI-INF/l10n/bundle.properties6
-rw-r--r--plugins/toolsmiths/org.eclipse.papyrus.releng.tools/OSGI-INF/l10n/bundle.properties6
-rw-r--r--plugins/toolsmiths/org.eclipse.papyrus.releng.tools/build.properties6
-rw-r--r--plugins/toolsmiths/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/messages.properties6
-rw-r--r--plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/plugin.properties6
-rw-r--r--plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/src/org/eclipse/papyrus/toolsmiths/palette/messages.properties6
-rw-r--r--plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/plugin.properties6
-rw-r--r--plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/plugin.properties6
-rw-r--r--plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/plugin.properties6
-rw-r--r--plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/src/org/eclipse/papyrus/uml/decoratormodel/internal/controlmode/messages/messages.properties6
-rw-r--r--plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/plugin.properties6
-rw-r--r--plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/plugin.properties6
-rw-r--r--plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/plugin.properties6
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-messages.properties6
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/messages.properties6
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.properties6
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.properties6
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/messages.properties6
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/plugin.properties6
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/messages.properties6
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/plugin.properties6
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/messages/messages.properties6
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/messages/messages.properties6
-rwxr-xr-xplugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.properties6
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/plugin.properties6
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/plugin.properties6
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.properties6
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.properties6
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/plugin.properties6
-rwxr-xr-xplugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/plugin.properties6
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/build.properties6
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/messages.properties6
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/plugin.properties6
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/plugin.properties6
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/build.properties6
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/plugin.properties6
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/messages/messages.properties6
-rwxr-xr-xplugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/build.properties6
-rwxr-xr-xplugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/plugin.properties6
-rwxr-xr-xplugins/uml/expressions/org.eclipse.papyrus.uml.expressions/build.properties6
-rwxr-xr-xplugins/uml/expressions/org.eclipse.papyrus.uml.expressions/plugin.properties6
-rw-r--r--plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common.blackboxes/build.properties6
-rw-r--r--plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common.blackboxes/plugin.properties6
-rw-r--r--plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common/build.properties6
-rw-r--r--plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common/plugin.properties6
-rw-r--r--plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/plugin.properties6
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/plugin.properties6
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/plugin.properties6
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/plugin.properties6
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.valuespecification/plugin.properties6
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.commands/plugin.properties6
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/plugin.properties6
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.documentation.profile/plugin.properties6
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.extensionpoints/plugin.properties6
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.filters.edit/build.properties6
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.filters.edit/plugin.properties6
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.filters/build.properties6
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.filters/plugin.properties6
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.modelrepair/OSGI-INF/l10n/bundle.properties6
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.modelrepair/plugin.properties6
-rwxr-xr-xplugins/uml/org.eclipse.papyrus.uml.navigation/plugin.properties6
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/plugin.properties6
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.perspective/plugin.properties6
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.resourceloading.profile/plugin.properties6
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.service.types.ui/plugin.properties6
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.service.types.ui/src/org/eclipse/papyrus/uml/service/types/internal/ui/messages/messages.properties6
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.service.types/plugin.properties6
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/messages/messages.properties6
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.service.validation/plugin.properties6
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.services.decoration/plugin.properties6
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.templaterepository/plugin.properties6
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.types.core/plugin.properties6
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.types.ui.properties/plugin.properties6
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.ui/build.properties6
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.ui/plugin.properties6
-rw-r--r--plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.documentation/build.properties6
-rw-r--r--plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.documentation/plugin.properties6
-rw-r--r--plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/plugin.properties6
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/plugin.properties6
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/plugin.properties6
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/plugin.properties6
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/plugin.properties6
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/plugin.properties6
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/plugin.properties6
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/plugin.properties6
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/plugin.properties6
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/plugin.properties6
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/plugin.properties6
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/plugin.properties6
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/plugin.properties6
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/plugin.properties6
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/plugin.properties6
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/plugin.properties6
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/plugin.properties6
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/plugin.properties6
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/plugin.properties6
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/plugin.properties6
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/plugin.properties6
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/plugin.properties6
-rw-r--r--plugins/uml/tools/org.eclipse.papyrus.uml.tools/plugin.properties6
-rw-r--r--plugins/views/documentation/org.eclipse.papyrus.views.documentation/plugin.properties6
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/plugin.properties6
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/plugin.properties6
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/src/org/eclipse/papyrus/views/modelexplorer/resourceloading/handler/messages.properties6
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/plugin.properties6
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/messages.properties6
-rw-r--r--plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/plugin.properties6
-rw-r--r--plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/plugin.properties6
-rw-r--r--plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/messages/messages.properties6
-rw-r--r--plugins/views/properties/org.eclipse.papyrus.views.properties/plugin.properties6
-rw-r--r--plugins/views/references/org.eclipse.papyrus.views.references/plugin.properties6
-rw-r--r--plugins/views/validation/org.eclipse.papyrus.views.validation/plugin.properties6
-rwxr-xr-xreleng/rcp/org.eclipse.papyrus.rcp.feature/feature.properties2
-rw-r--r--releng/rcp/org.eclipse.papyrus.rcp/plugin.properties6
-rw-r--r--tests/junit/framework/org.eclipse.papyrus.bundles.tests/plugin.properties6
-rw-r--r--tests/junit/framework/org.eclipse.papyrus.junit.utils/plugin.properties6
-rwxr-xr-xtests/junit/plugins/bundlestests/org.eclipse.papyrus.developer.suite.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/build.properties6
-rwxr-xr-xtests/junit/plugins/editor/org.eclipse.papyrus.editors.suite.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/build.properties6
-rw-r--r--tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/plugin.properties6
-rwxr-xr-xtests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/build.properties6
-rw-r--r--tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf.tests/build.properties6
-rw-r--r--tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/build.properties6
-rw-r--r--tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/fragment.properties6
-rw-r--r--tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/build.properties6
-rw-r--r--tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/build.properties6
-rw-r--r--tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/build.properties6
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/plugin.properties6
-rwxr-xr-xtests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/infra/org.eclipse.papyrus.infra.architecture.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests/build.properties6
-rw-r--r--tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/infra/org.eclipse.papyrus.infra.newchild.tests/build.properties6
-rw-r--r--tests/junit/plugins/infra/org.eclipse.papyrus.infra.newchild.tests/plugin.properties6
-rwxr-xr-xtests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/build.properties6
-rw-r--r--tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/build.properties6
-rw-r--r--tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/build.properties6
-rw-r--r--tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic.tests/build.properties6
-rw-r--r--tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/build.properties6
-rw-r--r--tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/build.properties6
-rw-r--r--tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/build.properties6
-rw-r--r--tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/plugin.properties6
-rwxr-xr-xtests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.suite.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/build.properties6
-rw-r--r--tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/build.properties6
-rw-r--r--tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/plugin.properties6
-rwxr-xr-xtests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/build.properties6
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/plugin.properties6
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.uml.architecture.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.uml.filters.tests/build.properties6
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.uml.filters.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.uml.properties.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/plugin.properties6
-rwxr-xr-xtests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.tests/build.properties6
-rw-r--r--tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.tests/plugin.properties6
-rwxr-xr-xtests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.tests/plugin.properties6
-rw-r--r--tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.genvalidation/plugin.properties6
-rw-r--r--tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.staticprofile/plugin.properties6
-rw-r--r--tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/plugin.properties6
-rwxr-xr-xtests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/plugin.properties6
486 files changed, 1943 insertions, 972 deletions
diff --git a/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/plugin.properties b/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/plugin.properties
index 8639dfa7d41..60f80261605 100644
--- a/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/plugin.properties
+++ b/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2008 CEA LIST.
# 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:
# Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
diff --git a/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/plugin.properties b/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/plugin.properties
index 0797e9ffbde..1c7016122cd 100644
--- a/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/plugin.properties
+++ b/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2008 CEA LIST.
# 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:
# Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
diff --git a/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/plugin.properties b/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/plugin.properties
index dd05d58c467..d377ec06eb3 100644
--- a/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/plugin.properties
+++ b/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2008 CEA LIST.
# 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:
# Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
diff --git a/examples/emf/org.eclipse.papyrus.outline.emftree/plugin.properties b/examples/emf/org.eclipse.papyrus.outline.emftree/plugin.properties
index 8ac2a9387c3..15247b41ae0 100644
--- a/examples/emf/org.eclipse.papyrus.outline.emftree/plugin.properties
+++ b/examples/emf/org.eclipse.papyrus.outline.emftree/plugin.properties
@@ -1,9 +1,11 @@
###############################################################################
# * Copyright (c) 2008 CEA LIST.
# * 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:
# * CEA LIST - initial API and implementation
diff --git a/examples/infra/org.eclipse.papyrus.example.infra.servicesregistry.retrieval/plugin.properties b/examples/infra/org.eclipse.papyrus.example.infra.servicesregistry.retrieval/plugin.properties
index 07c6391c076..f950f0a8b42 100644
--- a/examples/infra/org.eclipse.papyrus.example.infra.servicesregistry.retrieval/plugin.properties
+++ b/examples/infra/org.eclipse.papyrus.example.infra.servicesregistry.retrieval/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2012 Cedric Dumoulin.
# 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:
# Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
diff --git a/examples/others/org.eclipse.papyrus.example.text.instance/build.properties b/examples/others/org.eclipse.papyrus.example.text.instance/build.properties
index 38c809d77da..dc65ab5b784 100644
--- a/examples/others/org.eclipse.papyrus.example.text.instance/build.properties
+++ b/examples/others/org.eclipse.papyrus.example.text.instance/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2012 CEA LIST.
#
# 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:
# Vincent Lorenzo (CEA-LIST) vincent.lorenzo@cea.fr - Initial API and implementation
diff --git a/examples/others/org.eclipse.papyrus.example.text.instance/plugin.properties b/examples/others/org.eclipse.papyrus.example.text.instance/plugin.properties
index 8afb3442b09..f18e79fecd0 100644
--- a/examples/others/org.eclipse.papyrus.example.text.instance/plugin.properties
+++ b/examples/others/org.eclipse.papyrus.example.text.instance/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2012 CEA LIST.
#
# 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:
# Vincent Lorenzo (CEA-LIST) vincent.lorenzo@cea.fr - Initial API and implementation
diff --git a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/plugin.properties b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/plugin.properties
index b3c9a434cde..71280a5e527 100644
--- a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/plugin.properties
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2015 CEA LIST.
# 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:
# Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
diff --git a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/plugin.properties b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/plugin.properties
index 5bbd8f51154..4cdf74f336a 100644
--- a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/plugin.properties
+++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2015 CEA LIST.
# 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:
# Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
diff --git a/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/plugin.properties b/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/plugin.properties
index 6f337050c59..c6327118c56 100644
--- a/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/plugin.properties
+++ b/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2008 CEA LIST.
# 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:
# CEA LIST - initial API and implementation
diff --git a/examples/user/org.eclipse.papyrus.examples.user.qvto/plugin.properties b/examples/user/org.eclipse.papyrus.examples.user.qvto/plugin.properties
index 7f38b8ddd72..25df17a0db8 100644
--- a/examples/user/org.eclipse.papyrus.examples.user.qvto/plugin.properties
+++ b/examples/user/org.eclipse.papyrus.examples.user.qvto/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2016 CEA LIST.
# 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:
# Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - initial API and implementation
diff --git a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/plugin.properties b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/plugin.properties
index 0b30868a038..b8e6bd0a970 100644
--- a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/plugin.properties
+++ b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/plugin.properties
@@ -3,9 +3,11 @@
#
#
# 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:
# Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - Initial API and implementation
diff --git a/plugins/doc/org.eclipse.papyrus.customization.paletteconfiguration.doc/plugin.properties b/plugins/doc/org.eclipse.papyrus.customization.paletteconfiguration.doc/plugin.properties
index 3764288ab49..4281de93d5a 100644
--- a/plugins/doc/org.eclipse.papyrus.customization.paletteconfiguration.doc/plugin.properties
+++ b/plugins/doc/org.eclipse.papyrus.customization.paletteconfiguration.doc/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2017 CEA LIST.
# 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:
# Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation
diff --git a/plugins/doc/org.eclipse.papyrus.doctemplate.doc/plugin.properties b/plugins/doc/org.eclipse.papyrus.doctemplate.doc/plugin.properties
index 08fb0b66166..12fc6626783 100755
--- a/plugins/doc/org.eclipse.papyrus.doctemplate.doc/plugin.properties
+++ b/plugins/doc/org.eclipse.papyrus.doctemplate.doc/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2016 CEA LIST.
# 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:
# Quentin Le Menez (CEA LIST) quentin.lemenez@cea.fr - initial API and implementation
diff --git a/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/plugin.properties b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/plugin.properties
index 180703a144e..4ec8c772812 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/plugin.properties
+++ b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/plugin.properties
@@ -3,9 +3,11 @@
#
#
# 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:
# Laurent Wouters (CEA LIST) laurent.wouters@cea.fr - Initial API and implementation
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/plugin.properties b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/plugin.properties
index e2f1846b330..15a4444423f 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/plugin.properties
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/plugin.properties
@@ -3,9 +3,11 @@
#
#
# 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:
# Céline Janssens (ALL4TEC) celine.janssens@all4tec.net - Initial API and implementation
diff --git a/plugins/doc/org.eclipse.papyrus.infra.internationalization.doc/plugin.properties b/plugins/doc/org.eclipse.papyrus.infra.internationalization.doc/plugin.properties
index a22bb745c3c..4e58c1b944e 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.internationalization.doc/plugin.properties
+++ b/plugins/doc/org.eclipse.papyrus.infra.internationalization.doc/plugin.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2016 CEA LIST.
#
# 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:
# Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - initial API and implementation
diff --git a/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/plugin.properties b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/plugin.properties
index 37734d357e4..18aa80f5fea 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/plugin.properties
+++ b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2015 CEA LIST.
# 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:
# Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/plugin.properties b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/plugin.properties
index c5f01295549..9e8b1e5eb6d 100644
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/plugin.properties
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2008 CEA LIST.
# 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:
# Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - initial API and implementation
diff --git a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/build.properties b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/build.properties
index b4dab6d6286..f30f75809b7 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/build.properties
+++ b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/build.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2014 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/plugin.properties b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/plugin.properties
index a9bc02e5d52..a2b32be2c3e 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/plugin.properties
+++ b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/plugin.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2014 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/build.properties b/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/build.properties
index fa5ca4804a2..5bf8ac9d54d 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/build.properties
+++ b/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/build.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2015 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/plugin.properties b/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/plugin.properties
index e77ad29c080..ffc2c2274d2 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/plugin.properties
+++ b/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/plugin.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2015 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/build.properties b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/build.properties
index fa5ca4804a2..5bf8ac9d54d 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/build.properties
+++ b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/build.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2015 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/plugin.properties b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/plugin.properties
index 8bb01934ad2..3f41864373f 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/plugin.properties
+++ b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/plugin.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2015 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/plugin.properties b/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/plugin.properties
index 0f69a98d573..a89a986e764 100644
--- a/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/plugin.properties
+++ b/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/plugin.properties
@@ -3,9 +3,11 @@
#
#
# 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:
# Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
diff --git a/plugins/editor/org.eclipse.papyrus.editor/plugin.properties b/plugins/editor/org.eclipse.papyrus.editor/plugin.properties
index 79a12b3e8b0..d12eb63d36a 100644
--- a/plugins/editor/org.eclipse.papyrus.editor/plugin.properties
+++ b/plugins/editor/org.eclipse.papyrus.editor/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2010 LIFL.
# 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:
# Cédric Dumoulin - initial API and implementation
diff --git a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.doc/OSGI-INF/l10n/bundle.properties b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.doc/OSGI-INF/l10n/bundle.properties
index 3993d7a4804..07a9cf4be98 100644
--- a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.doc/OSGI-INF/l10n/bundle.properties
+++ b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.doc/OSGI-INF/l10n/bundle.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2012 CEA LIST.
# 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:
# Nicolas Bros (Mia-Software) - Bug 375789 - Documentation
diff --git a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/messages.properties b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/messages.properties
index 556357fdfd1..5f83200cfe6 100644
--- a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/messages.properties
+++ b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2009, 2010 Mia-Software.
# 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:
# Nicolas Bros (Mia-Software) - initial API and implementation
diff --git a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/plugin.properties b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/plugin.properties
index 1a48d69b0b3..5cc98ec44a9 100644
--- a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/plugin.properties
+++ b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2011 Mia-Software.
#
# 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:
# Gregoire Dupe (Mia-Software) - Bug 361794 - [Restructuring] New customization meta-model
diff --git a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/custom/presentation/messages.properties b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/custom/presentation/messages.properties
index 556357fdfd1..5f83200cfe6 100644
--- a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/custom/presentation/messages.properties
+++ b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/custom/presentation/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2009, 2010 Mia-Software.
# 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:
# Nicolas Bros (Mia-Software) - initial API and implementation
diff --git a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.doc/OSGI-INF/l10n/bundle.properties b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.doc/OSGI-INF/l10n/bundle.properties
index c77dcad8034..5baa8ddd195 100644
--- a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.doc/OSGI-INF/l10n/bundle.properties
+++ b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.doc/OSGI-INF/l10n/bundle.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2011, 2012 Mia-Software.
#
# 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:
# Gregoire Dupe (Mia-Software) - Bug 337584 - Documentation set up
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.aggregate.doc/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.aggregate.doc/OSGI-INF/l10n/bundle.properties
index 7d5675cb776..9bcbfc5976e 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.aggregate.doc/OSGI-INF/l10n/bundle.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.aggregate.doc/OSGI-INF/l10n/bundle.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2012 CEA LIST.
# 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:
# Nicolas Bros (Mia-Software) - Bug 375789 - Documentation
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.aggregate.doc/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.aggregate.doc/build.properties
index c03ec09c42b..57f5b63b9f1 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.aggregate.doc/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.aggregate.doc/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2012 CEA LIST.
# 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:
# Nicolas Bros (Mia-Software) - Bug 375789 - Documentation
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/OSGI-INF/l10n/bundle.properties
index 089d0882cb4..e84e8a2be4c 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/OSGI-INF/l10n/bundle.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/OSGI-INF/l10n/bundle.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2011 Mia-Software.
# 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:
# Nicolas Guyomar (Mia-Software) - Bug 333652 Extension point offering the possibility to declare an EPackage browser
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/build.properties
index d7324076042..2a5a251f4c2 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2011 Mia-Software.
# 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:
# Nicolas Guyomar (Mia-Software) - Bug 333652 Extension point offering the possibility to declare an EPackage browser
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/OSGI-INF/l10n/bundle.properties
index 82cbc0d9ca9..1b13feb8214 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/OSGI-INF/l10n/bundle.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/OSGI-INF/l10n/bundle.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2012 CEA LIST.
# 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:
# Nicolas Bros (Mia-Software) - Bug 375054 - Add validation warning for overlay on EClass
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/build.properties
index e3bd13d3c26..7f2c752923a 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2012 CEA LIST.
# 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:
# Nicolas Bros (Mia-Software) - Bug 375054 - Add validation warning for overlay on EClass
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/src/org/eclipse/papyrus/emf/facet/common/sdk/core/internal/messages.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/src/org/eclipse/papyrus/emf/facet/common/sdk/core/internal/messages.properties
index ce28f8b79c1..85daee91e0e 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/src/org/eclipse/papyrus/emf/facet/common/sdk/core/internal/messages.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/src/org/eclipse/papyrus/emf/facet/common/sdk/core/internal/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2012 CEA LIST.
# 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:
# Nicolas Bros (Mia-Software) - Bug 375054 - Add validation warning for overlay on EClass
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/OSGI-INF/l10n/bundle.properties
index a033350c825..fa2ff955d7f 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/OSGI-INF/l10n/bundle.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/OSGI-INF/l10n/bundle.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2011 Mia-Software.
# 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:
# Gregoire Dupe (Mia-Software) - Bug 366804 - [Restructuring] Table widget upgrade
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/build.properties
index dd3e3114ee2..823fcc61e96 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2011 Mia-Software.
# 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:
# Nicolas Guyomar (Mia-Software) - Bug 333652 Extension point offering the possibility to declare an EPackage browser
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/messages.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/messages.properties
index 74227d7a523..5024efb7dd2 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/messages.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/src/org/eclipse/papyrus/emf/facet/common/ui/internal/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2012 CEA LIST.
# 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:
# Nicolas Bros (Mia-Software) - Bug 372732 - [Facet] Rewrite the catalog views for 0.2
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/OSGI-INF/l10n/bundle.properties
index f578f6d8003..d2ca4f42efd 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/OSGI-INF/l10n/bundle.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/OSGI-INF/l10n/bundle.properties
@@ -1,9 +1,11 @@
#Copyright (c) 2011-2012 Mia-Software.
#
#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:
# Gregoire Dupe (Mia-Software) - Bug 361794 - [Restructuring] New customization meta-model
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/build.properties
index 94425368b14..ec6a798da4d 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/build.properties
@@ -1,9 +1,11 @@
#Copyright (c) 2011 Mia-Software.
#
#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:
# Gregoire Dupe (Mia-Software) - Bug 361794 - [Restructuring] New customization meta-model
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/build.properties
index 1f8c81d09a4..b6c77385c8a 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2011 Mia-Software.
#
# 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:
# Gregoire Dupe (Mia-Software) - Bug 361794 - [Restructuring] New customization meta-model
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/plugin.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/plugin.properties
index b67814b5aa6..b70771b0045 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/plugin.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2011 Mia-Software.
#
# 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:
# Gregoire Dupe (Mia-Software) - Bug 361794 - [Restructuring] New customization meta-model
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/OSGI-INF/l10n/bundle.properties
index f4fc35441cf..fdf6a9cf80a 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/OSGI-INF/l10n/bundle.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/OSGI-INF/l10n/bundle.properties
@@ -1,9 +1,11 @@
#Copyright (c) 2011 Mia-Software.
#
#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:
# Gregoire Dupe (Mia-Software) - Bug 361794 - [Restructuring] New customization meta-model
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/build.properties
index 395161b543f..c6ba23e2a8c 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/build.properties
@@ -1,9 +1,11 @@
#Copyright (c) 2011 Mia-Software.
#
#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:
# Gregoire Dupe (Mia-Software) - Bug 361794 - [Restructuring] New customization meta-model
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/plugin.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/plugin.properties
index 63467d6d051..808e7962391 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/plugin.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2011 Mia-Software.
#
# 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:
# Gregoire Dupe (Mia-Software) - Bug 361794 - [Restructuring] New customization meta-model
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/OSGI-INF/l10n/bundle.properties
index f879219b2af..8ed4f88e081 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/OSGI-INF/l10n/bundle.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/OSGI-INF/l10n/bundle.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2012 CEA LIST.
# 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:
# Nicolas Bros (Mia-Software) - Bug 375054 - Add validation warning for overlay on EClass
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/build.properties
index 47734e669d9..9c223aeb2bb 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2012 CEA LIST.
# 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:
# Nicolas Bros (Mia-Software) - Bug 375054 - Add validation warning for overlay on EClass
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/OSGI-INF/l10n/bundle.properties
index 8295da4c620..3e2ff9c26ca 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/OSGI-INF/l10n/bundle.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/OSGI-INF/l10n/bundle.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2012 CEA LIST.
# 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:
# Nicolas Bros (Mia-Software) - Bug 375388 - Cell editor for IImage
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/messages.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/messages.properties
index 876f8f9a002..161b314eba3 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/messages.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/src/org/eclipse/papyrus/emf/facet/custom/sdk/ui/internal/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2012 CEA LIST.
# 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:
# Nicolas Bros (Mia-Software) - Bug 375388 - Cell editor for IImage
# Alban Ménager (Soft-Maint) - Bug 387470 - [EFacet][Custom] Editors
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/OSGI-INF/l10n/bundle.properties
index 575250fa889..28a36109b44 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/OSGI-INF/l10n/bundle.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/OSGI-INF/l10n/bundle.properties
@@ -1,9 +1,11 @@
#Copyright (c) 2011 Mia-Software.
#
#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:
# Gregoire Dupe (Mia-Software) - Bug 361794 - [Restructuring] New customization meta-model
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/build.properties
index 248ce347db0..9fbcf4fa639 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/build.properties
@@ -1,9 +1,11 @@
#Copyright (c) 2011 Mia-Software.
#
#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:
# Gregoire Dupe (Mia-Software) - Bug 361794 - [Restructuring] New customization meta-model
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/messages.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/messages.properties
index d70680cffbf..11fc25cc2a0 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/messages.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2009 Mia-Software.
# 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:
# Nicolas Bros (Mia-Software) - initial API and implementation
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/OSGI-INF/l10n/bundle.properties
index 0d360e43321..bc40135a6f9 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/OSGI-INF/l10n/bundle.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/OSGI-INF/l10n/bundle.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2011 Mia-Software.
# 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:
# Nicolas Guyomar (Mia-Software) - Bug 333553 - The user has not to deal with two files to create a facet
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/build.properties
index 10dea2f191c..deaf066b1d1 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/build.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2011 Mia-Software.
#
# 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:
# Gregoire Dupe (Mia-Software) - Design
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/OSGI-INF/l10n/bundle.properties
index 246bc6da7da..6bb6efbc53d 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/OSGI-INF/l10n/bundle.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/OSGI-INF/l10n/bundle.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2011, 2012 Mia-Software.
#
# 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:
# Nicolas Guyomar (Mia-Software) - Bug 333553 - The user has not to deal with two files to create a facet
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/build.properties
index ce9ad44285a..7174711a8f4 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/build.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2011 Mia-Software.
#
# 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:
# Nicolas Guyomar (Mia-Software) - Bug 333553 - The user has not to deal with two files to create a facet
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/src/org/eclipse/papyrus/emf/facet/efacet/core/internal/messages.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/src/org/eclipse/papyrus/emf/facet/efacet/core/internal/messages.properties
index 86c7c25b1ee..d2a6c463002 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/src/org/eclipse/papyrus/emf/facet/efacet/core/internal/messages.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/src/org/eclipse/papyrus/emf/facet/efacet/core/internal/messages.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2011 Mia-Software.
#
# 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:
# Gregoire Dupe (Mia-Software) - Bug 333553 - The user has not to deal with two files to create a facet
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.doc/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.doc/OSGI-INF/l10n/bundle.properties
index 779eb16dd22..b6ae483c66a 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.doc/OSGI-INF/l10n/bundle.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.doc/OSGI-INF/l10n/bundle.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2012 CEA LIST.
# 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:
# Nicolas Bros (Mia-Software) - Bug 375789 - Documentation
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.doc/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.doc/build.properties
index 502c3b521ee..32de35077b1 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.doc/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.doc/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2012 CEA LIST.
# 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:
# Nicolas Bros (Mia-Software) - Bug 375789 - Documentation
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.edit/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.edit/build.properties
index c0beb30e355..bef3464d8d5 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.edit/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.edit/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2011 Mia-Software.
#
# 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:
# Gregoire Dupe (Mia-Software) - Design
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.edit/plugin.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.edit/plugin.properties
index b7329e3c997..edb60d901cc 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.edit/plugin.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.edit/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2011 Mia-Software.
#
# 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:
# Gregoire Dupe (Mia-Software) - Design
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.editor/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.editor/build.properties
index bbac2f78aa9..63786b1649c 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.editor/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.editor/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2011 Mia-Software.
#
# 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:
# Gregoire Dupe (Mia-Software) - Design
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.editor/plugin.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.editor/plugin.properties
index 8376796d042..42c6a08b34c 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.editor/plugin.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.editor/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2011 Mia-Software.
#
# 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:
# Gregoire Dupe (Mia-Software) - Design
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/build.properties
index 9bc23b47e76..d2bbe6e6b01 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2011 Mia-Software.
#
# 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:
# Gregoire Dupe (Mia-Software) - Design
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/plugin.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/plugin.properties
index 5c487b08a99..29f388a5885 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/plugin.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2011, 2012 Mia-Software.
#
# 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:
# Gregoire Dupe (Mia-Software) - Design
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/OSGI-INF/l10n/bundle.properties
index ede7eafbd8b..2b20c4a3c08 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/OSGI-INF/l10n/bundle.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/OSGI-INF/l10n/bundle.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2011 Mia-Software.
#
# 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:
# Emmanuelle Rouillé (Mia-Software) - Bug 352618 - To be able to use non derived facet structural features and save them values.
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/build.properties
index 2077b322e54..77dc4893d7b 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/build.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2011 Mia-Software.
#
# 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:
# Gregoire Dupe (Mia-Software) - design
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/OSGI-INF/l10n/bundle.properties
index 6d734cfd609..11063a0ff62 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/OSGI-INF/l10n/bundle.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/OSGI-INF/l10n/bundle.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2011 Mia-Software.
#
# 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:
# Alban Ménager (Soft-Maint) - Bug 387470 - [EFacet][Custom] Editors
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/src/org/eclipse/papyrus/emf/facet/efacet/sdk/ui/internal/messages.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/src/org/eclipse/papyrus/emf/facet/efacet/sdk/ui/internal/messages.properties
index b68d84de61e..ec31eeffb26 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/src/org/eclipse/papyrus/emf/facet/efacet/sdk/ui/internal/messages.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/src/org/eclipse/papyrus/emf/facet/efacet/sdk/ui/internal/messages.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2011, 2012 Mia-Software.
#
# 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:
# Nicolas Guyomar (Mia-Software) - Bug 349546 - EMF Facet facetSet editor
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/OSGI-INF/l10n/bundle.properties
index 53a6e3eb857..040bf81ecb8 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/OSGI-INF/l10n/bundle.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/OSGI-INF/l10n/bundle.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2011 Mia-Software.
#
# 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:
# Nicolas Guyomar (Mia-Software) - Bug 349546 - EMF Facet facetSet editor
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/build.properties
index 80ec000fd99..c8f6c04ae1a 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/build.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2011 Mia-Software.
#
# 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:
# Nicolas Guyomar (Mia-Software) - Bug 349546 - EMF Facet facetSet editor
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/src/org/eclipse/papyrus/emf/facet/efacet/ui/internal/messages.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/src/org/eclipse/papyrus/emf/facet/efacet/ui/internal/messages.properties
index e80ed70ccf7..2ba3bcbb85e 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/src/org/eclipse/papyrus/emf/facet/efacet/ui/internal/messages.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/src/org/eclipse/papyrus/emf/facet/efacet/ui/internal/messages.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2011, 2012 Mia-Software.
#
# 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:
# Nicolas Guyomar (Mia-Software) - Bug 349546 - EMF Facet facetSet editor
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/OSGI-INF/l10n/bundle.properties
index aca289b49e3..308761badcc 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/OSGI-INF/l10n/bundle.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/OSGI-INF/l10n/bundle.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2011 Mia-Software.
#
# 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:
# Gregoire Dupe (Mia-Software) - design
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/build.properties
index bbd40a1929e..9df9bfc0ed4 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/build.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2011 Mia-Software.
#
# 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:
# Gregoire Dupe (Mia-Software) - design
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.core/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.core/OSGI-INF/l10n/bundle.properties
index 401d82ce583..da8ddfc5b44 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.core/OSGI-INF/l10n/bundle.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.core/OSGI-INF/l10n/bundle.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2011 Mia-Software.
#
# 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:
# Nicolas Guyomar (Mia-Software) - Bug 334615 - Java Query for EMF Facet
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.core/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.core/build.properties
index fd656c58f64..8f94f612429 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.core/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.core/build.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2011 Mia-Software.
#
# 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:
# Nicolas Guyomar (Mia-Software) - Bug 334615 - Java Query for EMF Facet
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/plugin.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/plugin.properties
index c50aadf45aa..9f58d0ae46a 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/plugin.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2011 Mia-Software.
#
# 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:
# Nicolas Guyomar (Mia-Software) - Bug 334615 - Java Query for EMF Facet
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui/OSGI-INF/l10n/bundle.properties
index 01b617704b5..e2841d5a61e 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui/OSGI-INF/l10n/bundle.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui/OSGI-INF/l10n/bundle.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2012 Mia-Software.
#
# 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:
# Alban Ménager (Soft-Maint) - Bug 387470 - [EFacet][Custom] Editors
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui/build.properties
index 6a596ebec2a..797129678b4 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui/build.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2012 Mia-Software.
#
# 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:
# Alban Ménager (Soft-Maint) - Bug 387470 - [EFacet][Custom] Editors
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui/src/org/eclipse/papyrus/emf/facet/query/java/sdk/ui/internal/messages.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui/src/org/eclipse/papyrus/emf/facet/query/java/sdk/ui/internal/messages.properties
index 6b244f3f8de..439fbfabe05 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui/src/org/eclipse/papyrus/emf/facet/query/java/sdk/ui/internal/messages.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui/src/org/eclipse/papyrus/emf/facet/query/java/sdk/ui/internal/messages.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2011 Mia-Software.
#
# 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:
# Nicolas Guyomar (Mia-Software) - Bug 349556 - EMF Facet Java Query wizard
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/OSGI-INF/l10n/bundle.properties
index 4da095b48ca..38b7dca6fa3 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/OSGI-INF/l10n/bundle.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/OSGI-INF/l10n/bundle.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2011 Mia-Software.
#
# 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:
# Nicolas Guyomar (Mia-Software) - Bug 334615 - Java Query for EMF Facet
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/build.properties
index bee694f028f..f3e82ae2c55 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/build.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2011 Mia-Software.
#
# 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:
# Nicolas Guyomar (Mia-Software) - Bug 334615 - Java Query for EMF Facet
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.core/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.core/OSGI-INF/l10n/bundle.properties
index 387b80f5908..28217967382 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.core/OSGI-INF/l10n/bundle.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.core/OSGI-INF/l10n/bundle.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2012 Mia-Software.
#
# 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:
# Alban Ménager (Soft-Maint) - Bug 387470 - [EFacet][Custom] Editors
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.core/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.core/build.properties
index 6a596ebec2a..797129678b4 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.core/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.core/build.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2012 Mia-Software.
#
# 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:
# Alban Ménager (Soft-Maint) - Bug 387470 - [EFacet][Custom] Editors
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/build.properties
index ab5a30dadf6..c5d4cc56d22 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2012 Mia-Software.
#
# 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:
# Alban Ménager (Soft-Maint) - Bug 387470 - [EFacet][Custom] Editors
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/plugin.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/plugin.properties
index 8f425b9308d..45d832b1efb 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/plugin.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2012 Mia-Software.
#
# 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:
# Alban Ménager (Soft-Maint) - Bug 387470 - [EFacet][Custom] Editors
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui/OSGI-INF/l10n/bundle.properties
index 1d82ce7ed10..edf0e6d0d83 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui/OSGI-INF/l10n/bundle.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui/OSGI-INF/l10n/bundle.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2012 Mia-Software.
#
# 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:
# Alban Ménager (Soft-Maint) - Bug 387470 - [EFacet][Custom] Editors
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui/build.properties
index 745fdcea593..e1275aca5eb 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui/build.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2012 Mia-Software.
#
# 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:
# Alban Ménager (Soft-Maint) - Bug 387470 - [EFacet][Custom] Editors
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui/src/org/eclipse/papyrus/emf/facet/query/ocl/sdk/ui/internal/messages.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui/src/org/eclipse/papyrus/emf/facet/query/ocl/sdk/ui/internal/messages.properties
index 1adeef4c297..bf4717303ed 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui/src/org/eclipse/papyrus/emf/facet/query/ocl/sdk/ui/internal/messages.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui/src/org/eclipse/papyrus/emf/facet/query/ocl/sdk/ui/internal/messages.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2012 Mia-Software.
#
# 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:
# Alban Ménager (Soft-Maint) - Bug 387470 - [EFacet][Custom] Editors
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.core/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.util.core/OSGI-INF/l10n/bundle.properties
index 16c1b68d8db..107f4e694bc 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.core/OSGI-INF/l10n/bundle.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.core/OSGI-INF/l10n/bundle.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2011 Mia-Software.
#
# 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:
# Nicolas Guyomar (Mia-Software) - Bug 339899 - everything must be externalized before UI freeze
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.core/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.util.core/build.properties
index 77c2058b2ac..3626ffa35b6 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.core/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.core/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2011 Mia-Software.
# 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:
# Gregoire Dupe (Mia-Software) - Bug 338811 - A model registration method in the interface ICatalogSetManager
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.core/src/org/eclipse/papyrus/emf/facet/util/core/internal/messages.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.util.core/src/org/eclipse/papyrus/emf/facet/util/core/internal/messages.properties
index d8af3aecea4..391c08e2e03 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.core/src/org/eclipse/papyrus/emf/facet/util/core/internal/messages.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.core/src/org/eclipse/papyrus/emf/facet/util/core/internal/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2009 Mia-Software.
# 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:
# Nicolas Bros (Mia-Software)
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/OSGI-INF/l10n/bundle.properties
index 804fe485c2b..b23140e012f 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/OSGI-INF/l10n/bundle.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/OSGI-INF/l10n/bundle.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2011 Mia-Software.
# 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:
# Nicolas Guyomar (Mia-Software)
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/build.properties
index 223a6abc7ed..1475347321c 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/build.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2011 Mia-Software.
#
# 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:
# Nicolas Guyomar (Mia-Software) - Bug 334000 Simple catalog manager
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/OSGI-INF/l10n/bundle.properties
index 0e36ebb88db..dacbfeeb7a4 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/OSGI-INF/l10n/bundle.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/OSGI-INF/l10n/bundle.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2011 Mia-Software.
# 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:
# Nicolas Guyomar (Mia-Software) - Bug 333652 Extension point offering the possibility to declare an EPackage browser
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/build.properties
index 917a2f511c7..5cb1b06c738 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2011 Mia-Software.
# 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:
# Gregoire DUPE (Mia-Software) - initial API and implementation
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.doc/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.doc/build.properties
index 45b074f6ce7..f75c336041e 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.doc/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.doc/build.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2011, 2012 Mia-Software.
#
# 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:
# Nicolas Bros (Mia-Software) - Bug 337584 - Documentation set up
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.ui/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.ui/build.properties
index adcb63e8a91..00c66f5ecc7 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.ui/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.ui/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2011 Mia-Software.
# 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:
# Nicolas Guyomar (Mia-Software) - Bug 333652 Extension point offering the possibility to declare an EPackage browser
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.ui/src/org/eclipse/papyrus/emf/facet/util/emf/ui/internal/messages.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.ui/src/org/eclipse/papyrus/emf/facet/util/emf/ui/internal/messages.properties
index 881bab26dbb..577e91aca3f 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.ui/src/org/eclipse/papyrus/emf/facet/util/emf/ui/internal/messages.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.ui/src/org/eclipse/papyrus/emf/facet/util/emf/ui/internal/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2011, 2012 Mia-Software and CEA LIST.
# 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:
# Nicolas Guyomar (Mia-Software) - Bug 333652 Extension point offering the possibility to declare an EPackage browser
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/OSGI-INF/l10n/bundle.properties
index d5b59fbc013..f85745621e6 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/OSGI-INF/l10n/bundle.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/OSGI-INF/l10n/bundle.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2013 Soft-Maint.
# 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:
# Thomas Cicognani (Soft-Maint) - Bug 424416 - Plug-in for JFace Utilities
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/build.properties
index a179fee7893..0aa71aec666 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2013 Soft-Maint.
# 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:
# Thomas Cicognani (Soft-Maint) - Bug 424416 - Plug-in for JFace Utilities
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.pde.core/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.util.pde.core/build.properties
index facd28f85a3..06b4a161b16 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.pde.core/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.pde.core/build.properties
@@ -1,8 +1,10 @@
# Copyright (c) 2013 Mia-Software
# 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:
# Gregoire Dupe (Mia-Software) - Bug 417789 - org.eclipse.papyrus.emf.facet.util.core should not so much dependencies
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.swt/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.util.swt/OSGI-INF/l10n/bundle.properties
index f7517b150f3..cabd7859364 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.swt/OSGI-INF/l10n/bundle.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.swt/OSGI-INF/l10n/bundle.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2012 CEA LIST.
# 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:
# Nicolas Bros (Mia-Software) - Bug 372865 - FacetSet selection dialog
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.swt/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.util.swt/build.properties
index 870dd99b0b5..178161e846c 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.swt/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.swt/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2012 CEA LIST.
# 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:
# Nicolas Bros (Mia-Software) - Bug 372865 - FacetSet selection dialog
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/OSGI-INF/l10n/bundle.properties
index b8e0a24dca4..a43a5aec94a 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/OSGI-INF/l10n/bundle.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/OSGI-INF/l10n/bundle.properties
@@ -1,8 +1,10 @@
# Copyright (c) 2011 Mia-Software.
# 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:
# Grégoire Dupé (Mia-Software) - Bug 367153 - synchronization utilities
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/build.properties
index c7e983dbca9..7323f6d8e42 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/build.properties
@@ -1,8 +1,10 @@
# Copyright (c) 2011 Mia-Software.
# 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:
# Grégoire Dupé (Mia-Software) - Bug 367153 - synchronization utilities
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/src/org/eclipse/papyrus/emf/facet/util/ui/internal/messages.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/src/org/eclipse/papyrus/emf/facet/util/ui/internal/messages.properties
index 8ce1f484cd4..01331312185 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/src/org/eclipse/papyrus/emf/facet/util/ui/internal/messages.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/src/org/eclipse/papyrus/emf/facet/util/ui/internal/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2011 Mia-Software.
# 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:
# Nicolas Bros (Mia-Software) - Bug 366367 - To be able to change the "CanBePresentedInTheTable" query
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/OSGI-INF/l10n/bundle.properties
index 82b7cf4225c..a95074d2bfb 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/OSGI-INF/l10n/bundle.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/OSGI-INF/l10n/bundle.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2010 CEA LIST.
#
# 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:
# Nicolas Guyomar (Mia-Software) - initial API and implementation
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/build.properties
index f38db24dec3..dd007904a1f 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2010 CEA LIST
# 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:
# Nicolas Bros (Mia-Software) - initial API and implementation
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/src/org/eclipse/papyrus/emf/facet/widgets/celleditors/ecore/messages.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/src/org/eclipse/papyrus/emf/facet/widgets/celleditors/ecore/messages.properties
index 74639eb6e32..07083c1c28f 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/src/org/eclipse/papyrus/emf/facet/widgets/celleditors/ecore/messages.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/src/org/eclipse/papyrus/emf/facet/widgets/celleditors/ecore/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2010 CEA LIST
# 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:
# Nicolas Bros (Mia-Software) - initial API and implementation
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/build.properties
index e2786e1822b..fbeda577df7 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2010 CEA LIST
# 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:
# Nicolas Bros (Mia-Software) - initial API and implementation
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/plugin.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/plugin.properties
index 7757a98f1d5..d44f9bb84d7 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/plugin.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/plugin.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2010 CEA LIST
# 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:
# Nicolas Bros (Mia-Software) - initial API and implementation
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/src/org/eclipse/papyrus/emf/facet/widgets/celleditors/internal/messages.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/src/org/eclipse/papyrus/emf/facet/widgets/celleditors/internal/messages.properties
index 19531cd0d6c..0efbc53a2df 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/src/org/eclipse/papyrus/emf/facet/widgets/celleditors/internal/messages.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/src/org/eclipse/papyrus/emf/facet/widgets/celleditors/internal/messages.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2010 CEA LIST.
#
# 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:
# Nicolas Bros (Mia-Software) - initial API and implementation
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/OSGI-INF/l10n/bundle.properties
index 6d00e2c0154..4b20869c68e 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/OSGI-INF/l10n/bundle.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/OSGI-INF/l10n/bundle.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2010 Mia-Software.
# 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:
# Nicolas Bros (Mia-Software) - initial API and implementation
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/build.properties
index 2404f51f8e7..835a3d87d6c 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2010 Mia-Software.
# 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:
# Nicolas Bros (Mia-Software) - initial API and implementation
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/build.properties b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/build.properties
index 41f1778c3f0..8d30c39177b 100644
--- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/build.properties
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/build.properties
@@ -1,9 +1,11 @@
* Copyright (c) 2017 CEA LIST.
#
# 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:
# Maged Elaasar - Initial API and implementation
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/plugin.properties b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/plugin.properties
index d2f6164bbdd..cd05ecedc89 100644
--- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/plugin.properties
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/plugin.properties
@@ -1,9 +1,11 @@
* Copyright (c) 2017 CEA LIST.
#
# 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:
# Maged Elaasar - Initial API and implementation
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/build.properties b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/build.properties
index a6b5e271805..49f9190e9dc 100644
--- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/build.properties
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/build.properties
@@ -1,9 +1,11 @@
* Copyright (c) 2017 CEA LIST.
#
# 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:
# Maged Elaasar - Initial API and implementation
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/plugin.properties b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/plugin.properties
index 58d9ca152fe..0fea6a5465c 100644
--- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/plugin.properties
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/plugin.properties
@@ -1,9 +1,11 @@
* Copyright (c) 2017 CEA LIST.
#
# 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:
# Maged Elaasar - Initial API and implementation
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/plugin.properties b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/plugin.properties
index f8028c40563..0fad8ca85e8 100644
--- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/plugin.properties
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2017 CEA LIST.
#
# 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:
# Maged Elaasar - Initial API and implementation
diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/build.properties b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/build.properties
index 41aa4bbad6a..e8bd464a6b9 100644
--- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/build.properties
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/build.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2016 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/plugin.properties b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/plugin.properties
index 182bbe58da4..af3132111f3 100644
--- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/plugin.properties
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/plugin.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2016 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/build.properties b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/build.properties
index e731725fd51..8676839bc2d 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/build.properties
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/build.properties
@@ -1,9 +1,11 @@
* Copyright (c) 2017 CEA LIST.
#
# 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:
# Maged Elaasar - Initial API and implementation
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/plugin.properties b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/plugin.properties
index 23f551d5442..437bd272eb5 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/plugin.properties
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/plugin.properties
@@ -1,9 +1,11 @@
* Copyright (c) 2017 CEA LIST.
#
# 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:
# Maged Elaasar - Initial API and implementation
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/build.properties b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/build.properties
index ffb1853730a..113e21adcd7 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/build.properties
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/build.properties
@@ -1,9 +1,11 @@
* Copyright (c) 2017 CEA LIST.
#
# 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:
# Maged Elaasar - Initial API and implementation
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/plugin.properties b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/plugin.properties
index 3c83e2e9911..6055ab0689f 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/plugin.properties
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/plugin.properties
@@ -1,9 +1,11 @@
* Copyright (c) 2017 CEA LIST.
#
# 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:
# Maged Elaasar - Initial API and implementation
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/plugin.properties b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/plugin.properties
index 90c554f2514..cd9e244ed10 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/plugin.properties
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/plugin.properties
@@ -3,9 +3,11 @@
#
#
# 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:
# Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/plugin.properties b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/plugin.properties
index c27084dcd36..ee67c27c3fd 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/plugin.properties
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/plugin.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2008 CEA LIST.
#
# 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:
# Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/build.properties b/plugins/infra/core/org.eclipse.papyrus.infra.core/build.properties
index 4ffb208e4f4..29273d86b39 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/build.properties
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/build.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2009, 2016 LIFL, CEA LIST, Christian W. Damus, 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:
# LIFL - Initial API and implementation
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/plugin.properties b/plugins/infra/core/org.eclipse.papyrus.infra.core/plugin.properties
index 646738e725f..fe614c50f24 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/plugin.properties
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2008 CEA LIST.
# 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:
# Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/build.properties b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/build.properties
index 9f15c8ad040..01fc980a7eb 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/build.properties
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/build.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2015 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/plugin.properties b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/plugin.properties
index befe5b938ce..b9c16820c34 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/plugin.properties
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/plugin.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2015 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/build.properties b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/build.properties
index 20cda3b275c..75df2cecc60 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/build.properties
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/build.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2015 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/plugin.properties b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/plugin.properties
index c05dc20386d..0bb15404399 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/plugin.properties
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/plugin.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2015 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/build.properties b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/build.properties
index 3080c1d8197..a8fcf3f68af 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/build.properties
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/build.properties
@@ -2,9 +2,11 @@
#
#
# 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:
# Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/plugin.properties b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/plugin.properties
index d5b731e2349..9292dd33dff 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/plugin.properties
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/plugin.properties
@@ -2,9 +2,11 @@
#
#
# 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:
# Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/build.properties b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/build.properties
index aff44008e81..dba3773797f 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/build.properties
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/build.properties
@@ -2,9 +2,11 @@
#
#
# 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:
# Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/plugin.properties b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/plugin.properties
index c64d4bdc03b..2e14c278969 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/plugin.properties
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/plugin.properties
@@ -2,9 +2,11 @@
#
#
# 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:
# Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/build.properties b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/build.properties
index 97ea1a23f98..d30af0897bf 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/build.properties
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/build.properties
@@ -2,9 +2,11 @@
#
#
# 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:
# Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/plugin.properties b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/plugin.properties
index 97924ddf2d7..c65d6dc05da 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/plugin.properties
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2015 CEA LIST.
# 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:
# Vincent LORENZO (CEA LIST) vincent.lorenzo@cea.fr - initial API and implementation
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/build.properties b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/build.properties
index 7b8ac2c65d6..a46705e26c4 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/build.properties
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/build.properties
@@ -2,9 +2,11 @@
#
#
# 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:
# Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/plugin.properties b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/plugin.properties
index 2ee978fce00..4a23cd6ae05 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/plugin.properties
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/plugin.properties
@@ -2,9 +2,11 @@
#
#
# 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:
# Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/plugin.properties b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/plugin.properties
index 6c2853b569c..8f0977fa6c7 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/plugin.properties
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2008 CEA LIST.
# 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:
# Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/plugin.properties b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/plugin.properties
index a9f119d526c..ca57f11d323 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/plugin.properties
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/plugin.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2016 Christian W. Damus 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:
# Christian W. Damus - initial API and implementation
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/plugin.properties b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/plugin.properties
index 924e199165e..b3d33014d03 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/plugin.properties
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2010 CEA LIST.
# 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:
# Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/build.properties b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/build.properties
index 3354f248630..addd8f69711 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/build.properties
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/build.properties
@@ -2,9 +2,11 @@
#
#
# 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:
# CEA LIST - Initial API and implementation
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/plugin.properties b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/plugin.properties
index be2fc010a06..cd2c02a4fca 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/plugin.properties
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/plugin.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2018 CEA LIST.
#
# 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:
# CEA LIST - Initial API and implementation
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/build.properties b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/build.properties
index 91d256f34c6..2da130c6f69 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/build.properties
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/build.properties
@@ -2,9 +2,11 @@
#
#
# 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:
# CEA LIST - Initial API and implementation
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/plugin.properties b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/plugin.properties
index ab265261b49..e033d8863a8 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/plugin.properties
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2015 CEA LIST.
# 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:
# Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/messages/messages.properties b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/messages/messages.properties
index b0d37d44d39..408fde27976 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/messages/messages.properties
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/messages/messages.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2012, 2016 CEA, Christian W. Damus, 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:
# Vincent Lorenzo (CEA LIST) - Initial API and implementation
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/plugin.properties b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/plugin.properties
index d2fe5aea31d..2f3046158bb 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/plugin.properties
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/plugin.properties
@@ -1,9 +1,11 @@
#
# Copyright (c) 2016 Christian W. Damus 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:
# Christian W. Damus - initial API and implementation
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/internal/emf/messages/messages.properties b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/internal/emf/messages/messages.properties
index f6091fe2957..382ed7985a0 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/internal/emf/messages/messages.properties
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/internal/emf/messages/messages.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2012, 2016 CEA, Christian W. Damus, ALL4TEC, 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:
# Vincent Lorenzo (CEA LIST) - Initial API and implementation
diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/build.properties b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/build.properties
index 1a722c325fb..9aceb8eceac 100644
--- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/build.properties
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/plugin.properties b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/plugin.properties
index 651d0a1eae8..2d6e1ae3c27 100644
--- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/plugin.properties
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/build.properties b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/build.properties
index 55cc9ab299f..4990c723e6d 100644
--- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/build.properties
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/plugin.properties b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/plugin.properties
index bc6db7809bf..3c36684b725 100644
--- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/plugin.properties
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/build.properties b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/build.properties
index 1a722c325fb..9aceb8eceac 100644
--- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/build.properties
+++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/plugin.properties b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/plugin.properties
index f4054557eb3..c140dcd74fb 100644
--- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/plugin.properties
+++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014, 2015 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/build.properties b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/build.properties
index 10405d6224e..c8c1a4a6583 100644
--- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/build.properties
+++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/plugin.properties b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/plugin.properties
index 6b999f61a7d..31d1b8ebeb9 100644
--- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/plugin.properties
+++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/build.properties b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/build.properties
index a5821e1c6b6..c7622bf232c 100644
--- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/build.properties
+++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/plugin.properties b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/plugin.properties
index bccb60b5927..69b3a5589d5 100644
--- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/plugin.properties
+++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/build.properties b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/build.properties
index 504e3b50af3..990e615589e 100644
--- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/build.properties
+++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/plugin.properties b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/plugin.properties
index c7a49db5f00..8cb29f1de1a 100644
--- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/plugin.properties
+++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/build.properties b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/build.properties
index 8aa7cd8c009..c6e13887276 100644
--- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/build.properties
+++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2015 CEA LIST.
#
# 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:
# CEA LIST - Initial API and implementation
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/plugin.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/plugin.properties
index 1f6f0dac066..ac68b824c1b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/plugin.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2008 CEA LIST.
# 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:
# Remi Schnekenburger (CEA LIST) Remi.Schnekenburger@cea.fr - Initial API and implementation
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/plugin.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/plugin.properties
index 025c6111645..03524a45e4e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/plugin.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2008, 2015 CEA LIST, Christian W. Damus, 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:
# Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - initial API and implementation
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/plugin.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/plugin.properties
index 3038c1529e6..3f0ded7b220 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/plugin.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2011, 2014 Atos, CEA, 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:
# Vincent Hemery - Initial API and implementation
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.properties
index 794945e7358..e5d2b8c17b5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2008 CEA LIST.
# 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:
# Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/messages/messages.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/messages/messages.properties
index 416bfbe5fb4..b688c41d4e7 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/messages/messages.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/messages/messages.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2013, 2017 CEA 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:
# Vincent Lorenzo (CEA LIST) - Initial API and implementation
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/plugin.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/plugin.properties
index 2946549ce0f..6031b843034 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/plugin.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2011 Atos Origin.
# 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:
# Anass Radouani - Initial API and implementation
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/build.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/build.properties
index 3fdd8dd9b8e..b86bf95e121 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/build.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/build.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2016 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/plugin.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/plugin.properties
index 20c75f5c328..533b68402e7 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/plugin.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/plugin.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2016 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/plugin.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/plugin.properties
index 4b56f044955..265df1f00ae 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/plugin.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2015 CEA LIST.
# 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:
# Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/plugin.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/plugin.properties
index ba5c5cc9a22..51b15848c8c 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/plugin.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2017 CEA LIST.
# 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:
# Benoit Maggi (CEA LIST) - Initial API and implementation
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/messages/messages.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/messages/messages.properties
index bab58493355..d987398a511 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/messages/messages.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/messages/messages.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, 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:
# CEA LIST - Initial API and implementation
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/plugin.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/plugin.properties
index b2c822ef806..a6e0ba7806a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/plugin.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2015 CEA LIST.
# 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:
# Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/plugin.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/plugin.properties
index 9088aae2cb7..f191ea93ffa 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/plugin.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2010 Atos Origin.
# 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:
# Atos Origin - Initial API and Implementation
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/plugin.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/plugin.properties
index dfab6387343..3b500603f0f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/plugin.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/plugin.properties
@@ -2,9 +2,11 @@
#
# Copyright (c) 2009 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/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/plugin.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/plugin.properties
index 24e52344120..91919947709 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/plugin.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/plugin.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2008 Atos Origin.
#
# 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:
# Atos Origin - Initial API and implementation
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/build.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/build.properties
index a524e60c9fe..0e30652d1bf 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/build.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2017 CEA LIST.
#
# 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:
# Maged Elaasar - Initial API and implementation
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/plugin.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/plugin.properties
index 26e45f1cb0b..63ac51f550c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/plugin.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2017 CEA LIST.
#
# 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:
# Maged Elaasar - Initial API and implementation
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/build.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/build.properties
index 86f2d2a14e3..9fecbe1a3c3 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/build.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2017 CEA LIST.
#
# 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:
# Maged Elaasar - Initial API and implementation
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/plugin.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/plugin.properties
index a9fce49926f..a001acc8c50 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/plugin.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2017 CEA LIST.
#
# 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:
# Maged Elaasar - Initial API and implementation
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/build.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/build.properties
index 7a463ff1af0..c1869a3d787 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/build.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2013 CEA LIST.
#
# 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:
# Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/plugin.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/plugin.properties
index e6d5ecb87e1..4396ee00ea9 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/plugin.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2013 CEA LIST.
#
# 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:
# Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/build.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/build.properties
index ec96ed10459..8a87bb0e8ab 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/build.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2013 CEA LIST.
#
# 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:
# Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/plugin.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/plugin.properties
index 3af47a8e84a..273557cab31 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/plugin.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2013 CEA LIST.
#
# 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:
# Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/plugin.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/plugin.properties
index c6fc4c1b0c6..f277fee9f43 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/plugin.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/plugin.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2012 Montages AG, 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:
# Montages AG - initial API and implementation
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/build.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/build.properties
index 6b4caafb364..d7b27b37d84 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/build.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/build.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2015 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/plugin.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/plugin.properties
index ef32709d639..3b9e8622526 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/plugin.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/plugin.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2015 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/plugin.properties b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/plugin.properties
index 1b9753afbc2..1e39fb0a697 100644
--- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/plugin.properties
+++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/plugin.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2010 CEA LIST.
# 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:
# CEA LIST - initial API and implementation
diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.editor.welcome.internationalization/build.properties b/plugins/infra/internationalization/org.eclipse.papyrus.infra.editor.welcome.internationalization/build.properties
index 9f15c8ad040..01fc980a7eb 100644
--- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.editor.welcome.internationalization/build.properties
+++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.editor.welcome.internationalization/build.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2015 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/messages/messages.properties b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/messages/messages.properties
index 9ae1b8c0974..86426424ef7 100644
--- a/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/messages/messages.properties
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/messages/messages.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, 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:
# CEA LIST - Initial API and implementation
diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.sync/build.properties b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/build.properties
index 0c748736d04..0b7ac11eec5 100644
--- a/plugins/infra/misc/org.eclipse.papyrus.infra.sync/build.properties
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/build.properties
@@ -1,9 +1,11 @@
#
# Copyright (c) 2015 Christian W. Damus 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:
# Christian W. Damus - initial API and implementation
diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.sync/plugin.properties b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/plugin.properties
index 76359109316..03301b4ca4f 100644
--- a/plugins/infra/misc/org.eclipse.papyrus.infra.sync/plugin.properties
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/plugin.properties
@@ -1,9 +1,11 @@
#
# Copyright (c) 2015 Christian W. Damus 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:
# Christian W. Damus - initial API and implementation
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/plugin.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/plugin.properties
index 5e41e7f98d0..6f789aaf5f7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/plugin.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2015 CEA LIST.
# 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:
# Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/plugin.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/plugin.properties
index 60614942fa7..146b2b17a55 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/plugin.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2015 CEA LIST.
# 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:
# Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/build.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/build.properties
index c2623bdd9c6..529f47c6901 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/build.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/build.properties
@@ -2,9 +2,11 @@
#
#
# 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:
# Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/plugin.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/plugin.properties
index 5438c4ddd68..9b806c24b61 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/plugin.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/plugin.properties
@@ -2,9 +2,11 @@
#
#
# 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:
# Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/build.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/build.properties
index f41ac122fd8..07bcc15c640 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/build.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/build.properties
@@ -2,9 +2,11 @@
#
#
# 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:
# Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.properties
index 6a0a19af667..8e4a3bfdf36 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2013 CEA LIST.
#
# 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:
# Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/build.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/build.properties
index 025bbfda2ac..db1b82fa5d2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/build.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/build.properties
@@ -2,9 +2,11 @@
#
#
# 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:
# Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/plugin.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/plugin.properties
index 2c392fd8a0c..d197e48e4af 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/plugin.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/plugin.properties
@@ -2,9 +2,11 @@
#
#
# 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:
# Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/plugin.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/plugin.properties
index 8a86962e6af..4da79764a78 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/plugin.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2015 CEA LIST.
# 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:
# Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/plugin.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/plugin.properties
index 7fc1a35bcaa..1fe2b031e5b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/plugin.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2015 CEA LIST.
# 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:
# Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/build.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/build.properties
index 3ffdf3f0208..d4525402d63 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/build.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2017 CEA LIST.
#
# 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:
# Maged Elaasar - Initial API and implementation
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/plugin.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/plugin.properties
index d3e66246857..4542937f614 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/plugin.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2017 CEA LIST.
#
# 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:
# Maged Elaasar - Initial API and implementation
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/build.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/build.properties
index e641701332e..755f2ead992 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/build.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2017 CEA LIST.
#
# 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:
# Maged Elaasar - Initial API and implementation
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/plugin.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/plugin.properties
index e57d9090ae4..b52f1bf5262 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/plugin.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2017 CEA LIST.
#
# 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:
# Maged Elaasar - Initial API and implementation
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/messages/messages.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/messages/messages.properties
index 1655cc65954..abbc49c6e2b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/messages/messages.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/messages/messages.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, 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:
# CEA LIST - Initial API and implementation
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/plugin.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/plugin.properties
index d68bcb9feda..92289ff12ce 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/plugin.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2015 CEA LIST.
# 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:
# Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/build.properties b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/build.properties
index d9e8506ac23..145d4e3ffbe 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/build.properties
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2013 CEA LIST.
#
# 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:
# CEA LIST - Initial API and implementation
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/plugin.properties b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/plugin.properties
index bcb6ababc7e..cedfd3bc08a 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/plugin.properties
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2013 CEA LIST.
#
# 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:
# CEA LIST - Initial API and implementation
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/build.properties b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/build.properties
index fe4b4ef10ba..68756d7e437 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/build.properties
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2013 CEA LIST.
#
# 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:
# CEA LIST - Initial API and implementation
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/plugin.properties b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/plugin.properties
index 4c19f4f7619..313fdb73866 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/plugin.properties
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2013, 2014 CEA LIST 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:
# CEA LIST - Initial API and implementation
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/plugin.properties b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/plugin.properties
index d536a86344a..ffbe77856b4 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/plugin.properties
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2013 CEA LIST
# 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:
# Patrick Tessier (CEA LIST) - Initial API and implementation
diff --git a/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/plugin.properties b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/plugin.properties
index 1c31b1d8f36..a60b2873a82 100644
--- a/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/plugin.properties
+++ b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/plugin.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2011, 2016 Atos Origin, Christian W. Damus, 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:
# Vincent Hemery vincent.hemery@atos.net - Initial API and implementation
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/plugin.properties b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/plugin.properties
index 45b04f0585c..63faf0800ec 100644
--- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/plugin.properties
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/plugin.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, 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:
# CEA LIST - Initial API and implementation
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/plugin.properties b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/plugin.properties
index c126279d2bf..926cd0a2fee 100644
--- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/plugin.properties
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/plugin.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, 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:
# CEA LIST - Initial API and implementation
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/plugin.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/plugin.properties
index f8028c40563..0fad8ca85e8 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/plugin.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2017 CEA LIST.
#
# 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:
# Maged Elaasar - Initial API and implementation
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/plugin.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/plugin.properties
index 9b7fde0dcc7..c5ffa30330b 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/plugin.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2008 CEA LIST.
# 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:
# Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/build.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/build.properties
index d180ff99589..5860ea12bec 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/build.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/build.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2009, 2016 Atos Origin, Christian W. Damus, 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:
# Atos Origin - Initial API and implementation
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/plugin.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/plugin.properties
index c730ec1613e..e432ff35f9c 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/plugin.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/plugin.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2009, 2016 Atos Origin, Christian W. Damus, 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:
# Atos Origin - Initial API and implementation
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/messages/messages.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/messages/messages.properties
index 9141463466a..0de1b76bcaf 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/messages/messages.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/messages/messages.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2014, 2016 CEA LIST, Christian W. Damus, 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:
# Gabriel Pascual (ALL4TEC) - Initial API and implementation
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/plugin.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/plugin.properties
index 3f884ef8b4a..f91d01032e6 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/plugin.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/plugin.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2010 CEA LIST.
# 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:
# CEA LIST - initial API and implementation
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/plugin.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/plugin.properties
index af763082677..9bf4eb299fa 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/plugin.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/plugin.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, 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:
# Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/plugin.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/plugin.properties
index 1a84d9a4188..f250b8ab83f 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/plugin.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2010 CEA LIST.
# 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:
# Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/plugin.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/plugin.properties
index 186ccbdc6f3..324ab9fb39d 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/plugin.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2010 CEA LIST.
# 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:
# Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/plugin.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/plugin.properties
index f0ce888eed6..fbc70aba928 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/plugin.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2013 CEA LIST.
#
# 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:
# CEA LIST - Initial API and implementation
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/plugin.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/plugin.properties
index ca815e20086..02dc61d8f64 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/plugin.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/plugin.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2010 CEA LIST.
# 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:
# CEA LIST - initial API and implementation
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/src/org/eclipse/papyrus/infra/services/markerlistener/internal/messages/messages.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/src/org/eclipse/papyrus/infra/services/markerlistener/internal/messages/messages.properties
index d43e01d51e9..2f3a1540ae8 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/src/org/eclipse/papyrus/infra/services/markerlistener/internal/messages/messages.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/src/org/eclipse/papyrus/infra/services/markerlistener/internal/messages/messages.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2014 CEA 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:
# Christian W. Damus (CEA) - Initial API and implementation
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/plugin.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/plugin.properties
index 38c652833f2..22bc0466da1 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/plugin.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/plugin.properties
@@ -3,9 +3,11 @@
# *
# *
# * 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:
# * Emilien Perico emilien.perico@atosorigin.com - Initial API and implementation
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/plugin.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/plugin.properties
index fb34e6b3650..91743205f48 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/plugin.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2008 CEA LIST.
# 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:
# Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/messages.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/messages.properties
index d959edb3970..0039a5c2d12 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/messages.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/messages.properties
@@ -3,9 +3,11 @@
#
#
# 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:
# Vincent Hemery (Atos) vincent.hemery@atos.net - Initial API and implementation
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/plugin.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/plugin.properties
index 7d7a0193a5a..112b9c98701 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/plugin.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2010 CEA LIST.
# 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:
# Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/plugin.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/plugin.properties
index 0b5192a4a4d..00c091dbde7 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/plugin.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/plugin.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2010 CEA LIST.
# 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:
# CEA LIST - initial API and implementation
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/plugin.properties b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/plugin.properties
index 9fc2c71e312..09b49dbb98d 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/plugin.properties
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/plugin.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2010 CEA LIST.
# 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:
# CEA LIST - initial API and implementation
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/build.properties b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/build.properties
index 757ff9098cc..8b5a7955e53 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/build.properties
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/build.properties
@@ -2,9 +2,11 @@
#
#
# 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:
# CEA LIST - Initial API and implementation
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/plugin.properties b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/plugin.properties
index 5fd7db611d3..79134e3db3c 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/plugin.properties
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/plugin.properties
@@ -1,9 +1,11 @@
#
#
# 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:
# CEA LIST - Initial API and implementation
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/build.properties b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/build.properties
index 0078fed2fab..9003df78530 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/build.properties
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/build.properties
@@ -2,9 +2,11 @@
#
#
# 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:
# CEA LIST - Initial API and implementation
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/plugin.properties b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/plugin.properties
index 6cc7c66bc04..170e14c4c8b 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/plugin.properties
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/plugin.properties
@@ -2,9 +2,11 @@
#
#
# 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:
# CEA LIST - Initial API and implementation
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/build.properties b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/build.properties
index 4093c39144a..e1c922ac40c 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/build.properties
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, 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:
# CEA LIST - Initial API and implementation
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/plugin.properties b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/plugin.properties
index 2ea5a972e21..5eff48cc8a9 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/plugin.properties
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/plugin.properties
@@ -1,9 +1,11 @@
#
#
# 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:
# CEA LIST - Initial API and implementation
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/plugin.properties b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/plugin.properties
index 25f1ec0ac97..7cd40c2f146 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/plugin.properties
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/plugin.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, 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:
# CEA LIST - initial API and implementation
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/build.properties b/plugins/infra/types/org.eclipse.papyrus.infra.types/build.properties
index e8eb0aa17b4..f4a521f58b1 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/build.properties
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/build.properties
@@ -2,9 +2,11 @@
#
#
# 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:
# CEA LIST - Initial API and implementation
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/plugin.properties b/plugins/infra/types/org.eclipse.papyrus.infra.types/plugin.properties
index 8c14283d007..428bfbf2661 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/plugin.properties
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/plugin.properties
@@ -2,9 +2,11 @@
#
#
# 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:
# CEA LIST - Initial API and implementation
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.newchild.ui/plugin.properties b/plugins/infra/ui/org.eclipse.papyrus.infra.newchild.ui/plugin.properties
index 9f2294986a7..aeb86f3ed1e 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.newchild.ui/plugin.properties
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.newchild.ui/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2013 CEA LIST
# 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:
# Patrick Tessier (CEA LIST) - Initial API and implementation
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/plugin.properties b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/plugin.properties
index 1bc9dea55df..8fb5aa78ffc 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/plugin.properties
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/plugin.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2011, 2016 Atos Origin, Christian W. Damus, 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:
# Vincent Hemery vincent.hemery@atos.net - Initial API and implementation
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/build.properties b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/build.properties
index 9bd3eff6183..6dfc8fc0f76 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/build.properties
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2016 CEA LIST.
#
# 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:
# Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/plugin.properties b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/plugin.properties
index 97b7b55e47c..2d336b82cfe 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/plugin.properties
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2016 CEA LIST.
#
# 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:
# Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/plugin.properties b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/plugin.properties
index 86c901d6502..e42d072fb91 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/plugin.properties
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2011 Atos Origin.
# 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:
# Arthur Daussy arthur.daussy@atosorigin.com - Initial API and implementation
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/ui/messages.properties b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/ui/messages.properties
index 865f6b7de28..2add796a13a 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/ui/messages.properties
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/ui/messages.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2011, 2014 Atos Origin, CEA, 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:
# Atos Origin - Initial API and implementation
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/plugin.properties b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/plugin.properties
index 50b2681d662..5729862d400 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/plugin.properties
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/plugin.properties
@@ -1,9 +1,11 @@
#
# Copyright (c) 2015, 2015 CEA LIST, Christian W. Damus 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:
# CEA LIST - initial API and implementation
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/preferences/messages.properties b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/preferences/messages.properties
index a34a57ddfbe..296c1a606b3 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/preferences/messages.properties
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/preferences/messages.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2015 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/messages.properties b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/messages.properties
index f1bcd999fe1..e720267854c 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/messages.properties
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/messages.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2015 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/plugin.properties b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/plugin.properties
index d65cd48de42..b180ac0814a 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/plugin.properties
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/plugin.properties
@@ -1,9 +1,11 @@
################################################################################
# Copyright (c) 2008 CEA LIST.
# 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:
# Patrick.tessier (CEA LIST) Patrick.Tessier@cea.fr - initial API and implementation
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/plugin.properties b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/plugin.properties
index a566c99ea30..5b49875b10d 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/plugin.properties
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2010 CEA LIST.
# 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:
# Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - initial API and implementation
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/messages/messages.properties b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/messages/messages.properties
index 426ac6207b6..0f8b685b2c8 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/messages/messages.properties
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/messages/messages.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2010, 2014 CEA LIST 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:
# Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/messages.properties b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/messages.properties
index 128e9ebd588..4d13384b487 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/messages.properties
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/messages.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2008 CEA LIST.
# 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:
# Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/plugin.properties b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/plugin.properties
index 060fb140272..8f128a064a1 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/plugin.properties
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/plugin.properties
@@ -3,9 +3,11 @@
#
#
# 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:
# Laurent Wouters (CEA LIST) laurent.wouters@cea.fr - Initial API and implementation
diff --git a/plugins/sdk/org.eclipse.papyrus.sdk/about.properties b/plugins/sdk/org.eclipse.papyrus.sdk/about.properties
index c11f53b1f78..5f7765f2ade 100644
--- a/plugins/sdk/org.eclipse.papyrus.sdk/about.properties
+++ b/plugins/sdk/org.eclipse.papyrus.sdk/about.properties
@@ -6,9 +6,12 @@
featureText=Papyrus \n\
\n\
-Copyright (c) 2010, 2017 CEA LIST, Atos Origin, LIFL, and others.
+Copyright (c) 2010, 2017 CEA LIST, Atos Origin, LIFL, and others. \n\
+\n\
+All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/ \n\
+\n\
+SPDX-License-Identifier: EPL-2.0 \n\
\n\
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
\n\
Papyrus for UML provides a UML 2 modeling environment that conforms to the OMG specification. Papyrus for UML notably features diagram editors for UML 2 diagrams, rich model editing facilities, and the glue required to integrate with other model-based tools. It also offers a very advanced support of UML profiles that enables users to define UML-based domain-specific modeling languages.To complement the UML profiles support, Papyrus provides very powerful customization mechanisms which can be leveraged to create user-defined Papyrus perspectives and give it the same look andfeel as a native DSL editor. \n\
-Visit http://www.eclipse.org/papyrus
+Please visit http://www.eclipse.org/papyrus
diff --git a/plugins/sdk/org.eclipse.papyrus.sdk/build.properties b/plugins/sdk/org.eclipse.papyrus.sdk/build.properties
index 702f8285c84..c7856424e58 100644
--- a/plugins/sdk/org.eclipse.papyrus.sdk/build.properties
+++ b/plugins/sdk/org.eclipse.papyrus.sdk/build.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2016 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/sdk/org.eclipse.papyrus.sdk/plugin.properties b/plugins/sdk/org.eclipse.papyrus.sdk/plugin.properties
index db92b429622..c68b097147c 100644
--- a/plugins/sdk/org.eclipse.papyrus.sdk/plugin.properties
+++ b/plugins/sdk/org.eclipse.papyrus.sdk/plugin.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2016 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/build.properties b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/build.properties
index 7552a66104b..ab781646d87 100644
--- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/build.properties
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014, 2015 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/plugin.properties b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/plugin.properties
index 81e288c39e8..035aed5061d 100644
--- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/plugin.properties
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/build.properties b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/build.properties
index 5cfa9579cf0..8fbb67f9dd8 100644
--- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/build.properties
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/plugin.properties b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/plugin.properties
index 302ef30eb63..24f0aa801db 100644
--- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/plugin.properties
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/plugin.properties b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/plugin.properties
index 0c882011c99..8ccf3575ac4 100644
--- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/plugin.properties
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014 Christian W. Damus 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:
# Onder Gurcan - Initial API and implementation
diff --git a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/plugin.properties b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/plugin.properties
index 0c697f102e3..e728f9227ff 100644
--- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/plugin.properties
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014 Christian W. Damus 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:
# Onder Gurcan - Initial API and implementation
diff --git a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/build.properties b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/build.properties
index 31c15b846e8..6c8d959a4b7 100644
--- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/build.properties
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2015 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/plugin.properties b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/plugin.properties
index 3ff1edb84b8..3a54acb594a 100644
--- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/plugin.properties
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2015 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/build.properties b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/build.properties
index 5cfa9579cf0..8fbb67f9dd8 100644
--- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/build.properties
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/plugin.properties b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/plugin.properties
index a65abd84a2e..5ae9b53bc2c 100644
--- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/plugin.properties
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.codegen/plugin.properties b/plugins/toolsmiths/org.eclipse.papyrus.codegen/plugin.properties
index c951b54bee9..56e70142a14 100644
--- a/plugins/toolsmiths/org.eclipse.papyrus.codegen/plugin.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.codegen/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2008 CEA LIST.
# 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:
# Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.def/plugin.properties b/plugins/toolsmiths/org.eclipse.papyrus.def/plugin.properties
index 76b9bbd92d7..18ed6e7244a 100644
--- a/plugins/toolsmiths/org.eclipse.papyrus.def/plugin.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2008 CEA LIST.
# 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:
# Patrick Tessier patrick.tessier@cea.fr - Initial API and implementation
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/build.properties b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/build.properties
index 9479db4e30d..57b774070ab 100644
--- a/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/build.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2015 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/plugin.properties b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/plugin.properties
index 4ad522e06de..51e95c03bd3 100644
--- a/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/plugin.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2015 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/plugin.properties b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/plugin.properties
index f1e2732c6fd..cbcb7a9579a 100755
--- a/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/plugin.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/plugin.properties
@@ -3,9 +3,11 @@
#
#
# 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:
# Laurent Wouters (CEA LIST) laurent.wouters@cea.fr - Initial API and implementation
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.dev.types/build.properties b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/build.properties
index 5f460d66db9..82a83d7406c 100644
--- a/plugins/toolsmiths/org.eclipse.papyrus.dev.types/build.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, 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:
# CEA LIST - Initial API and implementation
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.dev.types/plugin.properties b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/plugin.properties
index 99fb4e221d9..5eff2959288 100644
--- a/plugins/toolsmiths/org.eclipse.papyrus.dev.types/plugin.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/plugin.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2010 CEA LIST.
# 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:
# CEA LIST - initial API and implementation
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/plugin.properties b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/plugin.properties
index 3cf88e92752..6eb4edf0452 100644
--- a/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/plugin.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2017 CEA LIST.
# 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:
# Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/plugin.properties b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/plugin.properties
index 3cb5c9b9859..39147a30961 100644
--- a/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/plugin.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2010 CEA LIST.
# 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:
# Patrick Tessier patrick.tessier@cea.fr - Initial API and implementation
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.releng.dev.release/OSGI-INF/l10n/bundle.properties b/plugins/toolsmiths/org.eclipse.papyrus.releng.dev.release/OSGI-INF/l10n/bundle.properties
index ae3c2cce87d..2fdd38e316a 100644
--- a/plugins/toolsmiths/org.eclipse.papyrus.releng.dev.release/OSGI-INF/l10n/bundle.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.dev.release/OSGI-INF/l10n/bundle.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2016 Christian W. Damus 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:
# Christian W. Damus - initial API and implementation
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.releng.main.release/OSGI-INF/l10n/bundle.properties b/plugins/toolsmiths/org.eclipse.papyrus.releng.main.release/OSGI-INF/l10n/bundle.properties
index ae3c2cce87d..2fdd38e316a 100644
--- a/plugins/toolsmiths/org.eclipse.papyrus.releng.main.release/OSGI-INF/l10n/bundle.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.main.release/OSGI-INF/l10n/bundle.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2016 Christian W. Damus 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:
# Christian W. Damus - initial API and implementation
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/OSGI-INF/l10n/bundle.properties b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/OSGI-INF/l10n/bundle.properties
index ac162d244de..77fc706d272 100644
--- a/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/OSGI-INF/l10n/bundle.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/OSGI-INF/l10n/bundle.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2011 Mia-Software.
# 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:
# Nicolas Bros (Mia-Software) - Bug 366567 - [Releng] Tool to update rmaps
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/build.properties b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/build.properties
index 42571d6d439..c8f9809588e 100644
--- a/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/build.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/build.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2011 Mia-Software.
# 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:
# Nicolas Bros (Mia-Software) - initial API and implementation
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/messages.properties b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/messages.properties
index 8708cdc00ed..52ac9606699 100644
--- a/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/messages.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/messages.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2011, 2015 Mia-Software, Christian W. Damus, 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:
# Nicolas Bros (Mia-Software) - Bug 366567 - [Releng] Tool to update rmaps
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/plugin.properties b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/plugin.properties
index f9f930f2903..491e602062e 100644
--- a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/plugin.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2010 CEA LIST.
# 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:
# Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/src/org/eclipse/papyrus/toolsmiths/palette/messages.properties b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/src/org/eclipse/papyrus/toolsmiths/palette/messages.properties
index e41320270a2..f1e6c1c0b87 100644
--- a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/src/org/eclipse/papyrus/toolsmiths/palette/messages.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/src/org/eclipse/papyrus/toolsmiths/palette/messages.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2010 CEA LIST.
#
# 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:
# Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/plugin.properties b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/plugin.properties
index 8816557de30..d4b7ba0dca2 100644
--- a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/plugin.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2015 CEA LIST.
# 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
#
##################################################################################)
diff --git a/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/plugin.properties b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/plugin.properties
index ac94a7f7681..5d393eadfec 100644
--- a/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/plugin.properties
+++ b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2017 CEA LIST.
#
# 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:
# Maged Elaasar - Initial API and implementation
diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/plugin.properties b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/plugin.properties
index cc00daa013e..fd1f793860f 100644
--- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/plugin.properties
+++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/src/org/eclipse/papyrus/uml/decoratormodel/internal/controlmode/messages/messages.properties b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/src/org/eclipse/papyrus/uml/decoratormodel/internal/controlmode/messages/messages.properties
index 3be38781ee8..7e9da3fb804 100644
--- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/src/org/eclipse/papyrus/uml/decoratormodel/internal/controlmode/messages/messages.properties
+++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/src/org/eclipse/papyrus/uml/decoratormodel/internal/controlmode/messages/messages.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/plugin.properties b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/plugin.properties
index cb6129bd7e0..2b3462deaf3 100644
--- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/plugin.properties
+++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2015 CEA LIST.
# 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:
# Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/plugin.properties b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/plugin.properties
index 83598c083f6..3ff39eae6bb 100644
--- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/plugin.properties
+++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/plugin.properties b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/plugin.properties
index f9f6ab9c867..c50664021ad 100644
--- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/plugin.properties
+++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-messages.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-messages.properties
index 837127838fe..5d70eccf663 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-messages.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-messages.properties
@@ -3,9 +3,11 @@
#
#
# 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
#
####################################################################################
# Non generated values :
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/messages.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/messages.properties
index c2e99d42a27..c94a01576a7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/messages.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/messages.properties
@@ -3,9 +3,11 @@
#
#
# 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
#
####################################################################################
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.properties
index ca0269991f2..2a7d131f056 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.properties
@@ -3,9 +3,11 @@
#
#
# 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
#
####################################################################################
pluginName=Papyrus Activity Diagram
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.properties
index cad208d0441..40083647ecf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2008 CEA LIST.
# 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:
# Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - initial API and implementation
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/messages.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/messages.properties
index faaf1815b1c..e573c2db099 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/messages.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/messages.properties
@@ -3,9 +3,11 @@
#
#
# 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
#
####################################################################################
# Notification messages
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/plugin.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/plugin.properties
index e79c255a660..65754bc3a69 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/plugin.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/plugin.properties
@@ -1,8 +1,10 @@
##########################################################################################
# Copyright (c) 2010 Atos Origin . All rights reserved. This program
# and the accompanying materials are made available under the terms of the
-# Eclipse Public License v1.0 which accompanies this distribution, and is
-# available at http://www.eclipse.org/legal/epl-v10.html
+# Eclipse Public License 2.0 which accompanies this distribution, and is
+t https://www.eclipse.org/legal/epl-2.0/
+t
+t SPDX-License-Identifier: EPL-2.0
#
# Contributors: Atos Origin (Initial API and Implementation)
#
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/messages.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/messages.properties
index 2151e8fe3aa..c9d7002ed8b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/messages.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/messages.properties
@@ -2,8 +2,10 @@
# Copyright (c) 2008 Conselleria de Infraestructuras y Transporte, Generalitat
# de la Comunitat Valenciana . All rights reserved. This program
# and the accompanying materials are made available under the terms of the
-# Eclipse Public License v1.0 which accompanies this distribution, and is
-# available at http://www.eclipse.org/legal/epl-v10.html
+# Eclipse Public License 2.0 which accompanies this distribution, and is
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors: Francisco Javier Cano Muñoz (Prodevelop) - initial API implementation
# Emilien Perico (Atos Origin) - add tags for links with keywords
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/plugin.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/plugin.properties
index f3a9141d4e1..4283f8f23fe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/plugin.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/plugin.properties
@@ -2,8 +2,10 @@
# Copyright (c) 2008 Conselleria de Infraestructuras y Transporte, Generalitat
# de la Comunitat Valenciana . All rights reserved. This program
# and the accompanying materials are made available under the terms of the
-# Eclipse Public License v1.0 which accompanies this distribution, and is
-# available at http://www.eclipse.org/legal/epl-v10.html
+# Eclipse Public License 2.0 which accompanies this distribution, and is
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors: Francisco Javier Cano Muñoz (Prodevelop) - initial API implementation
#
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/messages/messages.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/messages/messages.properties
index 6542cfeb463..ff68ed776b1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/messages/messages.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/messages/messages.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2011 CEA LIST.
#
# 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:
# Amine EL KOUHEN (CEA LIST) amine.el_kouhen@cea.fr
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/messages/messages.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/messages/messages.properties
index 64e6f71b9f1..90d5ff32114 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/messages/messages.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/messages/messages.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2011 CEA LIST.
#
# 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:
# Amine EL KOUHEN (CEA LIST/INRIA DaRT) amine.el_kouhen@inria.fr
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.properties
index 3b1893776a3..ea52ae5fc9b 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2010 CEA LIST.
# 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:
# Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - initial API and implementation
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/plugin.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/plugin.properties
index f6d9eb53fed..9bccee432c7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/plugin.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2010 CEA LIST.
# 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:
# Patrick.Tessier@cea.fr - Initial API and implementation
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/plugin.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/plugin.properties
index f7f3e69bc55..577bf9dc4bc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/plugin.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2010 Atos Origin.
# 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:
# Atos Origin - Initial API and Implementation
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.properties
index ecd1050495c..1ae8a6e4a95 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2010 CEA LIST.
# 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:
# Remi Schnekenburger remi.schnekenburger@cea.fr - Initial API and implementation
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.properties
index 06e538cf882..0b8300bc924 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2010 Atos Origin.
# 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:
# Atos Origin - Initial API and implementation
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/plugin.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/plugin.properties
index e4be8a649e9..1f6bc423013 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/plugin.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2008 CEA LIST.
# 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:
# Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - initial API and implementation
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/plugin.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/plugin.properties
index 89802767af3..34fa653d10e 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/plugin.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2017 CEA LIST.
# 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:
# Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/build.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/build.properties
index f1060660d18..0501a4ddbbd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/build.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/build.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2012 CEA LIST.
#
# 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
###############################################################################
bin.includes = .,\
icons/,\
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/messages.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/messages.properties
index 8b59a30c245..e8278cb89ed 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/messages.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/messages.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2012 CEA LIST.
#
# 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
###############################################################################
AbstractTimelineLayoutPolicy_MoveOccurrenceSpecification=Move OccurrenceSpecification
AbstractTimelineLayoutPolicy_UpdateLocationOfTimeElements=Update Location of Time Elements
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/plugin.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/plugin.properties
index 0c2cf005439..347dc4ba10e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/plugin.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/plugin.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2012 CEA LIST.
#
# 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
###############################################################################
pluginName=Papyrus Timing Diagram
providerName=Eclipse Modeling Project
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/plugin.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/plugin.properties
index c43f6e877be..758da5c0c63 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/plugin.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/plugin.properties
@@ -3,9 +3,11 @@
#
#
# 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:
# Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/build.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/build.properties
index 4c91b305b09..189ccdeb0b9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/build.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/build.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2009, 2016 CEA LIST, Christian W. Damus, 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:
# CEA LIST - Initial API and implementation
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/plugin.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/plugin.properties
index ab029d7dd8d..ccc7dd74aff 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/plugin.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/plugin.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2008 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/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/messages/messages.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/messages/messages.properties
index 572f571a181..3fa29d442ec 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/messages/messages.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/messages/messages.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2010, 2017 CEA LIST, Christian W. Damus, 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:
# CEA LIST - Initial API and implementation
diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/build.properties b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/build.properties
index ad0e63002e8..56ec35b5119 100755
--- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/build.properties
+++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/build.properties
@@ -2,9 +2,11 @@
#
#
# 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:
# Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/plugin.properties b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/plugin.properties
index 5790497f8f4..4107fcb3b52 100755
--- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/plugin.properties
+++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/plugin.properties
@@ -2,9 +2,11 @@
#
#
# 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:
# Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/build.properties b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/build.properties
index 7b8ac2c65d6..a46705e26c4 100755
--- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/build.properties
+++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/build.properties
@@ -2,9 +2,11 @@
#
#
# 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:
# Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/plugin.properties b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/plugin.properties
index cf2967c75ce..10981b0977e 100755
--- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/plugin.properties
+++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/plugin.properties
@@ -2,9 +2,11 @@
#
#
# 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:
# Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
diff --git a/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common.blackboxes/build.properties b/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common.blackboxes/build.properties
index 22eb8eb0d7e..96f3a853677 100644
--- a/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common.blackboxes/build.properties
+++ b/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common.blackboxes/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014 CEA LIST.
#
# 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:
# Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
diff --git a/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common.blackboxes/plugin.properties b/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common.blackboxes/plugin.properties
index f23c3dceab8..d1b83a3a11b 100644
--- a/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common.blackboxes/plugin.properties
+++ b/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common.blackboxes/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014 CEA LIST.
#
# 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:
# Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
diff --git a/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common/build.properties b/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common/build.properties
index 190b4c4202a..5bca863e244 100644
--- a/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common/build.properties
+++ b/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014 CEA LIST.
#
# 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:
# Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
diff --git a/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common/plugin.properties b/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common/plugin.properties
index 7557a8990ed..71dd54d50c6 100644
--- a/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common/plugin.properties
+++ b/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014 CEA LIST.
#
# 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:
# Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/plugin.properties b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/plugin.properties
index 28ff1613b21..7b30135f3af 100644
--- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/plugin.properties
+++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/plugin.properties
@@ -3,9 +3,11 @@
#
#
# 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:
# Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/plugin.properties b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/plugin.properties
index 00b355dc978..c111d0c6a6d 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/plugin.properties
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2015 CEA LIST.
# 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:
# Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/plugin.properties b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/plugin.properties
index 724b1bd9f9f..3cb0ae13580 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/plugin.properties
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2015 CEA LIST.
# 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:
# Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/plugin.properties b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/plugin.properties
index 8a72fb9e854..edb0cd41c74 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/plugin.properties
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2015 CEA LIST.
# 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:
# Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.valuespecification/plugin.properties b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.valuespecification/plugin.properties
index 16e85ac4bcb..53c83ff951a 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.valuespecification/plugin.properties
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.valuespecification/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2015 CEA LIST.
# 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:
# Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - initial API and implementation
diff --git a/plugins/uml/org.eclipse.papyrus.uml.commands/plugin.properties b/plugins/uml/org.eclipse.papyrus.uml.commands/plugin.properties
index 07712482b39..1b353ed12d4 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.commands/plugin.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.commands/plugin.properties
@@ -1,9 +1,11 @@
################################################################################
# Copyright (c) 2008 CEA LIST.
# 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:
# Patrick.tessier (CEA LIST) Patrick.Tessier@cea.fr - initial API and implementation
diff --git a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/plugin.properties b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/plugin.properties
index cf4ed2e6ff5..7b2e54823ca 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/plugin.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2010 Atos Origin.
# 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:
# Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - initial API and implementation
diff --git a/plugins/uml/org.eclipse.papyrus.uml.documentation.profile/plugin.properties b/plugins/uml/org.eclipse.papyrus.uml.documentation.profile/plugin.properties
index b02ac5bcfc4..fdfbd25380c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.documentation.profile/plugin.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.documentation.profile/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2010 Atos Origin.
# 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:
# Atos Origin - Initial API and Implementation
diff --git a/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/plugin.properties b/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/plugin.properties
index f03de8beaa3..455e88faf76 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/plugin.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2008 CEA LIST.
# 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:
# Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation
diff --git a/plugins/uml/org.eclipse.papyrus.uml.filters.edit/build.properties b/plugins/uml/org.eclipse.papyrus.uml.filters.edit/build.properties
index 01d94348348..f494aa25156 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.filters.edit/build.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.filters.edit/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/uml/org.eclipse.papyrus.uml.filters.edit/plugin.properties b/plugins/uml/org.eclipse.papyrus.uml.filters.edit/plugin.properties
index 4436d18cb29..9a295549261 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.filters.edit/plugin.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.filters.edit/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/uml/org.eclipse.papyrus.uml.filters/build.properties b/plugins/uml/org.eclipse.papyrus.uml.filters/build.properties
index f0643ff241f..bc3b7fba543 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.filters/build.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.filters/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/uml/org.eclipse.papyrus.uml.filters/plugin.properties b/plugins/uml/org.eclipse.papyrus.uml.filters/plugin.properties
index bc496932944..8463880f3a4 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.filters/plugin.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.filters/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/OSGI-INF/l10n/bundle.properties b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/OSGI-INF/l10n/bundle.properties
index 8db062e7c9b..29472673386 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/OSGI-INF/l10n/bundle.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/OSGI-INF/l10n/bundle.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2015 Christian W. Damus 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:
# Francois Le Fevre (CEA LIST) - Initial API and implementation
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/plugin.properties b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/plugin.properties
index 731b48d02ff..30583413d51 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/plugin.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2015 CEA LIST.
# 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:
# Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
diff --git a/plugins/uml/org.eclipse.papyrus.uml.navigation/plugin.properties b/plugins/uml/org.eclipse.papyrus.uml.navigation/plugin.properties
index 7453715a5c5..373c4a11685 100755
--- a/plugins/uml/org.eclipse.papyrus.uml.navigation/plugin.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.navigation/plugin.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2016 CEA LIST.
# 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:
# CEA LIST - initial API and implementation
diff --git a/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/plugin.properties b/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/plugin.properties
index f07be6216fe..f53398c1dca 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/plugin.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2010 CEA LIST.
# 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:
# Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - initial API and implementation
diff --git a/plugins/uml/org.eclipse.papyrus.uml.perspective/plugin.properties b/plugins/uml/org.eclipse.papyrus.uml.perspective/plugin.properties
index 2a6c262d16d..d767e499aed 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.perspective/plugin.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.perspective/plugin.properties
@@ -2,9 +2,11 @@
#
# Copyright (c) 2010 CEA LIST.
# 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:
# CEA LIST - initial API and implementation
diff --git a/plugins/uml/org.eclipse.papyrus.uml.resourceloading.profile/plugin.properties b/plugins/uml/org.eclipse.papyrus.uml.resourceloading.profile/plugin.properties
index 7f88689d57e..d725c4f601a 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.resourceloading.profile/plugin.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.resourceloading.profile/plugin.properties
@@ -3,9 +3,11 @@
#
#
# 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
#
####################################################################################
pluginName=Papyrus Resource Loading for Profiles
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/plugin.properties b/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/plugin.properties
index e169f270111..2b9dbe4b494 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/plugin.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/plugin.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, 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:
# Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/src/org/eclipse/papyrus/uml/service/types/internal/ui/messages/messages.properties b/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/src/org/eclipse/papyrus/uml/service/types/internal/ui/messages/messages.properties
index b2d8270ec39..2b33e89f158 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/src/org/eclipse/papyrus/uml/service/types/internal/ui/messages/messages.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/src/org/eclipse/papyrus/uml/service/types/internal/ui/messages/messages.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, 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:
# Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/plugin.properties b/plugins/uml/org.eclipse.papyrus.uml.service.types/plugin.properties
index 29e00ef5c4f..4c8c7ecfc3b 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/plugin.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/plugin.properties
@@ -3,9 +3,11 @@
#
#
# 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:
# Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/messages/messages.properties b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/messages/messages.properties
index ebad4a4c18d..da2d224ec0f 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/messages/messages.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/messages/messages.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, 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:
# Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.validation/plugin.properties b/plugins/uml/org.eclipse.papyrus.uml.service.validation/plugin.properties
index f1793b47e4e..ca8c49075e6 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.validation/plugin.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.validation/plugin.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2010 CEA LIST.
# 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:
# CEA LIST - initial API and implementation
diff --git a/plugins/uml/org.eclipse.papyrus.uml.services.decoration/plugin.properties b/plugins/uml/org.eclipse.papyrus.uml.services.decoration/plugin.properties
index 3d6ec307b96..b2ff6f873bf 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.services.decoration/plugin.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.services.decoration/plugin.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2010 CEA LIST.
# 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:
# CEA LIST - initial API and implementation
diff --git a/plugins/uml/org.eclipse.papyrus.uml.templaterepository/plugin.properties b/plugins/uml/org.eclipse.papyrus.uml.templaterepository/plugin.properties
index 8896c6a66e1..1afebf4e2de 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.templaterepository/plugin.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.templaterepository/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2008 CEA LIST.
# 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:
# Patrick Tessier CEA LIST - Initial API and implementation
diff --git a/plugins/uml/org.eclipse.papyrus.uml.types.core/plugin.properties b/plugins/uml/org.eclipse.papyrus.uml.types.core/plugin.properties
index 29078f156c3..24b8fd6ab86 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.types.core/plugin.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2010 CEA LIST.
# 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:
# Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation
diff --git a/plugins/uml/org.eclipse.papyrus.uml.types.ui.properties/plugin.properties b/plugins/uml/org.eclipse.papyrus.uml.types.ui.properties/plugin.properties
index 8a3e2ea46be..37ac3c43b79 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.types.ui.properties/plugin.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.ui.properties/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2010 CEA LIST.
# 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:
# Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation
diff --git a/plugins/uml/org.eclipse.papyrus.uml.ui/build.properties b/plugins/uml/org.eclipse.papyrus.uml.ui/build.properties
index 03bcf4ac867..0796a222584 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.ui/build.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.ui/build.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2016 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/uml/org.eclipse.papyrus.uml.ui/plugin.properties b/plugins/uml/org.eclipse.papyrus.uml.ui/plugin.properties
index 44260ac7a3b..e7997e81efb 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.ui/plugin.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.ui/plugin.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2016 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.documentation/build.properties b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.documentation/build.properties
index 59dc03ad7f2..eee6b4b4ed8 100644
--- a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.documentation/build.properties
+++ b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.documentation/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 201, 2015 Cedric Dumoulin, Christian W. Damus, 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:
# Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
diff --git a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.documentation/plugin.properties b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.documentation/plugin.properties
index 833c8e70fe8..483583f1e72 100644
--- a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.documentation/plugin.properties
+++ b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.documentation/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2013 CEA LIST.
# 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:
# Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
diff --git a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/plugin.properties b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/plugin.properties
index 3943138523c..369531e18cb 100644
--- a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/plugin.properties
+++ b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2013 CEA LIST.
# 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:
# Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/plugin.properties b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/plugin.properties
index be883c9437d..de9278c718f 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/plugin.properties
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2015 CEA LIST.
# 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
#
##################################################################################
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/plugin.properties b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/plugin.properties
index d62b28409d4..5fdecd4f870 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/plugin.properties
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2010 CEA LIST.
# 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:
# Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - initial API and implementation
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/plugin.properties b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/plugin.properties
index 058cf2dbe87..e50040f7810 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/plugin.properties
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2010 CEA LIST.
# 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:
# Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - initial API and implementation
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/plugin.properties b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/plugin.properties
index 85354825d5d..fd633296b49 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/plugin.properties
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2010 CEA LIST.
# 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:
# Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/plugin.properties b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/plugin.properties
index e206a869d91..b15749e1913 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/plugin.properties
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2010 CEA LIST.
# 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:
# Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/plugin.properties b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/plugin.properties
index 8a68750fd28..c08a3310f5d 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/plugin.properties
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2010 CEA LIST.
# 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:
# Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/plugin.properties b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/plugin.properties
index 99d7d2f6655..1f9bdc3726a 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/plugin.properties
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2010 CEA LIST.
# 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:
# CEA LIST - initial API and implementation
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/plugin.properties b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/plugin.properties
index 64429bbca31..24183c47522 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/plugin.properties
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2010 CEA LIST.
# 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:
# Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/plugin.properties b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/plugin.properties
index 4879a451080..37166130f78 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/plugin.properties
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2010 CEA LIST.
# 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:
# Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/plugin.properties b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/plugin.properties
index e2abeba82b9..8e11fe83c60 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/plugin.properties
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2010 CEA LIST.
# 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:
# Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/plugin.properties b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/plugin.properties
index 38b75ff15a0..aa74bc1e3be 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/plugin.properties
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2010 CEA LIST.
# 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:
# Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/plugin.properties b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/plugin.properties
index 5b59121415c..0c13084669b 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/plugin.properties
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2010 CEA LIST.
# 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:
# Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/plugin.properties b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/plugin.properties
index 692d47a60ec..9b58eec392c 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/plugin.properties
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2010 CEA LIST.
# 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:
# Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/plugin.properties b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/plugin.properties
index e6634196e35..ca35a4f28c9 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/plugin.properties
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2010 CEA LIST.
# 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:
# Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/plugin.properties b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/plugin.properties
index e9545cb7eb9..8eefe8072e3 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/plugin.properties
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2010 CEA LIST.
# 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:
# Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/plugin.properties b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/plugin.properties
index 668bc5af7c7..b640f2e7c9c 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/plugin.properties
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2010 CEA LIST.
# 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:
# Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/plugin.properties b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/plugin.properties
index f13da2f91c5..8efba481d12 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/plugin.properties
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2010 CEA LIST.
# 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:
# Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/plugin.properties b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/plugin.properties
index 9b53717031e..56c4b8e15ac 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/plugin.properties
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2015 CEA LIST.
# 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:
# Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - initial API and implementation
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/plugin.properties b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/plugin.properties
index 12b0b071d44..bee42141259 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/plugin.properties
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2015 CEA LIST.
# 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:
# Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - initial API and implementation
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/plugin.properties b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/plugin.properties
index d7c84072ffa..96441dc8067 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/plugin.properties
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2015 CEA LIST.
# 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:
# Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - initial API and implementation
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/plugin.properties b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/plugin.properties
index 8f7c4f252a2..e2ca070903b 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/plugin.properties
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/plugin.properties
@@ -1,9 +1,11 @@
################################################################################
# Copyright (c) 2008 CEA LIST.
# 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:
# Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/plugin.properties b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/plugin.properties
index c0ddb4180e8..b617d132232 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/plugin.properties
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2015 CEA LIST.
# 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:
# Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
diff --git a/plugins/views/documentation/org.eclipse.papyrus.views.documentation/plugin.properties b/plugins/views/documentation/org.eclipse.papyrus.views.documentation/plugin.properties
index 7ef10319470..3695aaaa32d 100644
--- a/plugins/views/documentation/org.eclipse.papyrus.views.documentation/plugin.properties
+++ b/plugins/views/documentation/org.eclipse.papyrus.views.documentation/plugin.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, 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:
# Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/plugin.properties b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/plugin.properties
index 17626e54816..c5512aff158 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/plugin.properties
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2013 CEA LIST
# 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:
# Patrick Tessier (CEA LIST) - Initial API and implementation
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/plugin.properties b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/plugin.properties
index 60b466fe37a..d0a581f5612 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/plugin.properties
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/plugin.properties
@@ -3,9 +3,11 @@
#
#
# 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:
# Vincent Hemery (Atos) vincent.hemery@atos.net - Initial API and implementation
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/src/org/eclipse/papyrus/views/modelexplorer/resourceloading/handler/messages.properties b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/src/org/eclipse/papyrus/views/modelexplorer/resourceloading/handler/messages.properties
index fef41c18d22..2780aecc948 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/src/org/eclipse/papyrus/views/modelexplorer/resourceloading/handler/messages.properties
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/src/org/eclipse/papyrus/views/modelexplorer/resourceloading/handler/messages.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2014 CEA LIST 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:
# CEA LIST - Initial API and implementation
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/plugin.properties b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/plugin.properties
index b71cad834ad..ce86312cce1 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/plugin.properties
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/plugin.properties
@@ -3,9 +3,11 @@
#
#
# 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:
# Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/messages.properties b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/messages.properties
index 4fa55659680..df403bcc63c 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/messages.properties
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/messages.properties
@@ -4,9 +4,11 @@
#
#
# 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:
# Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/plugin.properties b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/plugin.properties
index c8f09daf30b..57f1daf4f2e 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/plugin.properties
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2015 CEA LIST.
# 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:
# Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/plugin.properties b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/plugin.properties
index b362066cb46..bc95b0b125c 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/plugin.properties
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2015 CEA LIST.
# 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:
# Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/messages/messages.properties b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/messages/messages.properties
index 5e5145ee20e..bdc5b473bf5 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/messages/messages.properties
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/src/org/eclipse/papyrus/views/properties/toolsmiths/messages/messages.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2011, 2013 CEA LIST.
#
# 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:
# CEA LIST - Initial API and implementation
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/plugin.properties b/plugins/views/properties/org.eclipse.papyrus.views.properties/plugin.properties
index 82a5bb9804e..e3d0c9f068f 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties/plugin.properties
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/plugin.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, 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:
# CEA LIST - Initial API and implementation
diff --git a/plugins/views/references/org.eclipse.papyrus.views.references/plugin.properties b/plugins/views/references/org.eclipse.papyrus.views.references/plugin.properties
index af5c6949a3f..7e6460f2d4d 100644
--- a/plugins/views/references/org.eclipse.papyrus.views.references/plugin.properties
+++ b/plugins/views/references/org.eclipse.papyrus.views.references/plugin.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, 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:
# Fanch Bonnabesse - bug 489141
diff --git a/plugins/views/validation/org.eclipse.papyrus.views.validation/plugin.properties b/plugins/views/validation/org.eclipse.papyrus.views.validation/plugin.properties
index 6809c7f9edf..17db1ff0aca 100644
--- a/plugins/views/validation/org.eclipse.papyrus.views.validation/plugin.properties
+++ b/plugins/views/validation/org.eclipse.papyrus.views.validation/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2013 CEA LIST.
#
# 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:
# CEA LIST - Initial API and implementation
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.properties b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.properties
index 16dcbefbb92..bab92a402c0 100755
--- a/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.properties
+++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.properties
@@ -31,4 +31,4 @@ which accompanies this distribution, and is available at\n\
https://www.eclipse.org/legal/epl-2.0/\n\
\n\
SPDX-License-Identifier: EPL-2.0\n
-################ end of copyright property ####################################
+################ end of copyright property #################################### \ No newline at end of file
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/plugin.properties b/releng/rcp/org.eclipse.papyrus.rcp/plugin.properties
index 9bc72f02d6b..545d20b875b 100644
--- a/releng/rcp/org.eclipse.papyrus.rcp/plugin.properties
+++ b/releng/rcp/org.eclipse.papyrus.rcp/plugin.properties
@@ -1,9 +1,11 @@
################################################################################
# Copyright (c) 2008 CEA LIST.
# 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:
# CEA LIST - initial API and implementation
diff --git a/tests/junit/framework/org.eclipse.papyrus.bundles.tests/plugin.properties b/tests/junit/framework/org.eclipse.papyrus.bundles.tests/plugin.properties
index 0b6ef86997c..997c0520de9 100644
--- a/tests/junit/framework/org.eclipse.papyrus.bundles.tests/plugin.properties
+++ b/tests/junit/framework/org.eclipse.papyrus.bundles.tests/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2015 CEA LIST.
# 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:
# Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
diff --git a/tests/junit/framework/org.eclipse.papyrus.junit.utils/plugin.properties b/tests/junit/framework/org.eclipse.papyrus.junit.utils/plugin.properties
index 57cdbe5fa4b..03800057368 100644
--- a/tests/junit/framework/org.eclipse.papyrus.junit.utils/plugin.properties
+++ b/tests/junit/framework/org.eclipse.papyrus.junit.utils/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2015 CEA LIST.
# 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:
# Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
diff --git a/tests/junit/plugins/bundlestests/org.eclipse.papyrus.developer.suite.tests/plugin.properties b/tests/junit/plugins/bundlestests/org.eclipse.papyrus.developer.suite.tests/plugin.properties
index 5375243083c..9a57cebac68 100755
--- a/tests/junit/plugins/bundlestests/org.eclipse.papyrus.developer.suite.tests/plugin.properties
+++ b/tests/junit/plugins/bundlestests/org.eclipse.papyrus.developer.suite.tests/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2008 CEA LIST.
# 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:
# Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation
diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/build.properties b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/build.properties
index 74ebb5f9be9..473a29477d8 100644
--- a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/build.properties
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/build.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2016 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.editors.suite.tests/plugin.properties b/tests/junit/plugins/editor/org.eclipse.papyrus.editors.suite.tests/plugin.properties
index 212281e61e6..90f6e5ed3da 100755
--- a/tests/junit/plugins/editor/org.eclipse.papyrus.editors.suite.tests/plugin.properties
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editors.suite.tests/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2008 CEA LIST.
# 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:
# Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation
diff --git a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/build.properties b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/build.properties
index f4bd95dd18e..d730540d8fe 100644
--- a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/build.properties
+++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/build.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2015, 2016 CEA LIST, Christian W. Damus, 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:
# CEA List - Initial API and implementation
diff --git a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/plugin.properties b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/plugin.properties
index 71c09758d64..dea2a6c0ed2 100644
--- a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/plugin.properties
+++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2010 CEA LIST.
# 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:
# Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation
diff --git a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/plugin.properties b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/plugin.properties
index 66285944234..abbe53e7167 100755
--- a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/plugin.properties
+++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2008 CEA LIST.
# 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:
# Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation
diff --git a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/plugin.properties b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/plugin.properties
index d2860c1b07d..82077cce0e1 100644
--- a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/plugin.properties
+++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2008 CEA LIST.
# 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:
# Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - initial API and implementation
diff --git a/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/build.properties b/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/build.properties
index e1b37ed7f55..7e065be888f 100644
--- a/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/build.properties
+++ b/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/build.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2015 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/plugin.properties b/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/plugin.properties
index 30b4ec2c90e..e9a111e097e 100644
--- a/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/plugin.properties
+++ b/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/plugin.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2015 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf.tests/build.properties b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf.tests/build.properties
index 3358cbf10bb..f960eca4b44 100644
--- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf.tests/build.properties
+++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf.tests/build.properties
@@ -1,9 +1,11 @@
#
# Copyright (c) 2016 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf.tests/plugin.properties b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf.tests/plugin.properties
index 1e97c1c0b92..2f88db31265 100644
--- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf.tests/plugin.properties
+++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf.tests/plugin.properties
@@ -1,9 +1,11 @@
#
# Copyright (c) 2016 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/build.properties b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/build.properties
index 6a342ac18dc..0357e9b09c4 100644
--- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/build.properties
+++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014, 2016 CEA, Christian W. Damus, 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:
# Christian W. Damus (CEA) - Initial API and implementation
diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/plugin.properties b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/plugin.properties
index fbac3436f5d..e5ec0aa7db7 100644
--- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/plugin.properties
+++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2014 CEA 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:
# Christian W. Damus (CEA) - Initial API and implementation
diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/fragment.properties b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/fragment.properties
index 81b6a3aa629..70e78dc28c1 100644
--- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/fragment.properties
+++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/fragment.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2012 Cedric Dumoulin.
# 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:
# Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/build.properties b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/build.properties
index c45e8466334..5146d245f69 100644
--- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/build.properties
+++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2016 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/plugin.properties b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/plugin.properties
index 2acc6750200..5d6afa22f64 100644
--- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/plugin.properties
+++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2016 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/build.properties b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/build.properties
index 75b6ccab3bf..a16848e1591 100644
--- a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/build.properties
+++ b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014, 2015 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/plugin.properties b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/plugin.properties
index ae577a19990..5f6f203bc7d 100644
--- a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/plugin.properties
+++ b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/plugin.properties b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/plugin.properties
index 283aea4c789..3445f6c4158 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/plugin.properties
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2008, 2015 CEA LIST, Christian W. Damus, 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:
# Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - initial API and implementation
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/plugin.properties b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/plugin.properties
index b370be84c3e..c5cda245b07 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/plugin.properties
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2014 CEA 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:
#
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/plugin.properties b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/plugin.properties
index 7d566c9e214..3501c04d9ec 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/plugin.properties
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2014 CEA 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:
#
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/build.properties b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/build.properties
index 5aca3778957..98b151e7be9 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/build.properties
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/build.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2015 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/plugin.properties b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/plugin.properties
index 75955d5253e..25b6e4551e1 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/plugin.properties
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/plugin.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2015 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/plugin.properties b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/plugin.properties
index 0c6f3ed69f6..702d6af82b7 100755
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/plugin.properties
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2008 CEA LIST.
# 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:
# Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation
diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.architecture.tests/plugin.properties b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.architecture.tests/plugin.properties
index 03ecd6b05de..86d5bb898e7 100644
--- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.architecture.tests/plugin.properties
+++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.architecture.tests/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2018 CEA LIST 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:
# Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - Initial API and implementation
diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests/build.properties b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests/build.properties
index 1816fdd67c1..e0b7f2cb59e 100644
--- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests/build.properties
+++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests/plugin.properties b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests/plugin.properties
index aaf84674c23..d3bb34b4c57 100644
--- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests/plugin.properties
+++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.newchild.tests/build.properties b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.newchild.tests/build.properties
index 3690933a555..f6351421a7d 100644
--- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.newchild.tests/build.properties
+++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.newchild.tests/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014 Christian W. Damus 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:
# Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation
diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.newchild.tests/plugin.properties b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.newchild.tests/plugin.properties
index 6ca01531e26..c213158da34 100644
--- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.newchild.tests/plugin.properties
+++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.newchild.tests/plugin.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014 Christian W. Damus 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:
# Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation
diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/plugin.properties b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/plugin.properties
index aeddeca0fe0..4cdd76868c3 100755
--- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/plugin.properties
+++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2008 CEA LIST.
# 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:
# Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation
diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/build.properties b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/build.properties
index 45e33b593cc..7644aa6cf1d 100644
--- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/build.properties
+++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014 CEA LIST.
#
# 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:
# CEA LIST - Initial API and implementation
diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/build.properties b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/build.properties
index 45e33b593cc..7644aa6cf1d 100644
--- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/build.properties
+++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2014 CEA LIST.
#
# 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:
# CEA LIST - Initial API and implementation
diff --git a/tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/build.properties b/tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/build.properties
index 8942d6678cf..79a97aa75bd 100644
--- a/tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/build.properties
+++ b/tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/build.properties
@@ -1,9 +1,11 @@
# Copyright (c) 2016 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/plugin.properties b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/plugin.properties
index 032b0877eeb..308051871ab 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/plugin.properties
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/plugin.properties
@@ -1,9 +1,11 @@
#################################################################################
# Copyright (c) 2011 CEA LIST.
# 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:
#
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui.tests/plugin.properties b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui.tests/plugin.properties
index 2c105399ef5..a3f034a8022 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui.tests/plugin.properties
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui.tests/plugin.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, 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:
#
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/plugin.properties b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/plugin.properties
index 73ad7eb097f..8eac14b1994 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/plugin.properties
+++ b/tests