Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Constant2018-09-07 04:57:41 -0400
committerOlivier Constant2018-09-07 10:27:43 -0400
commit7b0d16d99b5a230af0e14d2d15766faeb2dc482c (patch)
tree6da33ae5cad3796ff24c67eb957bb308370923b5
parent306529ac44c8e6fc0398de8048d2f7865c2b253e (diff)
downloadorg.eclipse.emf.diffmerge.patch-7b0d16d99b5a230af0e14d2d15766faeb2dc482c.tar.gz
org.eclipse.emf.diffmerge.patch-7b0d16d99b5a230af0e14d2d15766faeb2dc482c.tar.xz
org.eclipse.emf.diffmerge.patch-7b0d16d99b5a230af0e14d2d15766faeb2dc482c.zip
Bug 535213 - Switch to EPL-2.0
Change-Id: Iaff61bc806c4918e58f96ce865d69940cfb3cf78 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
-rw-r--r--LICENSE.txt299
-rw-r--r--NOTICE.txt6
-rw-r--r--examples/org.eclipse.emf.diffmerge.patch.examples.cps/demo_corrected.cyberphysicalsystem11
-rw-r--r--examples/org.eclipse.emf.diffmerge.patch.examples.cps/demo_modified.cyberphysicalsystem11
-rw-r--r--examples/org.eclipse.emf.diffmerge.patch.examples.cps/demo_original.cyberphysicalsystem11
-rw-r--r--examples/org.eclipse.emf.diffmerge.patch.examples/META-INF/MANIFEST.MF1
-rw-r--r--examples/org.eclipse.emf.diffmerge.patch.examples/about.html26
-rw-r--r--examples/org.eclipse.emf.diffmerge.patch.examples/build.properties9
-rw-r--r--examples/org.eclipse.emf.diffmerge.patch.examples/plugin.properties9
-rw-r--r--examples/org.eclipse.emf.diffmerge.patch.examples/plugin.xml11
-rw-r--r--examples/org.eclipse.emf.diffmerge.patch.examples/pom.xml11
-rw-r--r--features/org.eclipse.emf.diffmerge.patch.feature.dependencies/build.properties12
-rw-r--r--features/org.eclipse.emf.diffmerge.patch.feature.dependencies/epl-v10.html328
-rw-r--r--features/org.eclipse.emf.diffmerge.patch.feature.dependencies/epl-v20.html300
-rw-r--r--features/org.eclipse.emf.diffmerge.patch.feature.dependencies/feature.properties174
-rw-r--r--features/org.eclipse.emf.diffmerge.patch.feature.dependencies/feature.xml31
-rw-r--r--features/org.eclipse.emf.diffmerge.patch.feature.dependencies/license.html275
-rw-r--r--features/org.eclipse.emf.diffmerge.patch.feature.dependencies/pom.xml11
-rw-r--r--features/org.eclipse.emf.diffmerge.patch.feature/build.properties12
-rw-r--r--features/org.eclipse.emf.diffmerge.patch.feature/epl-v10.html328
-rw-r--r--features/org.eclipse.emf.diffmerge.patch.feature/epl-v20.html300
-rw-r--r--features/org.eclipse.emf.diffmerge.patch.feature/feature.properties173
-rw-r--r--features/org.eclipse.emf.diffmerge.patch.feature/feature.xml31
-rw-r--r--features/org.eclipse.emf.diffmerge.patch.feature/license.html275
-rw-r--r--features/org.eclipse.emf.diffmerge.patch.feature/pom.xml11
-rw-r--r--features/org.eclipse.emf.diffmerge.patch.runtime.feature/build.properties12
-rw-r--r--features/org.eclipse.emf.diffmerge.patch.runtime.feature/epl-v10.html328
-rw-r--r--features/org.eclipse.emf.diffmerge.patch.runtime.feature/epl-v20.html300
-rw-r--r--features/org.eclipse.emf.diffmerge.patch.runtime.feature/feature.properties173
-rw-r--r--features/org.eclipse.emf.diffmerge.patch.runtime.feature/feature.xml31
-rw-r--r--features/org.eclipse.emf.diffmerge.patch.runtime.feature/license.html275
-rw-r--r--features/org.eclipse.emf.diffmerge.patch.runtime.feature/pom.xml11
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/build.properties9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/plugin.properties9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/pom.xml11
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/EMFModelPatchPersister.xtend9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/EMFModelPatchSerializer.xtend9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EAttributeEntry.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EChangeDirection.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EElementEntry.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EIdentifiable.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatch.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchEMFMetadata.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchElement.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchEntry.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchFactory.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchMetadata.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchPackage.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EReferenceEntry.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EStructuralFeatureEntry.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EAttributeEntryImpl.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EElementEntryImpl.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EIdentifiableImpl.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchEMFMetadataImpl.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchElementImpl.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchEntryImpl.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchFactoryImpl.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchImpl.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchMetadataImpl.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchPackageImpl.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EReferenceEntryImpl.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EStructuralFeatureEntryImpl.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/util/EModelPatchAdapterFactory.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/util/EModelPatchSwitch.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/transform/EModelPatchToPOJO.xtend9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/transform/ModelPatchToEMF.xtend9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.json/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.json/build.properties9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.json/plugin.properties9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.json/pom.xml11
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.json/src/org/eclipse/emf/diffmerge/patch/serializer/gson/GsonModelPatchSerializer.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.json/src/org/eclipse/emf/diffmerge/patch/serializer/gson/typeadapters/AbstractSubclassAdapter.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/about.html26
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/build.properties9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/plugin.properties9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/pom.xml11
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/EMFModelPatchApplier.xtend9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/EMFModelPatchMetadata.xtend9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/EMFPatchApplication.xtend9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/ModelPatchRecorder.xtend9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/BaseIndexEObjectLocator.xtend9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/EMFIdentifierProvider.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/EObjectIdentifierProvider.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/EObjectLocator.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/IDAttributeBasedEObjectIdentifierProvider.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/IdentifiedEMFObjectLocator.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/TreeIteratorEObjectLocator.xtend9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/AbstractEMFModleAccess.xtend9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/EMFModelAccess.xtend9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/ModelAccessProvider.xtend9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/ModelAccessTypes.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/SimpleReflectiveEMFModelAccess.xtend9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/ViatraModelAccess.xtend9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/about.html26
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/build.properties9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/plugin.properties9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/plugin.xml11
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/pom.xml11
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/ModelPatchUIPlugin.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/dialogs/ModelpatchEntryFilterCreationDialog.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/dialogs/ModelpatchViewerDialog.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/dialogs/PluginID.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/editors/ModelPatchEditorPart.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/handlers/ComparisonSelectionUtil.xtend9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/handlers/ModelpatchApplicationHandler.xtend9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/handlers/ModelpatchGenerationHandler.xtend9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/preferences/ModelPatchPreferencePage.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/preferences/ModelPatchPreferenceProvider.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/DefaultEntryLabelProvider.xtend9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/DescriptiveEntryLabelProvider.xtend9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/DialogFactory.xtend9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/EntryPropertyWrapper.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/IEntryLabelProvider.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/IdentifiableWrapper.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/IdentifiableWrapperFactory.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchContentProvider.xtend9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchEntryFilterContentProvider.xtend9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchEntryFilterLabelProvider.xtend9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchEntryHelper.xtend9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchLabelProvider.xtend9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelpatchApplicationDTO.xtend9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/PersistenceTypes.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/SerializerProvider.xtend9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/ModelpatchApplicationWizard.xtend9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchEDMWizardPage.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchFilteringWizardPage.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchLoadingPatchWizardPage.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchResultWizardPage.java10
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/wb/swt/SWTResourceManager.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/about.html26
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/build.properties9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/plugin.properties9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/pom.xml11
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/AbstractModelPatchEntry.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/AttributeEntry.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/ElementEntry.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/ReferenceEntry.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/StructuralFeatureEntry.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/BaseModelPatchMetadata.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ChangeDirection.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ComplexMPEFilterType.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/EntryType.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/IModelPatchEntryFilter.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/Identifiable.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatch.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchBuilder.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchDiagnosticElement.xtend9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchEntry.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchEntryBuilder.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchEntryProperty.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchException.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchFilterApplier.xtend9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchMetadata.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchReverser.xtend9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/PatchApplication.xtend9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/PatchApplicationDiagnostic.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/filters/ComplexEntryFilter.xtend9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/filters/EntryDirectionFilter.xtend9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/filters/EntryPropertyFilter.xtend9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/filters/EntryTypeFilter.xtend9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/persistence/ModelPatchPersister.xtend9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/serializer/IModelPatchSerializer.java9
-rw-r--r--releng/org.eclipse.emf.diffmerge.patch.parent/header.epl.txt9
-rw-r--r--releng/org.eclipse.emf.diffmerge.patch.parent/pom.xml21
-rw-r--r--releng/org.eclipse.emf.diffmerge.patch.product/pom.xml11
-rw-r--r--releng/org.eclipse.emf.diffmerge.patch.target/pom.xml11
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.all/META-INF/MANIFEST.MF1
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.all/about.html26
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.all/build.properties9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.all/plugin.properties9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.all/src/org/eclipse/emf/diffmerge/patch/tests/all/RunAllTestSuite.xtend9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/META-INF/MANIFEST.MF1
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/about.html26
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/build.properties9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo2_modified.cyberphysicalsystem11
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo2_original.cyberphysicalsystem11
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_modified.cyberphysicalsystem11
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_original.cyberphysicalsystem11
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withExtraContainmentTree.cyberphysicalsystem11
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withExtraContainmentTreeAndReferenceFromOut.cyberphysicalsystem11
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withExtraContainmentTreeAndReferenceToOut.cyberphysicalsystem11
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withModifiedRefWhichHasEOpposite.cyberphysicalsystem11
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/plugin.properties9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/pom.xml11
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/CPSModelPatchApplierTest.xtend9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/CPSModelPatchTest.xtend9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/EMFDiffMergeTest.xtend9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/EMFModelAccessTest.xtend9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/EMFModelPatchMetadataTest.xtend9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchApplierSmokeTests.xtend9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchEmfTestSuite.xtend9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchExporterTest.xtend9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchRecorderTest.xtend9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchScalerTest.java9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/identifier/EMFIdentifierProviderTest.java9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/identifier/IdentifiedEMFObjectLocatorTest.java9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/identifier/IdentifierTestSuite.java9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.performance/META-INF/MANIFEST.MF1
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.performance/about.html26
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.performance/build.properties9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.performance/plugin.properties9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.performance/pom.xml11
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.performance/src/org/eclipse/emf/diffmerge/patch/tests/performance/CpsModelLoader.java9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.performance/src/org/eclipse/emf/diffmerge/patch/tests/performance/ModelPatchPerformanceTests.xtend9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/META-INF/MANIFEST.MF1
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/about.html26
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/build.properties9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/plugin.properties9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/pom.xml11
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/BaseModelPatchPersistenceEMFTest.java9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/ModelPatchPersistenceEMFTest.java9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/ModelPatchPersistenceEMFTestSuite.xtend9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/ModelPatchSerializerEMFTest.xtend9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/META-INF/MANIFEST.MF1
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/about.html26
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/build.properties9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/plugin.properties9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/pom.xml11
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/src/org/eclipse/emf/diffmerge/patch/tests/persistence/json/ModelPatchPersistenceJsonTest.java9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/src/org/eclipse/emf/diffmerge/patch/tests/persistence/json/ModelPatchPersistenceJsonTestSuite.xtend9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.ui/pom.xml11
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests/META-INF/MANIFEST.MF1
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests/about.html26
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests/build.properties9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests/plugin.properties9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests/pom.xml11
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/BasicReverseModelPatchTests.xtend9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/ComplexReverseModelPatchTest.xtend9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/ModelPatchFilterTest.xtend9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/ModelPatchTestSuite.xtend9
234 files changed, 3421 insertions, 2315 deletions
diff --git a/LICENSE.txt b/LICENSE.txt
index f61d34d..e23ece2 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,88 +1,277 @@
-Eclipse Public License - v 1.0
+Eclipse Public License - v 2.0
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+ PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
+ OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
1. DEFINITIONS
"Contribution" means:
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+ a) in the case of the initial Contributor, the initial content
+ Distributed under this Agreement, and
+
+ b) in the case of each subsequent Contributor:
+ i) changes to the Program, and
+ ii) additions to the Program;
+ where such changes and/or additions to the Program originate from
+ and are Distributed by that particular Contributor. A Contribution
+ "originates" from a Contributor if it was added to the Program by
+ such Contributor itself or anyone acting on such Contributor's behalf.
+ Contributions do not include changes or additions to the Program that
+ are not Modified Works.
+
+"Contributor" means any person or entity that Distributes the Program.
+
+"Licensed Patents" mean patent claims licensable by a Contributor which
+are necessarily infringed by the use or sale of its Contribution alone
+or when combined with the Program.
+
+"Program" means the Contributions Distributed in accordance with this
+Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement
+or any Secondary License (as applicable), including Contributors.
+
+"Derivative Works" shall mean any work, whether in Source Code or other
+form, that is based on (or derived from) the Program and for which the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship.
+
+"Modified Works" shall mean any work in Source Code or other form that
+results from an addition to, deletion from, or modification of the
+contents of the Program, including, for purposes of clarity any new file
+in Source Code form that contains any contents of the Program. Modified
+Works shall not include works that contain only declarations,
+interfaces, types, classes, structures, or files of the Program solely
+in each case in order to link to, bind by name, or subclass the Program
+or Modified Works thereof.
+
+"Distribute" means the acts of a) distributing or b) making available
+in any manner that enables the transfer of a copy.
+
+"Source Code" means the form of a Program preferred for making
+modifications, including but not limited to software source code,
+documentation source, and configuration files.
+
+"Secondary License" means either the GNU General Public License,
+Version 2.0, or any later versions of that license, including any
+exceptions or additional permissions as identified by the initial
+Contributor.
2. GRANT OF RIGHTS
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+ a) Subject to the terms of this Agreement, each Contributor hereby
+ grants Recipient a non-exclusive, worldwide, royalty-free copyright
+ license to reproduce, prepare Derivative Works of, publicly display,
+ publicly perform, Distribute and sublicense the Contribution of such
+ Contributor, if any, and such Derivative Works.
+
+ b) Subject to the terms of this Agreement, each Contributor hereby
+ grants Recipient a non-exclusive, worldwide, royalty-free patent
+ license under Licensed Patents to make, use, sell, offer to sell,
+ import and otherwise transfer the Contribution of such Contributor,
+ if any, in Source Code or other form. This patent license shall
+ apply to the combination of the Contribution and the Program if, at
+ the time the Contribution is added by the Contributor, such addition
+ of the Contribution causes such combination to be covered by the
+ Licensed Patents. The patent license shall not apply to any other
+ combinations which include the Contribution. No hardware per se is
+ licensed hereunder.
+
+ c) Recipient understands that although each Contributor grants the
+ licenses to its Contributions set forth herein, no assurances are
+ provided by any Contributor that the Program does not infringe the
+ patent or other intellectual property rights of any other entity.
+ Each Contributor disclaims any liability to Recipient for claims
+ brought by any other entity based on infringement of intellectual
+ property rights or otherwise. As a condition to exercising the
+ rights and licenses granted hereunder, each Recipient hereby
+ assumes sole responsibility to secure any other intellectual
+ property rights needed, if any. For example, if a third party
+ patent license is required to allow Recipient to Distribute the
+ Program, it is Recipient's responsibility to acquire that license
+ before distributing the Program.
+
+ d) Each Contributor represents that to its knowledge it has
+ sufficient copyright rights in its Contribution, if any, to grant
+ the copyright license set forth in this Agreement.
+
+ e) Notwithstanding the terms of any Secondary License, no
+ Contributor makes additional grants to any Recipient (other than
+ those set forth in this Agreement) as a result of such Recipient's
+ receipt of the Program under the terms of a Secondary License
+ (if permitted under the terms of Section 3).
3. REQUIREMENTS
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
+3.1 If a Contributor Distributes the Program in any form, then:
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+ a) the Program must also be made available as Source Code, in
+ accordance with section 3.2, and the Contributor must accompany
+ the Program with a statement that the Source Code for the Program
+ is available under this Agreement, and informs Recipients how to
+ obtain it in a reasonable manner on or through a medium customarily
+ used for software exchange; and
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+ b) the Contributor may Distribute the Program under a license
+ different than this Agreement, provided that such license:
+ i) effectively disclaims on behalf of all other Contributors all
+ warranties and conditions, express and implied, including
+ warranties or conditions of title and non-infringement, and
+ implied warranties or conditions of merchantability and fitness
+ for a particular purpose;
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+ ii) effectively excludes on behalf of all other Contributors all
+ liability for damages, including direct, indirect, special,
+ incidental and consequential damages, such as lost profits;
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
+ iii) does not attempt to limit or alter the recipients' rights
+ in the Source Code under section 3.2; and
-When the Program is made available in source code form:
+ iv) requires any subsequent distribution of the Program by any
+ party to be under a license that satisfies the requirements
+ of this section 3.
-a) it must be made available under this Agreement; and
+3.2 When the Program is Distributed as Source Code:
-b) a copy of this Agreement must be included with each copy of the Program.
+ a) it must be made available under this Agreement, or if the
+ Program (i) is combined with other material in a separate file or
+ files made available under a Secondary License, and (ii) the initial
+ Contributor attached to the Source Code the notice described in
+ Exhibit A of this Agreement, then the Program may be made available
+ under the terms of such Secondary Licenses, and
-Contributors may not remove or alter any copyright notices contained within the Program.
+ b) a copy of this Agreement must be included with each copy of
+ the Program.
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
+3.3 Contributors may not remove or alter any copyright, patent,
+trademark, attribution notices, disclaimers of warranty, or limitations
+of liability ("notices") contained within the Program from any copy of
+the Program which they Distribute, provided that Contributors may add
+their own appropriate notices.
4. COMMERCIAL DISTRIBUTION
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
+Commercial distributors of software may accept certain responsibilities
+with respect to end users, business partners and the like. While this
+license is intended to facilitate the commercial use of the Program,
+the Contributor who includes the Program in a commercial product
+offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes
+the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and indemnify every
+other Contributor ("Indemnified Contributor") against any losses,
+damages and costs (collectively "Losses") arising from claims, lawsuits
+and other legal actions brought by a third party against the Indemnified
+Contributor to the extent caused by the acts or omissions of such
+Commercial Contributor in connection with its distribution of the Program
+in a commercial product offering. The obligations in this section do not
+apply to any claims or Losses relating to any actual or alleged
+intellectual property infringement. In order to qualify, an Indemnified
+Contributor must: a) promptly notify the Commercial Contributor in
+writing of such claim, and b) allow the Commercial Contributor to control,
+and cooperate with the Commercial Contributor in, the defense and any
+related settlement negotiations. The Indemnified Contributor may
+participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those performance
+claims and warranties, and if a court requires any other Contributor to
+pay any damages as a result, the Commercial Contributor must pay
+those damages.
5. NO WARRANTY
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
+BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
+TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
+PURPOSE. Each Recipient is solely responsible for determining the
+appropriateness of using and distributing the Program and assumes all
+risks associated with its exercise of rights under this Agreement,
+including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs
+or equipment, and unavailability or interruption of operations.
6. DISCLAIMER OF LIABILITY
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
+SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
+EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
7. GENERAL
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
-
-
+If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further
+action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other software
+or hardware) infringes such Recipient's patent(s), then such Recipient's
+rights granted under Section 2(b) shall terminate as of the date such
+litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of
+time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use
+and distribution of the Program as soon as reasonably practicable.
+However, Recipient's obligations under this Agreement and any licenses
+granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement,
+but in order to avoid inconsistency the Agreement is copyrighted and
+may only be modified in the following manner. The Agreement Steward
+reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement
+Steward has the right to modify this Agreement. The Eclipse Foundation
+is the initial Agreement Steward. The Eclipse Foundation may assign the
+responsibility to serve as the Agreement Steward to a suitable separate
+entity. Each new version of the Agreement will be given a distinguishing
+version number. The Program (including Contributions) may always be
+Distributed subject to the version of the Agreement under which it was
+received. In addition, after a new version of the Agreement is published,
+Contributor may elect to Distribute the Program (including its
+Contributions) under the new version.
+
+Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+receives no rights or licenses to the intellectual property of any
+Contributor under this Agreement, whether expressly, by implication,
+estoppel or otherwise. All rights in the Program not expressly granted
+under this Agreement are reserved. Nothing in this Agreement is intended
+to be enforceable by any entity that is not a Contributor or Recipient.
+No third-party beneficiary rights are created under this Agreement.
+
+Exhibit A - Form of Secondary Licenses Notice
+
+"This Source Code may also be made available under the following
+Secondary Licenses when the conditions for such availability set forth
+in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+version(s), and exceptions or additional permissions here}."
+
+ Simply including a copy of this Agreement, including this Exhibit A
+ is not sufficient to license the Source Code under Secondary Licenses.
+
+ If it is not possible or desirable to put the notice in a particular
+ file, then You may include the notice in a location (such as a LICENSE
+ file in a relevant directory) where a recipient would be likely to
+ look for such a notice.
+
+ You may add additional accurate notices of copyright ownership. \ No newline at end of file
diff --git a/NOTICE.txt b/NOTICE.txt
index 4556085..ab545d4 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -18,10 +18,10 @@ source code repository logs.
## Declared Project Licenses
This program and the accompanying materials are made available under the terms
-of the Eclipse Public License v. 1.0 which is available at
-http://www.eclipse.org/legal/epl-v10.html.
+of the Eclipse Public License v. 2.0 which is available at
+http://www.eclipse.org/legal/epl-v20.html.
-SPDX-License-Identifier: EPL-1.0
+SPDX-License-Identifier: EPL-2.0
## Source Code
diff --git a/examples/org.eclipse.emf.diffmerge.patch.examples.cps/demo_corrected.cyberphysicalsystem b/examples/org.eclipse.emf.diffmerge.patch.examples.cps/demo_corrected.cyberphysicalsystem
index 5c3581a..3eaba6a 100644
--- a/examples/org.eclipse.emf.diffmerge.patch.examples.cps/demo_corrected.cyberphysicalsystem
+++ b/examples/org.eclipse.emf.diffmerge.patch.examples.cps/demo_corrected.cyberphysicalsystem
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="ASCII"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- 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
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/examples/org.eclipse.emf.diffmerge.patch.examples.cps/demo_modified.cyberphysicalsystem b/examples/org.eclipse.emf.diffmerge.patch.examples.cps/demo_modified.cyberphysicalsystem
index acc8a9a..513a7ac 100644
--- a/examples/org.eclipse.emf.diffmerge.patch.examples.cps/demo_modified.cyberphysicalsystem
+++ b/examples/org.eclipse.emf.diffmerge.patch.examples.cps/demo_modified.cyberphysicalsystem
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="ASCII"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- 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
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/examples/org.eclipse.emf.diffmerge.patch.examples.cps/demo_original.cyberphysicalsystem b/examples/org.eclipse.emf.diffmerge.patch.examples.cps/demo_original.cyberphysicalsystem
index 9650842..43829d7 100644
--- a/examples/org.eclipse.emf.diffmerge.patch.examples.cps/demo_original.cyberphysicalsystem
+++ b/examples/org.eclipse.emf.diffmerge.patch.examples.cps/demo_original.cyberphysicalsystem
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="ASCII"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- 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
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/examples/org.eclipse.emf.diffmerge.patch.examples/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.diffmerge.patch.examples/META-INF/MANIFEST.MF
index 69d9ff3..e94fe6b 100644
--- a/examples/org.eclipse.emf.diffmerge.patch.examples/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.diffmerge.patch.examples/META-INF/MANIFEST.MF
@@ -7,3 +7,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.ui,
org.eclipse.emf.common.ui;bundle-version="2.10.0"
Bundle-Vendor: %providerName
+Automatic-Module-Name: org.eclipse.emf.diffmerge.patch.examples
diff --git a/examples/org.eclipse.emf.diffmerge.patch.examples/about.html b/examples/org.eclipse.emf.diffmerge.patch.examples/about.html
index d8e1984..720a1d0 100644
--- a/examples/org.eclipse.emf.diffmerge.patch.examples/about.html
+++ b/examples/org.eclipse.emf.diffmerge.patch.examples/about.html
@@ -1,21 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
</head>
<body lang="EN-US">
<h2>About This Content</h2>
-<p>June 5, 2007</p>
+<p>August 17, 2018</p>
<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
</body>
</html> \ No newline at end of file
diff --git a/examples/org.eclipse.emf.diffmerge.patch.examples/build.properties b/examples/org.eclipse.emf.diffmerge.patch.examples/build.properties
index 49e6d48..174db2f 100644
--- a/examples/org.eclipse.emf.diffmerge.patch.examples/build.properties
+++ b/examples/org.eclipse.emf.diffmerge.patch.examples/build.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2016-2017 Thales Global Services S.A.S.
-# 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
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Abel Hegedus, Tamas Borbas, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/examples/org.eclipse.emf.diffmerge.patch.examples/plugin.properties b/examples/org.eclipse.emf.diffmerge.patch.examples/plugin.properties
index adbfe70..ee9d45b 100644
--- a/examples/org.eclipse.emf.diffmerge.patch.examples/plugin.properties
+++ b/examples/org.eclipse.emf.diffmerge.patch.examples/plugin.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2016-2017 Thales Global Services S.A.S.
-# 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
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
pluginName = Model Patch Examples Plug-In (Incubation)
providerName = Eclipse Modeling Project
diff --git a/examples/org.eclipse.emf.diffmerge.patch.examples/plugin.xml b/examples/org.eclipse.emf.diffmerge.patch.examples/plugin.xml
index cb0bcc8..158c106 100644
--- a/examples/org.eclipse.emf.diffmerge.patch.examples/plugin.xml
+++ b/examples/org.eclipse.emf.diffmerge.patch.examples/plugin.xml
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- 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
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/examples/org.eclipse.emf.diffmerge.patch.examples/pom.xml b/examples/org.eclipse.emf.diffmerge.patch.examples/pom.xml
index 4b9970a..f2d2d08 100644
--- a/examples/org.eclipse.emf.diffmerge.patch.examples/pom.xml
+++ b/examples/org.eclipse.emf.diffmerge.patch.examples/pom.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- 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
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/features/org.eclipse.emf.diffmerge.patch.feature.dependencies/build.properties b/features/org.eclipse.emf.diffmerge.patch.feature.dependencies/build.properties
index 524c9a6..bcd5f37 100644
--- a/features/org.eclipse.emf.diffmerge.patch.feature.dependencies/build.properties
+++ b/features/org.eclipse.emf.diffmerge.patch.feature.dependencies/build.properties
@@ -1,15 +1,15 @@
###############################################################################
# Copyright (c) 2016-2017 Thales Global Services S.A.S.
-# 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
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Abel Hegedus, Tamas Borbas, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
###############################################################################
bin.includes = feature.xml,\
- epl-v10.html,\
+ epl-v20.html,\
license.html,\
feature.properties
-src.includes = feature.properties
diff --git a/features/org.eclipse.emf.diffmerge.patch.feature.dependencies/epl-v10.html b/features/org.eclipse.emf.diffmerge.patch.feature.dependencies/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.emf.diffmerge.patch.feature.dependencies/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html> \ No newline at end of file
diff --git a/features/org.eclipse.emf.diffmerge.patch.feature.dependencies/epl-v20.html b/features/org.eclipse.emf.diffmerge.patch.feature.dependencies/epl-v20.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.emf.diffmerge.patch.feature.dependencies/epl-v20.html
@@ -0,0 +1,300 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>Eclipse Public License - Version 2.0</title>
+ <style type="text/css">
+ body {
+ margin: 1.5em 3em;
+ }
+ h1{
+ font-size:1.5em;
+ }
+ h2{
+ font-size:1em;
+ margin-bottom:0.5em;
+ margin-top:1em;
+ }
+ p {
+ margin-top: 0.5em;
+ margin-bottom: 0.5em;
+ }
+ ul, ol{
+ list-style-type:none;
+ }
+ </style>
+ </head>
+ <body>
+ <h1>Eclipse Public License - v 2.0</h1>
+ <p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+ PUBLIC LICENSE (&ldquo;AGREEMENT&rdquo;). ANY USE, REPRODUCTION OR DISTRIBUTION
+ OF THE PROGRAM CONSTITUTES RECIPIENT&#039;S ACCEPTANCE OF THIS AGREEMENT.
+ </p>
+ <h2 id="definitions">1. DEFINITIONS</h2>
+ <p>&ldquo;Contribution&rdquo; means:</p>
+ <ul>
+ <li>a) in the case of the initial Contributor, the initial content
+ Distributed under this Agreement, and
+ </li>
+ <li>
+ b) in the case of each subsequent Contributor:
+ <ul>
+ <li>i) changes to the Program, and</li>
+ <li>ii) additions to the Program;</li>
+ </ul>
+ where such changes and/or additions to the Program originate from
+ and are Distributed by that particular Contributor. A Contribution
+ &ldquo;originates&rdquo; from a Contributor if it was added to the Program by such
+ Contributor itself or anyone acting on such Contributor&#039;s behalf.
+ Contributions do not include changes or additions to the Program that
+ are not Modified Works.
+ </li>
+ </ul>
+ <p>&ldquo;Contributor&rdquo; means any person or entity that Distributes the Program.</p>
+ <p>&ldquo;Licensed Patents&rdquo; mean patent claims licensable by a Contributor which
+ are necessarily infringed by the use or sale of its Contribution alone
+ or when combined with the Program.
+ </p>
+ <p>&ldquo;Program&rdquo; means the Contributions Distributed in accordance with this
+ Agreement.
+ </p>
+ <p>&ldquo;Recipient&rdquo; means anyone who receives the Program under this Agreement
+ or any Secondary License (as applicable), including Contributors.
+ </p>
+ <p>&ldquo;Derivative Works&rdquo; shall mean any work, whether in Source Code or other
+ form, that is based on (or derived from) the Program and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship.
+ </p>
+ <p>&ldquo;Modified Works&rdquo; shall mean any work in Source Code or other form that
+ results from an addition to, deletion from, or modification of the
+ contents of the Program, including, for purposes of clarity any new file
+ in Source Code form that contains any contents of the Program. Modified
+ Works shall not include works that contain only declarations, interfaces,
+ types, classes, structures, or files of the Program solely in each case
+ in order to link to, bind by name, or subclass the Program or Modified
+ Works thereof.
+ </p>
+ <p>&ldquo;Distribute&rdquo; means the acts of a) distributing or b) making available
+ in any manner that enables the transfer of a copy.
+ </p>
+ <p>&ldquo;Source Code&rdquo; means the form of a Program preferred for making
+ modifications, including but not limited to software source code,
+ documentation source, and configuration files.
+ </p>
+ <p>&ldquo;Secondary License&rdquo; means either the GNU General Public License,
+ Version 2.0, or any later versions of that license, including any
+ exceptions or additional permissions as identified by the initial
+ Contributor.
+ </p>
+ <h2 id="grant-of-rights">2. GRANT OF RIGHTS</h2>
+ <ul>
+ <li>a) Subject to the terms of this Agreement, each Contributor hereby
+ grants Recipient a non-exclusive, worldwide, royalty-free copyright
+ license to reproduce, prepare Derivative Works of, publicly display,
+ publicly perform, Distribute and sublicense the Contribution of such
+ Contributor, if any, and such Derivative Works.
+ </li>
+ <li>b) Subject to the terms of this Agreement, each Contributor hereby
+ grants Recipient a non-exclusive, worldwide, royalty-free patent
+ license under Licensed Patents to make, use, sell, offer to sell,
+ import and otherwise transfer the Contribution of such Contributor,
+ if any, in Source Code or other form. This patent license shall
+ apply to the combination of the Contribution and the Program if,
+ at the time the Contribution is added by the Contributor, such
+ addition of the Contribution causes such combination to be covered
+ by the Licensed Patents. The patent license shall not apply to any
+ other combinations which include the Contribution. No hardware per
+ se is licensed hereunder.
+ </li>
+ <li>c) Recipient understands that although each Contributor grants the
+ licenses to its Contributions set forth herein, no assurances are
+ provided by any Contributor that the Program does not infringe the
+ patent or other intellectual property rights of any other entity.
+ Each Contributor disclaims any liability to Recipient for claims
+ brought by any other entity based on infringement of intellectual
+ property rights or otherwise. As a condition to exercising the rights
+ and licenses granted hereunder, each Recipient hereby assumes sole
+ responsibility to secure any other intellectual property rights needed,
+ if any. For example, if a third party patent license is required to
+ allow Recipient to Distribute the Program, it is Recipient&#039;s
+ responsibility to acquire that license before distributing the Program.
+ </li>
+ <li>d) Each Contributor represents that to its knowledge it has sufficient
+ copyright rights in its Contribution, if any, to grant the copyright
+ license set forth in this Agreement.
+ </li>
+ <li>e) Notwithstanding the terms of any Secondary License, no Contributor
+ makes additional grants to any Recipient (other than those set forth
+ in this Agreement) as a result of such Recipient&#039;s receipt of the
+ Program under the terms of a Secondary License (if permitted under
+ the terms of Section 3).
+ </li>
+ </ul>
+ <h2 id="requirements">3. REQUIREMENTS</h2>
+ <p>3.1 If a Contributor Distributes the Program in any form, then:</p>
+ <ul>
+ <li>a) the Program must also be made available as Source Code, in
+ accordance with section 3.2, and the Contributor must accompany
+ the Program with a statement that the Source Code for the Program
+ is available under this Agreement, and informs Recipients how to
+ obtain it in a reasonable manner on or through a medium customarily
+ used for software exchange; and
+ </li>
+ <li>
+ b) the Contributor may Distribute the Program under a license
+ different than this Agreement, provided that such license:
+ <ul>
+ <li>i) effectively disclaims on behalf of all other Contributors all
+ warranties and conditions, express and implied, including warranties
+ or conditions of title and non-infringement, and implied warranties
+ or conditions of merchantability and fitness for a particular purpose;
+ </li>
+ <li>ii) effectively excludes on behalf of all other Contributors all
+ liability for damages, including direct, indirect, special, incidental
+ and consequential damages, such as lost profits;
+ </li>
+ <li>iii) does not attempt to limit or alter the recipients&#039; rights in the
+ Source Code under section 3.2; and
+ </li>
+ <li>iv) requires any subsequent distribution of the Program by any party
+ to be under a license that satisfies the requirements of this section 3.
+ </li>
+ </ul>
+ </li>
+ </ul>
+ <p>3.2 When the Program is Distributed as Source Code:</p>
+ <ul>
+ <li>a) it must be made available under this Agreement, or if the Program (i)
+ is combined with other material in a separate file or files made available
+ under a Secondary License, and (ii) the initial Contributor attached to
+ the Source Code the notice described in Exhibit A of this Agreement,
+ then the Program may be made available under the terms of such
+ Secondary Licenses, and
+ </li>
+ <li>b) a copy of this Agreement must be included with each copy of the Program.</li>
+ </ul>
+ <p>3.3 Contributors may not remove or alter any copyright, patent, trademark,
+ attribution notices, disclaimers of warranty, or limitations of liability
+ (&lsquo;notices&rsquo;) contained within the Program from any copy of the Program which
+ they Distribute, provided that Contributors may add their own appropriate
+ notices.
+ </p>
+ <h2 id="commercial-distribution">4. COMMERCIAL DISTRIBUTION</h2>
+ <p>Commercial distributors of software may accept certain responsibilities
+ with respect to end users, business partners and the like. While this
+ license is intended to facilitate the commercial use of the Program, the
+ Contributor who includes the Program in a commercial product offering should
+ do so in a manner which does not create potential liability for other
+ Contributors. Therefore, if a Contributor includes the Program in a
+ commercial product offering, such Contributor (&ldquo;Commercial Contributor&rdquo;)
+ hereby agrees to defend and indemnify every other Contributor
+ (&ldquo;Indemnified Contributor&rdquo;) against any losses, damages and costs
+ (collectively &ldquo;Losses&rdquo;) arising from claims, lawsuits and other legal actions
+ brought by a third party against the Indemnified Contributor to the extent
+ caused by the acts or omissions of such Commercial Contributor in connection
+ with its distribution of the Program in a commercial product offering.
+ The obligations in this section do not apply to any claims or Losses relating
+ to any actual or alleged intellectual property infringement. In order to
+ qualify, an Indemnified Contributor must: a) promptly notify the
+ Commercial Contributor in writing of such claim, and b) allow the Commercial
+ Contributor to control, and cooperate with the Commercial Contributor in,
+ the defense and any related settlement negotiations. The Indemnified
+ Contributor may participate in any such claim at its own expense.
+ </p>
+ <p>For example, a Contributor might include the Program
+ in a commercial product offering, Product X. That Contributor is then a
+ Commercial Contributor. If that Commercial Contributor then makes performance
+ claims, or offers warranties related to Product X, those performance claims
+ and warranties are such Commercial Contributor&#039;s responsibility alone.
+ Under this section, the Commercial Contributor would have to defend claims
+ against the other Contributors related to those performance claims and
+ warranties, and if a court requires any other Contributor to pay any damages
+ as a result, the Commercial Contributor must pay those damages.
+ </p>
+ <h2 id="warranty">5. NO WARRANTY</h2>
+ <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
+ BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN &ldquo;AS IS&rdquo; BASIS, WITHOUT
+ WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
+ WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+ MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is
+ solely responsible for determining the appropriateness of using and
+ distributing the Program and assumes all risks associated with its
+ exercise of rights under this Agreement, including but not limited to the
+ risks and costs of program errors, compliance with applicable laws, damage
+ to or loss of data, programs or equipment, and unavailability or
+ interruption of operations.
+ </p>
+ <h2 id="disclaimer">6. DISCLAIMER OF LIABILITY</h2>
+ <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
+ BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY
+ LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS),
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
+ GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ </p>
+ <h2 id="general">7. GENERAL</h2>
+ <p>If any provision of this Agreement is invalid or unenforceable under
+ applicable law, it shall not affect the validity or enforceability of the
+ remainder of the terms of this Agreement, and without further action by the
+ parties hereto, such provision shall be reformed to the minimum extent
+ necessary to make such provision valid and enforceable.
+ </p>
+ <p>If Recipient institutes patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Program itself
+ (excluding combinations of the Program with other software or hardware)
+ infringes such Recipient&#039;s patent(s), then such Recipient&#039;s rights granted
+ under Section 2(b) shall terminate as of the date such litigation is filed.
+ </p>
+ <p>All Recipient&#039;s rights under this Agreement shall terminate if it fails to
+ comply with any of the material terms or conditions of this Agreement and
+ does not cure such failure in a reasonable period of time after becoming
+ aware of such noncompliance. If all Recipient&#039;s rights under this Agreement
+ terminate, Recipient agrees to cease use and distribution of the Program
+ as soon as reasonably practicable. However, Recipient&#039;s obligations under
+ this Agreement and any licenses granted by Recipient relating to the
+ Program shall continue and survive.
+ </p>
+ <p>Everyone is permitted to copy and distribute copies of this Agreement,
+ but in order to avoid inconsistency the Agreement is copyrighted and may
+ only be modified in the following manner. The Agreement Steward reserves
+ the right to publish new versions (including revisions) of this Agreement
+ from time to time. No one other than the Agreement Steward has the right
+ to modify this Agreement. The Eclipse Foundation is the initial Agreement
+ Steward. The Eclipse Foundation may assign the responsibility to serve as
+ the Agreement Steward to a suitable separate entity. Each new version of
+ the Agreement will be given a distinguishing version number. The Program
+ (including Contributions) may always be Distributed subject to the version
+ of the Agreement under which it was received. In addition, after a new
+ version of the Agreement is published, Contributor may elect to Distribute
+ the Program (including its Contributions) under the new version.
+ </p>
+ <p>Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+ receives no rights or licenses to the intellectual property of any
+ Contributor under this Agreement, whether expressly, by implication,
+ estoppel or otherwise. All rights in the Program not expressly granted
+ under this Agreement are reserved. Nothing in this Agreement is intended
+ to be enforceable by any entity that is not a Contributor or Recipient.
+ No third-party beneficiary rights are created under this Agreement.
+ </p>
+ <h2 id="exhibit-a">Exhibit A &ndash; Form of Secondary Licenses Notice</h2>
+ <p>&ldquo;This Source Code may also be made available under the following
+ Secondary Licenses when the conditions for such availability set forth
+ in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+ version(s), and exceptions or additional permissions here}.&rdquo;
+ </p>
+ <blockquote>
+ <p>Simply including a copy of this Agreement, including this Exhibit A
+ is not sufficient to license the Source Code under Secondary Licenses.
+ </p>
+ <p>If it is not possible or desirable to put the notice in a particular file,
+ then You may include the notice in a location (such as a LICENSE file in a
+ relevant directory) where a recipient would be likely to look for
+ such a notice.
+ </p>
+ <p>You may add additional accurate notices of copyright ownership.</p>
+ </blockquote>
+ </body>
+</html> \ No newline at end of file
diff --git a/features/org.eclipse.emf.diffmerge.patch.feature.dependencies/feature.properties b/features/org.eclipse.emf.diffmerge.patch.feature.dependencies/feature.properties
index e69de29..c8717e0 100644
--- a/features/org.eclipse.emf.diffmerge.patch.feature.dependencies/feature.properties
+++ b/features/org.eclipse.emf.diffmerge.patch.feature.dependencies/feature.properties
@@ -0,0 +1,174 @@
+###############################################################################
+# Copyright (c) 2016-2018 Thales Global Services S.A.S.
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+###############################################################################
+featureName = Model Patch Feature Dependencies (Incubation)
+providerName = Eclipse Modeling Project
+
+description = EMF Diff/Merge Model Patch dependencies feature (only used for\n\
+RCPTT product)\n
+
+copyright=\
+Copyright (c) 2016-2018 Thales Global Services S.A.S.\n\
+This program and the accompanying materials are made\n\
+available under the terms of the Eclipse Public License 2.0\n\
+which is available at https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
+\n\
+Contributors:\n\
+Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel\n\
+Segesdi (IncQuery Labs Ltd.) - initial API and implementation\n
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+\n\
+November 22, 2017\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION\n\
+AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF\n\
+THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE\n\
+TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED\n\
+BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\
+AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY\n\
+APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU\n\
+MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public License\n\
+Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also\n\
+available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,\n\
+"Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code, documentation\n\
+and other files maintained in the Eclipse Foundation source code repository\n\
+("Repository") in software modules ("Modules") and made available as\n\
+downloadable archives ("Downloads").\n\
+\n\
+- Content may be structured and packaged into modules to facilitate\n\
+ delivering, extending, and upgrading the Content. Typical modules may\n\
+ include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and\n\
+ features ("Features").\n\
+- Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\
+ (Java\u2122 ARchive) in a directory named "plugins".\n\
+- A Feature is a bundle of one or more Plug-ins and/or Fragments and\n\
+ associated material. Each Feature may be packaged as a sub-directory in a\n\
+ directory named "features". Within a Feature, files named "feature.xml" may\n\
+ contain a list of the names and version numbers of the Plug-ins and/or\n\
+ Fragments associated with that Feature.\n\
+- Features may also include other Features ("Included Features"). Within a\n\
+ Feature, files named "feature.xml" may contain a list of the names and\n\
+ version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be contained in\n\
+files named "about.html" ("Abouts"). The terms and conditions governing Features\n\
+and Included Features should be contained in files named "license.html"\n\
+("Feature Licenses"). Abouts and Feature Licenses may be located in any\n\
+directory of a Download or Module including, but not limited to the following\n\
+locations:\n\
+\n\
+- The top-level (root) directory\n\
+- Plug-in and Fragment directories\n\
+- Inside Plug-ins and Fragments packaged as JARs\n\
+- Sub-directories of the directory named "src" of certain Plug-ins\n\
+- Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using\n\
+the Provisioning Technology (as defined below), you must agree to a license\n\
+("Feature Update License") during the installation process. If the Feature\n\
+contains Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform you\n\
+where you can locate them. Feature Update Licenses may be found in the "license"\n\
+property of files named "feature.properties" found within a Feature. Such\n\
+Abouts, Feature Licenses, and Feature Update Licenses contain the terms and\n\
+conditions (or references to such terms and conditions) that govern your use of\n\
+the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL\n\
+OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE\n\
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+- Eclipse Public License Version 1.0 (available at\n\
+ http://www.eclipse.org/legal/epl-v10.html)\n\
+- Eclipse Distribution License Version 1.0 (available at\n\
+ http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+- Common Public License Version 1.0 (available at\n\
+ http://www.eclipse.org/legal/cpl-v10.html)\n\
+- Apache Software License 1.1 (available at\n\
+ http://www.apache.org/licenses/LICENSE)\n\
+- Apache Software License 2.0 (available at\n\
+ http://www.apache.org/licenses/LICENSE-2.0)\n\
+- Mozilla Public License Version 1.1 (available at\n\
+ http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO\n\
+USE OF THE CONTENT. If no About, Feature License, or Feature Update License is\n\
+provided, please contact the Eclipse Foundation to determine what terms and\n\
+conditions govern that particular Content.\n\
+\n\
+Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which\n\
+include, but are not limited to, p2 and the Eclipse Update Manager\n\
+("Provisioning Technology") for the purpose of allowing users to install\n\
+software, documentation, information and/or other materials (collectively\n\
+"Installable Software"). This capability is provided with the intent of allowing\n\
+such users to install, extend and update Eclipse-based products. Information\n\
+about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install\n\
+Installable Software. You shall be responsible for enabling the applicable\n\
+license agreements relating to the Installable Software to be presented to, and\n\
+accepted by, the users of the Provisioning Technology in accordance with the\n\
+Specification. By using Provisioning Technology in such a manner and making it\n\
+available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the\n\
+following:\n\
+\n\
+1. A series of actions may occur ("Provisioning Process") in which a user may\n\
+ execute the Provisioning Technology on a machine ("Target Machine") with the\n\
+ intent of installing, extending or updating the functionality of an\n\
+ Eclipse-based product.\n\
+2. During the Provisioning Process, the Provisioning Technology may cause third\n\
+ party Installable Software or a portion thereof to be accessed and copied to\n\
+ the Target Machine.\n\
+3. Pursuant to the Specification, you will provide to the user the terms and\n\
+ conditions that govern the use of the Installable Software ("Installable\n\
+ Software Agreement") and such Installable Software Agreement shall be\n\
+ accessed from the Target Machine in accordance with the Specification. Such\n\
+ Installable Software Agreement must inform the user of the terms and\n\
+ conditions that govern the Installable Software and must solicit acceptance\n\
+ by the end user in the manner prescribed in such Installable\n\
+ Software Agreement. Upon such indication of agreement by the user, the\n\
+ provisioning Technology will complete installation of the\n\
+ Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are currently\n\
+may have restrictions on the import, possession, and use, and/or re-export to\n\
+another country, of encryption software. BEFORE using any encryption software,\n\
+please check the country's laws, regulations and policies concerning the import,\n\
+possession, or use, and re-export of encryption software, to see if this is\n\
+permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the\n\
+United States, other countries, or both.\n
+########### end of license property ##########################################
diff --git a/features/org.eclipse.emf.diffmerge.patch.feature.dependencies/feature.xml b/features/org.eclipse.emf.diffmerge.patch.feature.dependencies/feature.xml
index c7bdd19..bc5dc8a 100644
--- a/features/org.eclipse.emf.diffmerge.patch.feature.dependencies/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.patch.feature.dependencies/feature.xml
@@ -1,32 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
-
- Contributors:
- Abel Hegedus, Tamas Borbas, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
+ Copyright (c) 2016-2018 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
+
+ Contributors:
+ Abel Hegedus, Tamas Borbas, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
-->
<feature
id="org.eclipse.emf.diffmerge.patch.feature.dependencies"
- label="Model Patch Feature Dependencies"
+ label="%featureName"
version="0.1.0.qualifier"
- provider-name="Eclipse Modeling Project"
+ provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
<description>
- EMF Diff/Merge Model Patch dependencies feature (only used for RCPTT product)
+ %description
</description>
- <copyright url="http://www.eclipse.org/legal/epl-v10.html">
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
- Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
+ <copyright>
+ %copyright
</copyright>
<license url="%licenseURL">
diff --git a/features/org.eclipse.emf.diffmerge.patch.feature.dependencies/license.html b/features/org.eclipse.emf.diffmerge.patch.feature.dependencies/license.html
index f19c483..008b801 100644
--- a/features/org.eclipse.emf.diffmerge.patch.feature.dependencies/license.html
+++ b/features/org.eclipse.emf.diffmerge.patch.feature.dependencies/license.html
@@ -7,102 +7,183 @@
</head>
<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>February 1, 2011</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY &quot;CONTENT&quot;). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- (&quot;EPL&quot;). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
- repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;. Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
- Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
- other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
- install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
- href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
- (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
- applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
- in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
- Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
- <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
- on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
- product.</li>
- <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
- accessed and copied to the Target Machine.</li>
- <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
- Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
- Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
- the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
- indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+ <h2>Eclipse Foundation Software User Agreement</h2>
+ <p>November 22, 2017</p>
+
+ <h3>Usage Of Content</h3>
+
+ <p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION,
+ INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+ (COLLECTIVELY &quot;CONTENT&quot;). USE OF THE CONTENT IS GOVERNED BY
+ THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+ CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
+ BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS
+ GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY
+ APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
+ BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS
+ AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
+ AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT
+ USE THE CONTENT.</p>
+
+ <h3>Applicable Licenses</h3>
+
+ <p>
+ Unless otherwise indicated, all Content made available by the Eclipse
+ Foundation is provided to you under the terms and conditions of the
+ Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the
+ EPL is provided with this Content and is also available at <a
+ href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+ For purposes of the EPL, &quot;Program&quot; will mean the Content.
+ </p>
+
+ <p>Content includes, but is not limited to, source code, object
+ code, documentation and other files maintained in the Eclipse
+ Foundation source code repository (&quot;Repository&quot;) in software
+ modules (&quot;Modules&quot;) and made available as downloadable
+ archives (&quot;Downloads&quot;).</p>
+
+ <ul>
+ <li>Content may be structured and packaged into modules to
+ facilitate delivering, extending, and upgrading the Content. Typical
+ modules may include plug-ins (&quot;Plug-ins&quot;), plug-in
+ fragments (&quot;Fragments&quot;), and features
+ (&quot;Features&quot;).</li>
+ <li>Each Plug-in or Fragment may be packaged as a sub-directory
+ or JAR (Java&trade; ARchive) in a directory named
+ &quot;plugins&quot;.</li>
+ <li>A Feature is a bundle of one or more Plug-ins and/or
+ Fragments and associated material. Each Feature may be packaged as a
+ sub-directory in a directory named &quot;features&quot;. Within a
+ Feature, files named &quot;feature.xml&quot; may contain a list of
+ the names and version numbers of the Plug-ins and/or Fragments
+ associated with that Feature.</li>
+ <li>Features may also include other Features (&quot;Included
+ Features&quot;). Within a Feature, files named
+ &quot;feature.xml&quot; may contain a list of the names and version
+ numbers of Included Features.</li>
+ </ul>
+
+ <p>The terms and conditions governing Plug-ins and Fragments should
+ be contained in files named &quot;about.html&quot;
+ (&quot;Abouts&quot;). The terms and conditions governing Features and
+ Included Features should be contained in files named
+ &quot;license.html&quot; (&quot;Feature Licenses&quot;). Abouts and
+ Feature Licenses may be located in any directory of a Download or
+ Module including, but not limited to the following locations:</p>
+
+ <ul>
+ <li>The top-level (root) directory</li>
+ <li>Plug-in and Fragment directories</li>
+ <li>Inside Plug-ins and Fragments packaged as JARs</li>
+ <li>Sub-directories of the directory named &quot;src&quot; of
+ certain Plug-ins</li>
+ <li>Feature directories</li>
+ </ul>
+
+ <p>Note: if a Feature made available by the Eclipse Foundation is
+ installed using the Provisioning Technology (as defined below), you
+ must agree to a license (&quot;Feature Update License&quot;) during
+ the installation process. If the Feature contains Included Features,
+ the Feature Update License should either provide you with the terms
+ and conditions governing the Included Features or inform you where you
+ can locate them. Feature Update Licenses may be found in the
+ &quot;license&quot; property of files named
+ &quot;feature.properties&quot; found within a Feature. Such Abouts,
+ Feature Licenses, and Feature Update Licenses contain the terms and
+ conditions (or references to such terms and conditions) that govern
+ your use of the associated Content in that directory.</p>
+
+ <p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY
+ REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND
+ CONDITIONS. SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT
+ ARE NOT LIMITED TO):</p>
+
+ <ul>
+ <li>Eclipse Public License Version 1.0 (available at <a
+ href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>)
+ </li>
+ <li>Eclipse Distribution License Version 1.0 (available at <a
+ href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)
+ </li>
+ <li>Common Public License Version 1.0 (available at <a
+ href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)
+ </li>
+ <li>Apache Software License 1.1 (available at <a
+ href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)
+ </li>
+ <li>Apache Software License 2.0 (available at <a
+ href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)
+ </li>
+ <li>Mozilla Public License Version 1.1 (available at <a
+ href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)
+ </li>
+ </ul>
+
+ <p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND
+ CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License,
+ or Feature Update License is provided, please contact the Eclipse
+ Foundation to determine what terms and conditions govern that
+ particular Content.</p>
+
+
+ <h3>Use of Provisioning Technology</h3>
+
+ <p>
+ The Eclipse Foundation makes available provisioning software, examples
+ of which include, but are not limited to, p2 and the Eclipse Update
+ Manager (&quot;Provisioning Technology&quot;) for the purpose of
+ allowing users to install software, documentation, information and/or
+ other materials (collectively &quot;Installable Software&quot;). This
+ capability is provided with the intent of allowing such users to
+ install, extend and update Eclipse-based products. Information about
+ packaging Installable Software is available at <a
+ href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+ (&quot;Specification&quot;).
+ </p>
+
+ <p>You may use Provisioning Technology to allow other parties to
+ install Installable Software. You shall be responsible for enabling
+ the applicable license agreements relating to the Installable Software
+ to be presented to, and accepted by, the users of the Provisioning
+ Technology in accordance with the Specification. By using Provisioning
+ Technology in such a manner and making it available in accordance with
+ the Specification, you further acknowledge your agreement to, and the
+ acquisition of all necessary rights to permit the following:</p>
+
+ <ol>
+ <li>A series of actions may occur (&quot;Provisioning
+ Process&quot;) in which a user may execute the Provisioning
+ Technology on a machine (&quot;Target Machine&quot;) with the intent
+ of installing, extending or updating the functionality of an
+ Eclipse-based product.</li>
+ <li>During the Provisioning Process, the Provisioning Technology
+ may cause third party Installable Software or a portion thereof to be
+ accessed and copied to the Target Machine.</li>
+ <li>Pursuant to the Specification, you will provide to the user
+ the terms and conditions that govern the use of the Installable
+ Software (&quot;Installable Software Agreement&quot;) and such
+ Installable Software Agreement shall be accessed from the Target
+ Machine in accordance with the Specification. Such Installable
+ Software Agreement must inform the user of the terms and conditions
+ that govern the Installable Software and must solicit acceptance by
+ the end user in the manner prescribed in such Installable Software
+ Agreement. Upon such indication of agreement by the user, the
+ provisioning Technology will complete installation of the Installable
+ Software.</li>
+ </ol>
+
+ <h3>Cryptography</h3>
+
+ <p>Content may contain encryption software. The country in which
+ you are currently may have restrictions on the import, possession, and
+ use, and/or re-export to another country, of encryption software.
+ BEFORE using any encryption software, please check the country's laws,
+ regulations and policies concerning the import, possession, or use,
+ and re-export of encryption software, to see if this is permitted.</p>
+
+ <p>
+ <small>Java and all Java-based trademarks are trademarks of
+ Oracle Corporation in the United States, other countries, or both.</small>
+ </p>
</body>
</html>
diff --git a/features/org.eclipse.emf.diffmerge.patch.feature.dependencies/pom.xml b/features/org.eclipse.emf.diffmerge.patch.feature.dependencies/pom.xml
index 70c5b2c..5fcd1ae 100644
--- a/features/org.eclipse.emf.diffmerge.patch.feature.dependencies/pom.xml
+++ b/features/org.eclipse.emf.diffmerge.patch.feature.dependencies/pom.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- 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
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/features/org.eclipse.emf.diffmerge.patch.feature/build.properties b/features/org.eclipse.emf.diffmerge.patch.feature/build.properties
index 8719cf7..8eb0d6a 100644
--- a/features/org.eclipse.emf.diffmerge.patch.feature/build.properties
+++ b/features/org.eclipse.emf.diffmerge.patch.feature/build.properties
@@ -1,15 +1,15 @@
###############################################################################
# Copyright (c) 2016-2017 Thales Global Services S.A.S.
-# 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
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Abel Hegedus, Tamas Borbas, Balazs Grill, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
###############################################################################
bin.includes = feature.xml,\
- epl-v10.html,\
+ epl-v20.html,\
license.html,\
feature.properties
-src.includes = feature.properties
diff --git a/features/org.eclipse.emf.diffmerge.patch.feature/epl-v10.html b/features/org.eclipse.emf.diffmerge.patch.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.emf.diffmerge.patch.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html> \ No newline at end of file
diff --git a/features/org.eclipse.emf.diffmerge.patch.feature/epl-v20.html b/features/org.eclipse.emf.diffmerge.patch.feature/epl-v20.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.emf.diffmerge.patch.feature/epl-v20.html
@@ -0,0 +1,300 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>Eclipse Public License - Version 2.0</title>
+ <style type="text/css">
+ body {
+ margin: 1.5em 3em;
+ }
+ h1{
+ font-size:1.5em;
+ }
+ h2{
+ font-size:1em;
+ margin-bottom:0.5em;
+ margin-top:1em;
+ }
+ p {
+ margin-top: 0.5em;
+ margin-bottom: 0.5em;
+ }
+ ul, ol{
+ list-style-type:none;
+ }
+ </style>
+ </head>
+ <body>
+ <h1>Eclipse Public License - v 2.0</h1>
+ <p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+ PUBLIC LICENSE (&ldquo;AGREEMENT&rdquo;). ANY USE, REPRODUCTION OR DISTRIBUTION
+ OF THE PROGRAM CONSTITUTES RECIPIENT&#039;S ACCEPTANCE OF THIS AGREEMENT.
+ </p>
+ <h2 id="definitions">1. DEFINITIONS</h2>
+ <p>&ldquo;Contribution&rdquo; means:</p>
+ <ul>
+ <li>a) in the case of the initial Contributor, the initial content
+ Distributed under this Agreement, and
+ </li>
+ <li>
+ b) in the case of each subsequent Contributor:
+ <ul>
+ <li>i) changes to the Program, and</li>
+ <li>ii) additions to the Program;</li>
+ </ul>
+ where such changes and/or additions to the Program originate from
+ and are Distributed by that particular Contributor. A Contribution
+ &ldquo;originates&rdquo; from a Contributor if it was added to the Program by such
+ Contributor itself or anyone acting on such Contributor&#039;s behalf.
+ Contributions do not include changes or additions to the Program that
+ are not Modified Works.
+ </li>
+ </ul>
+ <p>&ldquo;Contributor&rdquo; means any person or entity that Distributes the Program.</p>
+ <p>&ldquo;Licensed Patents&rdquo; mean patent claims licensable by a Contributor which
+ are necessarily infringed by the use or sale of its Contribution alone
+ or when combined with the Program.
+ </p>
+ <p>&ldquo;Program&rdquo; means the Contributions Distributed in accordance with this
+ Agreement.
+ </p>
+ <p>&ldquo;Recipient&rdquo; means anyone who receives the Program under this Agreement
+ or any Secondary License (as applicable), including Contributors.
+ </p>
+ <p>&ldquo;Derivative Works&rdquo; shall mean any work, whether in Source Code or other
+ form, that is based on (or derived from) the Program and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship.
+ </p>
+ <p>&ldquo;Modified Works&rdquo; shall mean any work in Source Code or other form that
+ results from an addition to, deletion from, or modification of the
+ contents of the Program, including, for purposes of clarity any new file
+ in Source Code form that contains any contents of the Program. Modified
+ Works shall not include works that contain only declarations, interfaces,
+ types, classes, structures, or files of the Program solely in each case
+ in order to link to, bind by name, or subclass the Program or Modified
+ Works thereof.
+ </p>
+ <p>&ldquo;Distribute&rdquo; means the acts of a) distributing or b) making available
+ in any manner that enables the transfer of a copy.
+ </p>
+ <p>&ldquo;Source Code&rdquo; means the form of a Program preferred for making
+ modifications, including but not limited to software source code,
+ documentation source, and configuration files.
+ </p>
+ <p>&ldquo;Secondary License&rdquo; means either the GNU General Public License,
+ Version 2.0, or any later versions of that license, including any
+ exceptions or additional permissions as identified by the initial
+ Contributor.
+ </p>
+ <h2 id="grant-of-rights">2. GRANT OF RIGHTS</h2>
+ <ul>
+ <li>a) Subject to the terms of this Agreement, each Contributor hereby
+ grants Recipient a non-exclusive, worldwide, royalty-free copyright
+ license to reproduce, prepare Derivative Works of, publicly display,
+ publicly perform, Distribute and sublicense the Contribution of such
+ Contributor, if any, and such Derivative Works.
+ </li>
+ <li>b) Subject to the terms of this Agreement, each Contributor hereby
+ grants Recipient a non-exclusive, worldwide, royalty-free patent
+ license under Licensed Patents to make, use, sell, offer to sell,
+ import and otherwise transfer the Contribution of such Contributor,
+ if any, in Source Code or other form. This patent license shall
+ apply to the combination of the Contribution and the Program if,
+ at the time the Contribution is added by the Contributor, such
+ addition of the Contribution causes such combination to be covered
+ by the Licensed Patents. The patent license shall not apply to any
+ other combinations which include the Contribution. No hardware per
+ se is licensed hereunder.
+ </li>
+ <li>c) Recipient understands that although each Contributor grants the
+ licenses to its Contributions set forth herein, no assurances are
+ provided by any Contributor that the Program does not infringe the
+ patent or other intellectual property rights of any other entity.
+ Each Contributor disclaims any liability to Recipient for claims
+ brought by any other entity based on infringement of intellectual
+ property rights or otherwise. As a condition to exercising the rights
+ and licenses granted hereunder, each Recipient hereby assumes sole
+ responsibility to secure any other intellectual property rights needed,
+ if any. For example, if a third party patent license is required to
+ allow Recipient to Distribute the Program, it is Recipient&#039;s
+ responsibility to acquire that license before distributing the Program.
+ </li>
+ <li>d) Each Contributor represents that to its knowledge it has sufficient
+ copyright rights in its Contribution, if any, to grant the copyright
+ license set forth in this Agreement.
+ </li>
+ <li>e) Notwithstanding the terms of any Secondary License, no Contributor
+ makes additional grants to any Recipient (other than those set forth
+ in this Agreement) as a result of such Recipient&#039;s receipt of the
+ Program under the terms of a Secondary License (if permitted under
+ the terms of Section 3).
+ </li>
+ </ul>
+ <h2 id="requirements">3. REQUIREMENTS</h2>
+ <p>3.1 If a Contributor Distributes the Program in any form, then:</p>
+ <ul>
+ <li>a) the Program must also be made available as Source Code, in
+ accordance with section 3.2, and the Contributor must accompany
+ the Program with a statement that the Source Code for the Program
+ is available under this Agreement, and informs Recipients how to
+ obtain it in a reasonable manner on or through a medium customarily
+ used for software exchange; and
+ </li>
+ <li>
+ b) the Contributor may Distribute the Program under a license
+ different than this Agreement, provided that such license:
+ <ul>
+ <li>i) effectively disclaims on behalf of all other Contributors all
+ warranties and conditions, express and implied, including warranties
+ or conditions of title and non-infringement, and implied warranties
+ or conditions of merchantability and fitness for a particular purpose;
+ </li>
+ <li>ii) effectively excludes on behalf of all other Contributors all
+ liability for damages, including direct, indirect, special, incidental
+ and consequential damages, such as lost profits;
+ </li>
+ <li>iii) does not attempt to limit or alter the recipients&#039; rights in the
+ Source Code under section 3.2; and
+ </li>
+ <li>iv) requires any subsequent distribution of the Program by any party
+ to be under a license that satisfies the requirements of this section 3.
+ </li>
+ </ul>
+ </li>
+ </ul>
+ <p>3.2 When the Program is Distributed as Source Code:</p>
+ <ul>
+ <li>a) it must be made available under this Agreement, or if the Program (i)
+ is combined with other material in a separate file or files made available
+ under a Secondary License, and (ii) the initial Contributor attached to
+ the Source Code the notice described in Exhibit A of this Agreement,
+ then the Program may be made available under the terms of such
+ Secondary Licenses, and
+ </li>
+ <li>b) a copy of this Agreement must be included with each copy of the Program.</li>
+ </ul>
+ <p>3.3 Contributors may not remove or alter any copyright, patent, trademark,
+ attribution notices, disclaimers of warranty, or limitations of liability
+ (&lsquo;notices&rsquo;) contained within the Program from any copy of the Program which
+ they Distribute, provided that Contributors may add their own appropriate
+ notices.
+ </p>
+ <h2 id="commercial-distribution">4. COMMERCIAL DISTRIBUTION</h2>
+ <p>Commercial distributors of software may accept certain responsibilities
+ with respect to end users, business partners and the like. While this
+ license is intended to facilitate the commercial use of the Program, the
+ Contributor who includes the Program in a commercial product offering should
+ do so in a manner which does not create potential liability for other
+ Contributors. Therefore, if a Contributor includes the Program in a
+ commercial product offering, such Contributor (&ldquo;Commercial Contributor&rdquo;)
+ hereby agrees to defend and indemnify every other Contributor
+ (&ldquo;Indemnified Contributor&rdquo;) against any losses, damages and costs
+ (collectively &ldquo;Losses&rdquo;) arising from claims, lawsuits and other legal actions
+ brought by a third party against the Indemnified Contributor to the extent
+ caused by the acts or omissions of such Commercial Contributor in connection
+ with its distribution of the Program in a commercial product offering.
+ The obligations in this section do not apply to any claims or Losses relating
+ to any actual or alleged intellectual property infringement. In order to
+ qualify, an Indemnified Contributor must: a) promptly notify the
+ Commercial Contributor in writing of such claim, and b) allow the Commercial
+ Contributor to control, and cooperate with the Commercial Contributor in,
+ the defense and any related settlement negotiations. The Indemnified
+ Contributor may participate in any such claim at its own expense.
+ </p>
+ <p>For example, a Contributor might include the Program
+ in a commercial product offering, Product X. That Contributor is then a
+ Commercial Contributor. If that Commercial Contributor then makes performance
+ claims, or offers warranties related to Product X, those performance claims
+ and warranties are such Commercial Contributor&#039;s responsibility alone.
+ Under this section, the Commercial Contributor would have to defend claims
+ against the other Contributors related to those performance claims and
+ warranties, and if a court requires any other Contributor to pay any damages
+ as a result, the Commercial Contributor must pay those damages.
+ </p>
+ <h2 id="warranty">5. NO WARRANTY</h2>
+ <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
+ BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN &ldquo;AS IS&rdquo; BASIS, WITHOUT
+ WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
+ WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+ MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is
+ solely responsible for determining the appropriateness of using and
+ distributing the Program and assumes all risks associated with its
+ exercise of rights under this Agreement, including but not limited to the
+ risks and costs of program errors, compliance with applicable laws, damage
+ to or loss of data, programs or equipment, and unavailability or
+ interruption of operations.
+ </p>
+ <h2 id="disclaimer">6. DISCLAIMER OF LIABILITY</h2>
+ <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
+ BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY
+ LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS),
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
+ GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ </p>
+ <h2 id="general">7. GENERAL</h2>
+ <p>If any provision of this Agreement is invalid or unenforceable under
+ applicable law, it shall not affect the validity or enforceability of the
+ remainder of the terms of this Agreement, and without further action by the
+ parties hereto, such provision shall be reformed to the minimum extent
+ necessary to make such provision valid and enforceable.
+ </p>
+ <p>If Recipient institutes patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Program itself
+ (excluding combinations of the Program with other software or hardware)
+ infringes such Recipient&#039;s patent(s), then such Recipient&#039;s rights granted
+ under Section 2(b) shall terminate as of the date such litigation is filed.
+ </p>
+ <p>All Recipient&#039;s rights under this Agreement shall terminate if it fails to
+ comply with any of the material terms or conditions of this Agreement and
+ does not cure such failure in a reasonable period of time after becoming
+ aware of such noncompliance. If all Recipient&#039;s rights under this Agreement
+ terminate, Recipient agrees to cease use and distribution of the Program
+ as soon as reasonably practicable. However, Recipient&#039;s obligations under
+ this Agreement and any licenses granted by Recipient relating to the
+ Program shall continue and survive.
+ </p>
+ <p>Everyone is permitted to copy and distribute copies of this Agreement,
+ but in order to avoid inconsistency the Agreement is copyrighted and may
+ only be modified in the following manner. The Agreement Steward reserves
+ the right to publish new versions (including revisions) of this Agreement
+ from time to time. No one other than the Agreement Steward has the right
+ to modify this Agreement. The Eclipse Foundation is the initial Agreement
+ Steward. The Eclipse Foundation may assign the responsibility to serve as
+ the Agreement Steward to a suitable separate entity. Each new version of
+ the Agreement will be given a distinguishing version number. The Program
+ (including Contributions) may always be Distributed subject to the version
+ of the Agreement under which it was received. In addition, after a new
+ version of the Agreement is published, Contributor may elect to Distribute
+ the Program (including its Contributions) under the new version.
+ </p>
+ <p>Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+ receives no rights or licenses to the intellectual property of any
+ Contributor under this Agreement, whether expressly, by implication,
+ estoppel or otherwise. All rights in the Program not expressly granted
+ under this Agreement are reserved. Nothing in this Agreement is intended
+ to be enforceable by any entity that is not a Contributor or Recipient.
+ No third-party beneficiary rights are created under this Agreement.
+ </p>
+ <h2 id="exhibit-a">Exhibit A &ndash; Form of Secondary Licenses Notice</h2>
+ <p>&ldquo;This Source Code may also be made available under the following
+ Secondary Licenses when the conditions for such availability set forth
+ in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+ version(s), and exceptions or additional permissions here}.&rdquo;
+ </p>
+ <blockquote>
+ <p>Simply including a copy of this Agreement, including this Exhibit A
+ is not sufficient to license the Source Code under Secondary Licenses.
+ </p>
+ <p>If it is not possible or desirable to put the notice in a particular file,
+ then You may include the notice in a location (such as a LICENSE file in a
+ relevant directory) where a recipient would be likely to look for
+ such a notice.
+ </p>
+ <p>You may add additional accurate notices of copyright ownership.</p>
+ </blockquote>
+ </body>
+</html> \ No newline at end of file
diff --git a/features/org.eclipse.emf.diffmerge.patch.feature/feature.properties b/features/org.eclipse.emf.diffmerge.patch.feature/feature.properties
index e69de29..4685578 100644
--- a/features/org.eclipse.emf.diffmerge.patch.feature/feature.properties
+++ b/features/org.eclipse.emf.diffmerge.patch.feature/feature.properties
@@ -0,0 +1,173 @@
+###############################################################################
+# Copyright (c) 2016-2018 Thales Global Services S.A.S.
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+###############################################################################
+featureName = Model Patch Feature (Incubation)
+providerName = Eclipse Modeling Project
+
+description = EMF Diff/Merge Model Patch feature
+
+copyright=\
+Copyright (c) 2016-2018 Thales Global Services S.A.S.\n\
+This program and the accompanying materials are made\n\
+available under the terms of the Eclipse Public License 2.0\n\
+which is available at https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
+\n\
+Contributors:\n\
+Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel\n\
+Segesdi (IncQuery Labs Ltd.) - initial API and implementation\n
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+\n\
+November 22, 2017\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION\n\
+AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF\n\
+THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE\n\
+TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED\n\
+BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\
+AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY\n\
+APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU\n\
+MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public License\n\
+Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also\n\
+available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,\n\
+"Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code, documentation\n\
+and other files maintained in the Eclipse Foundation source code repository\n\
+("Repository") in software modules ("Modules") and made available as\n\
+downloadable archives ("Downloads").\n\
+\n\
+- Content may be structured and packaged into modules to facilitate\n\
+ delivering, extending, and upgrading the Content. Typical modules may\n\
+ include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and\n\
+ features ("Features").\n\
+- Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\
+ (Java\u2122 ARchive) in a directory named "plugins".\n\
+- A Feature is a bundle of one or more Plug-ins and/or Fragments and\n\
+ associated material. Each Feature may be packaged as a sub-directory in a\n\
+ directory named "features". Within a Feature, files named "feature.xml" may\n\
+ contain a list of the names and version numbers of the Plug-ins and/or\n\
+ Fragments associated with that Feature.\n\
+- Features may also include other Features ("Included Features"). Within a\n\
+ Feature, files named "feature.xml" may contain a list of the names and\n\
+ version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be contained in\n\
+files named "about.html" ("Abouts"). The terms and conditions governing Features\n\
+and Included Features should be contained in files named "license.html"\n\
+("Feature Licenses"). Abouts and Feature Licenses may be located in any\n\
+directory of a Download or Module including, but not limited to the following\n\
+locations:\n\
+\n\
+- The top-level (root) directory\n\
+- Plug-in and Fragment directories\n\
+- Inside Plug-ins and Fragments packaged as JARs\n\
+- Sub-directories of the directory named "src" of certain Plug-ins\n\
+- Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using\n\
+the Provisioning Technology (as defined below), you must agree to a license\n\
+("Feature Update License") during the installation process. If the Feature\n\
+contains Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform you\n\
+where you can locate them. Feature Update Licenses may be found in the "license"\n\
+property of files named "feature.properties" found within a Feature. Such\n\
+Abouts, Feature Licenses, and Feature Update Licenses contain the terms and\n\
+conditions (or references to such terms and conditions) that govern your use of\n\
+the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL\n\
+OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE\n\
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+- Eclipse Public License Version 1.0 (available at\n\
+ http://www.eclipse.org/legal/epl-v10.html)\n\
+- Eclipse Distribution License Version 1.0 (available at\n\
+ http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+- Common Public License Version 1.0 (available at\n\
+ http://www.eclipse.org/legal/cpl-v10.html)\n\
+- Apache Software License 1.1 (available at\n\
+ http://www.apache.org/licenses/LICENSE)\n\
+- Apache Software License 2.0 (available at\n\
+ http://www.apache.org/licenses/LICENSE-2.0)\n\
+- Mozilla Public License Version 1.1 (available at\n\
+ http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO\n\
+USE OF THE CONTENT. If no About, Feature License, or Feature Update License is\n\
+provided, please contact the Eclipse Foundation to determine what terms and\n\
+conditions govern that particular Content.\n\
+\n\
+Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which\n\
+include, but are not limited to, p2 and the Eclipse Update Manager\n\
+("Provisioning Technology") for the purpose of allowing users to install\n\
+software, documentation, information and/or other materials (collectively\n\
+"Installable Software"). This capability is provided with the intent of allowing\n\
+such users to install, extend and update Eclipse-based products. Information\n\
+about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install\n\
+Installable Software. You shall be responsible for enabling the applicable\n\
+license agreements relating to the Installable Software to be presented to, and\n\
+accepted by, the users of the Provisioning Technology in accordance with the\n\
+Specification. By using Provisioning Technology in such a manner and making it\n\
+available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the\n\
+following:\n\
+\n\
+1. A series of actions may occur ("Provisioning Process") in which a user may\n\
+ execute the Provisioning Technology on a machine ("Target Machine") with the\n\
+ intent of installing, extending or updating the functionality of an\n\
+ Eclipse-based product.\n\
+2. During the Provisioning Process, the Provisioning Technology may cause third\n\
+ party Installable Software or a portion thereof to be accessed and copied to\n\
+ the Target Machine.\n\
+3. Pursuant to the Specification, you will provide to the user the terms and\n\
+ conditions that govern the use of the Installable Software ("Installable\n\
+ Software Agreement") and such Installable Software Agreement shall be\n\
+ accessed from the Target Machine in accordance with the Specification. Such\n\
+ Installable Software Agreement must inform the user of the terms and\n\
+ conditions that govern the Installable Software and must solicit acceptance\n\
+ by the end user in the manner prescribed in such Installable\n\
+ Software Agreement. Upon such indication of agreement by the user, the\n\
+ provisioning Technology will complete installation of the\n\
+ Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are currently\n\
+may have restrictions on the import, possession, and use, and/or re-export to\n\
+another country, of encryption software. BEFORE using any encryption software,\n\
+please check the country's laws, regulations and policies concerning the import,\n\
+possession, or use, and re-export of encryption software, to see if this is\n\
+permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the\n\
+United States, other countries, or both.\n
+########### end of license property ##########################################
diff --git a/features/org.eclipse.emf.diffmerge.patch.feature/feature.xml b/features/org.eclipse.emf.diffmerge.patch.feature/feature.xml
index 60f3959..4e3fb4d 100644
--- a/features/org.eclipse.emf.diffmerge.patch.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.patch.feature/feature.xml
@@ -1,32 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
-
- Contributors:
- Abel Hegedus, Tamas Borbas, Balazs Grill, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
+ Copyright (c) 2016-2018 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
+
+ Contributors:
+ Abel Hegedus, Tamas Borbas, Balazs Grill, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
-->
<feature
id="org.eclipse.emf.diffmerge.patch.feature"
- label="Model Patch Feature"
+ label="%featureName"
version="0.1.0.qualifier"
- provider-name="Eclipse Modeling Project"
+ provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
<description>
- EMF Diff/Merge Model Patch feature
+ %description
</description>
- <copyright url="http://www.eclipse.org/legal/epl-v10.html">
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
- Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
+ <copyright>
+ %copyright
</copyright>
<license url="%licenseURL">
diff --git a/features/org.eclipse.emf.diffmerge.patch.feature/license.html b/features/org.eclipse.emf.diffmerge.patch.feature/license.html
index f19c483..008b801 100644
--- a/features/org.eclipse.emf.diffmerge.patch.feature/license.html
+++ b/features/org.eclipse.emf.diffmerge.patch.feature/license.html
@@ -7,102 +7,183 @@
</head>
<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>February 1, 2011</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY &quot;CONTENT&quot;). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- (&quot;EPL&quot;). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
- repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;. Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
- Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
- other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
- install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
- href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
- (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
- applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
- in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
- Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
- <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
- on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
- product.</li>
- <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
- accessed and copied to the Target Machine.</li>
- <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
- Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
- Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
- the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
- indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+ <h2>Eclipse Foundation Software User Agreement</h2>
+ <p>November 22, 2017</p>
+
+ <h3>Usage Of Content</h3>
+
+ <p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION,
+ INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+ (COLLECTIVELY &quot;CONTENT&quot;). USE OF THE CONTENT IS GOVERNED BY
+ THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+ CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
+ BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS
+ GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY
+ APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
+ BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS
+ AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
+ AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT
+ USE THE CONTENT.</p>
+
+ <h3>Applicable Licenses</h3>
+
+ <p>
+ Unless otherwise indicated, all Content made available by the Eclipse
+ Foundation is provided to you under the terms and conditions of the
+ Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the
+ EPL is provided with this Content and is also available at <a
+ href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+ For purposes of the EPL, &quot;Program&quot; will mean the Content.
+ </p>
+
+ <p>Content includes, but is not limited to, source code, object
+ code, documentation and other files maintained in the Eclipse
+ Foundation source code repository (&quot;Repository&quot;) in software
+ modules (&quot;Modules&quot;) and made available as downloadable
+ archives (&quot;Downloads&quot;).</p>
+
+ <ul>
+ <li>Content may be structured and packaged into modules to
+ facilitate delivering, extending, and upgrading the Content. Typical
+ modules may include plug-ins (&quot;Plug-ins&quot;), plug-in
+ fragments (&quot;Fragments&quot;), and features
+ (&quot;Features&quot;).</li>
+ <li>Each Plug-in or Fragment may be packaged as a sub-directory
+ or JAR (Java&trade; ARchive) in a directory named
+ &quot;plugins&quot;.</li>
+ <li>A Feature is a bundle of one or more Plug-ins and/or
+ Fragments and associated material. Each Feature may be packaged as a
+ sub-directory in a directory named &quot;features&quot;. Within a
+ Feature, files named &quot;feature.xml&quot; may contain a list of
+ the names and version numbers of the Plug-ins and/or Fragments
+ associated with that Feature.</li>
+ <li>Features may also include other Features (&quot;Included
+ Features&quot;). Within a Feature, files named
+ &quot;feature.xml&quot; may contain a list of the names and version
+ numbers of Included Features.</li>
+ </ul>
+
+ <p>The terms and conditions governing Plug-ins and Fragments should
+ be contained in files named &quot;about.html&quot;
+ (&quot;Abouts&quot;). The terms and conditions governing Features and
+ Included Features should be contained in files named
+ &quot;license.html&quot; (&quot;Feature Licenses&quot;). Abouts and
+ Feature Licenses may be located in any directory of a Download or
+ Module including, but not limited to the following locations:</p>
+
+ <ul>
+ <li>The top-level (root) directory</li>
+ <li>Plug-in and Fragment directories</li>
+ <li>Inside Plug-ins and Fragments packaged as JARs</li>
+ <li>Sub-directories of the directory named &quot;src&quot; of
+ certain Plug-ins</li>
+ <li>Feature directories</li>
+ </ul>
+
+ <p>Note: if a Feature made available by the Eclipse Foundation is
+ installed using the Provisioning Technology (as defined below), you
+ must agree to a license (&quot;Feature Update License&quot;) during
+ the installation process. If the Feature contains Included Features,
+ the Feature Update License should either provide you with the terms
+ and conditions governing the Included Features or inform you where you
+ can locate them. Feature Update Licenses may be found in the
+ &quot;license&quot; property of files named
+ &quot;feature.properties&quot; found within a Feature. Such Abouts,
+ Feature Licenses, and Feature Update Licenses contain the terms and
+ conditions (or references to such terms and conditions) that govern
+ your use of the associated Content in that directory.</p>
+
+ <p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY
+ REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND
+ CONDITIONS. SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT
+ ARE NOT LIMITED TO):</p>
+
+ <ul>
+ <li>Eclipse Public License Version 1.0 (available at <a
+ href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>)
+ </li>
+ <li>Eclipse Distribution License Version 1.0 (available at <a
+ href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)
+ </li>
+ <li>Common Public License Version 1.0 (available at <a
+ href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)
+ </li>
+ <li>Apache Software License 1.1 (available at <a
+ href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)
+ </li>
+ <li>Apache Software License 2.0 (available at <a
+ href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)
+ </li>
+ <li>Mozilla Public License Version 1.1 (available at <a
+ href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)
+ </li>
+ </ul>
+
+ <p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND
+ CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License,
+ or Feature Update License is provided, please contact the Eclipse
+ Foundation to determine what terms and conditions govern that
+ particular Content.</p>
+
+
+ <h3>Use of Provisioning Technology</h3>
+
+ <p>
+ The Eclipse Foundation makes available provisioning software, examples
+ of which include, but are not limited to, p2 and the Eclipse Update
+ Manager (&quot;Provisioning Technology&quot;) for the purpose of
+ allowing users to install software, documentation, information and/or
+ other materials (collectively &quot;Installable Software&quot;). This
+ capability is provided with the intent of allowing such users to
+ install, extend and update Eclipse-based products. Information about
+ packaging Installable Software is available at <a
+ href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+ (&quot;Specification&quot;).
+ </p>
+
+ <p>You may use Provisioning Technology to allow other parties to
+ install Installable Software. You shall be responsible for enabling
+ the applicable license agreements relating to the Installable Software
+ to be presented to, and accepted by, the users of the Provisioning
+ Technology in accordance with the Specification. By using Provisioning
+ Technology in such a manner and making it available in accordance with
+ the Specification, you further acknowledge your agreement to, and the
+ acquisition of all necessary rights to permit the following:</p>
+
+ <ol>
+ <li>A series of actions may occur (&quot;Provisioning
+ Process&quot;) in which a user may execute the Provisioning
+ Technology on a machine (&quot;Target Machine&quot;) with the intent
+ of installing, extending or updating the functionality of an
+ Eclipse-based product.</li>
+ <li>During the Provisioning Process, the Provisioning Technology
+ may cause third party Installable Software or a portion thereof to be
+ accessed and copied to the Target Machine.</li>
+ <li>Pursuant to the Specification, you will provide to the user
+ the terms and conditions that govern the use of the Installable
+ Software (&quot;Installable Software Agreement&quot;) and such
+ Installable Software Agreement shall be accessed from the Target
+ Machine in accordance with the Specification. Such Installable
+ Software Agreement must inform the user of the terms and conditions
+ that govern the Installable Software and must solicit acceptance by
+ the end user in the manner prescribed in such Installable Software
+ Agreement. Upon such indication of agreement by the user, the
+ provisioning Technology will complete installation of the Installable
+ Software.</li>
+ </ol>
+
+ <h3>Cryptography</h3>
+
+ <p>Content may contain encryption software. The country in which
+ you are currently may have restrictions on the import, possession, and
+ use, and/or re-export to another country, of encryption software.
+ BEFORE using any encryption software, please check the country's laws,
+ regulations and policies concerning the import, possession, or use,
+ and re-export of encryption software, to see if this is permitted.</p>
+
+ <p>
+ <small>Java and all Java-based trademarks are trademarks of
+ Oracle Corporation in the United States, other countries, or both.</small>
+ </p>
</body>
</html>
diff --git a/features/org.eclipse.emf.diffmerge.patch.feature/pom.xml b/features/org.eclipse.emf.diffmerge.patch.feature/pom.xml
index 464009d..b56da71 100644
--- a/features/org.eclipse.emf.diffmerge.patch.feature/pom.xml
+++ b/features/org.eclipse.emf.diffmerge.patch.feature/pom.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- 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
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Balazs Grill, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/features/org.eclipse.emf.diffmerge.patch.runtime.feature/build.properties b/features/org.eclipse.emf.diffmerge.patch.runtime.feature/build.properties
index 8719cf7..8eb0d6a 100644
--- a/features/org.eclipse.emf.diffmerge.patch.runtime.feature/build.properties
+++ b/features/org.eclipse.emf.diffmerge.patch.runtime.feature/build.properties
@@ -1,15 +1,15 @@
###############################################################################
# Copyright (c) 2016-2017 Thales Global Services S.A.S.
-# 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
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Abel Hegedus, Tamas Borbas, Balazs Grill, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
###############################################################################
bin.includes = feature.xml,\
- epl-v10.html,\
+ epl-v20.html,\
license.html,\
feature.properties
-src.includes = feature.properties
diff --git a/features/org.eclipse.emf.diffmerge.patch.runtime.feature/epl-v10.html b/features/org.eclipse.emf.diffmerge.patch.runtime.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.emf.diffmerge.patch.runtime.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html> \ No newline at end of file
diff --git a/features/org.eclipse.emf.diffmerge.patch.runtime.feature/epl-v20.html b/features/org.eclipse.emf.diffmerge.patch.runtime.feature/epl-v20.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.emf.diffmerge.patch.runtime.feature/epl-v20.html
@@ -0,0 +1,300 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>Eclipse Public License - Version 2.0</title>
+ <style type="text/css">
+ body {
+ margin: 1.5em 3em;
+ }
+ h1{
+ font-size:1.5em;
+ }
+ h2{
+ font-size:1em;
+ margin-bottom:0.5em;
+ margin-top:1em;
+ }
+ p {
+ margin-top: 0.5em;
+ margin-bottom: 0.5em;
+ }
+ ul, ol{
+ list-style-type:none;
+ }
+ </style>
+ </head>
+ <body>
+ <h1>Eclipse Public License - v 2.0</h1>
+ <p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+ PUBLIC LICENSE (&ldquo;AGREEMENT&rdquo;). ANY USE, REPRODUCTION OR DISTRIBUTION
+ OF THE PROGRAM CONSTITUTES RECIPIENT&#039;S ACCEPTANCE OF THIS AGREEMENT.
+ </p>
+ <h2 id="definitions">1. DEFINITIONS</h2>
+ <p>&ldquo;Contribution&rdquo; means:</p>
+ <ul>
+ <li>a) in the case of the initial Contributor, the initial content
+ Distributed under this Agreement, and
+ </li>
+ <li>
+ b) in the case of each subsequent Contributor:
+ <ul>
+ <li>i) changes to the Program, and</li>
+ <li>ii) additions to the Program;</li>
+ </ul>
+ where such changes and/or additions to the Program originate from
+ and are Distributed by that particular Contributor. A Contribution
+ &ldquo;originates&rdquo; from a Contributor if it was added to the Program by such
+ Contributor itself or anyone acting on such Contributor&#039;s behalf.
+ Contributions do not include changes or additions to the Program that
+ are not Modified Works.
+ </li>
+ </ul>
+ <p>&ldquo;Contributor&rdquo; means any person or entity that Distributes the Program.</p>
+ <p>&ldquo;Licensed Patents&rdquo; mean patent claims licensable by a Contributor which
+ are necessarily infringed by the use or sale of its Contribution alone
+ or when combined with the Program.
+ </p>
+ <p>&ldquo;Program&rdquo; means the Contributions Distributed in accordance with this
+ Agreement.
+ </p>
+ <p>&ldquo;Recipient&rdquo; means anyone who receives the Program under this Agreement
+ or any Secondary License (as applicable), including Contributors.
+ </p>
+ <p>&ldquo;Derivative Works&rdquo; shall mean any work, whether in Source Code or other
+ form, that is based on (or derived from) the Program and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship.
+ </p>
+ <p>&ldquo;Modified Works&rdquo; shall mean any work in Source Code or other form that
+ results from an addition to, deletion from, or modification of the
+ contents of the Program, including, for purposes of clarity any new file
+ in Source Code form that contains any contents of the Program. Modified
+ Works shall not include works that contain only declarations, interfaces,
+ types, classes, structures, or files of the Program solely in each case
+ in order to link to, bind by name, or subclass the Program or Modified
+ Works thereof.
+ </p>
+ <p>&ldquo;Distribute&rdquo; means the acts of a) distributing or b) making available
+ in any manner that enables the transfer of a copy.
+ </p>
+ <p>&ldquo;Source Code&rdquo; means the form of a Program preferred for making
+ modifications, including but not limited to software source code,
+ documentation source, and configuration files.
+ </p>
+ <p>&ldquo;Secondary License&rdquo; means either the GNU General Public License,
+ Version 2.0, or any later versions of that license, including any
+ exceptions or additional permissions as identified by the initial
+ Contributor.
+ </p>
+ <h2 id="grant-of-rights">2. GRANT OF RIGHTS</h2>
+ <ul>
+ <li>a) Subject to the terms of this Agreement, each Contributor hereby
+ grants Recipient a non-exclusive, worldwide, royalty-free copyright
+ license to reproduce, prepare Derivative Works of, publicly display,
+ publicly perform, Distribute and sublicense the Contribution of such
+ Contributor, if any, and such Derivative Works.
+ </li>
+ <li>b) Subject to the terms of this Agreement, each Contributor hereby
+ grants Recipient a non-exclusive, worldwide, royalty-free patent
+ license under Licensed Patents to make, use, sell, offer to sell,
+ import and otherwise transfer the Contribution of such Contributor,
+ if any, in Source Code or other form. This patent license shall
+ apply to the combination of the Contribution and the Program if,
+ at the time the Contribution is added by the Contributor, such
+ addition of the Contribution causes such combination to be covered
+ by the Licensed Patents. The patent license shall not apply to any
+ other combinations which include the Contribution. No hardware per
+ se is licensed hereunder.
+ </li>
+ <li>c) Recipient understands that although each Contributor grants the
+ licenses to its Contributions set forth herein, no assurances are
+ provided by any Contributor that the Program does not infringe the
+ patent or other intellectual property rights of any other entity.
+ Each Contributor disclaims any liability to Recipient for claims
+ brought by any other entity based on infringement of intellectual
+ property rights or otherwise. As a condition to exercising the rights
+ and licenses granted hereunder, each Recipient hereby assumes sole
+ responsibility to secure any other intellectual property rights needed,
+ if any. For example, if a third party patent license is required to
+ allow Recipient to Distribute the Program, it is Recipient&#039;s
+ responsibility to acquire that license before distributing the Program.
+ </li>
+ <li>d) Each Contributor represents that to its knowledge it has sufficient
+ copyright rights in its Contribution, if any, to grant the copyright
+ license set forth in this Agreement.
+ </li>
+ <li>e) Notwithstanding the terms of any Secondary License, no Contributor
+ makes additional grants to any Recipient (other than those set forth
+ in this Agreement) as a result of such Recipient&#039;s receipt of the
+ Program under the terms of a Secondary License (if permitted under
+ the terms of Section 3).
+ </li>
+ </ul>
+ <h2 id="requirements">3. REQUIREMENTS</h2>
+ <p>3.1 If a Contributor Distributes the Program in any form, then:</p>
+ <ul>
+ <li>a) the Program must also be made available as Source Code, in
+ accordance with section 3.2, and the Contributor must accompany
+ the Program with a statement that the Source Code for the Program
+ is available under this Agreement, and informs Recipients how to
+ obtain it in a reasonable manner on or through a medium customarily
+ used for software exchange; and
+ </li>
+ <li>
+ b) the Contributor may Distribute the Program under a license
+ different than this Agreement, provided that such license:
+ <ul>
+ <li>i) effectively disclaims on behalf of all other Contributors all
+ warranties and conditions, express and implied, including warranties
+ or conditions of title and non-infringement, and implied warranties
+ or conditions of merchantability and fitness for a particular purpose;
+ </li>
+ <li>ii) effectively excludes on behalf of all other Contributors all
+ liability for damages, including direct, indirect, special, incidental
+ and consequential damages, such as lost profits;
+ </li>
+ <li>iii) does not attempt to limit or alter the recipients&#039; rights in the
+ Source Code under section 3.2; and
+ </li>
+ <li>iv) requires any subsequent distribution of the Program by any party
+ to be under a license that satisfies the requirements of this section 3.
+ </li>
+ </ul>
+ </li>
+ </ul>
+ <p>3.2 When the Program is Distributed as Source Code:</p>
+ <ul>
+ <li>a) it must be made available under this Agreement, or if the Program (i)
+ is combined with other material in a separate file or files made available
+ under a Secondary License, and (ii) the initial Contributor attached to
+ the Source Code the notice described in Exhibit A of this Agreement,
+ then the Program may be made available under the terms of such
+ Secondary Licenses, and
+ </li>
+ <li>b) a copy of this Agreement must be included with each copy of the Program.</li>
+ </ul>
+ <p>3.3 Contributors may not remove or alter any copyright, patent, trademark,
+ attribution notices, disclaimers of warranty, or limitations of liability
+ (&lsquo;notices&rsquo;) contained within the Program from any copy of the Program which
+ they Distribute, provided that Contributors may add their own appropriate
+ notices.
+ </p>
+ <h2 id="commercial-distribution">4. COMMERCIAL DISTRIBUTION</h2>
+ <p>Commercial distributors of software may accept certain responsibilities
+ with respect to end users, business partners and the like. While this
+ license is intended to facilitate the commercial use of the Program, the
+ Contributor who includes the Program in a commercial product offering should
+ do so in a manner which does not create potential liability for other
+ Contributors. Therefore, if a Contributor includes the Program in a
+ commercial product offering, such Contributor (&ldquo;Commercial Contributor&rdquo;)
+ hereby agrees to defend and indemnify every other Contributor
+ (&ldquo;Indemnified Contributor&rdquo;) against any losses, damages and costs
+ (collectively &ldquo;Losses&rdquo;) arising from claims, lawsuits and other legal actions
+ brought by a third party against the Indemnified Contributor to the extent
+ caused by the acts or omissions of such Commercial Contributor in connection
+ with its distribution of the Program in a commercial product offering.
+ The obligations in this section do not apply to any claims or Losses relating
+ to any actual or alleged intellectual property infringement. In order to
+ qualify, an Indemnified Contributor must: a) promptly notify the
+ Commercial Contributor in writing of such claim, and b) allow the Commercial
+ Contributor to control, and cooperate with the Commercial Contributor in,
+ the defense and any related settlement negotiations. The Indemnified
+ Contributor may participate in any such claim at its own expense.
+ </p>
+ <p>For example, a Contributor might include the Program
+ in a commercial product offering, Product X. That Contributor is then a
+ Commercial Contributor. If that Commercial Contributor then makes performance
+ claims, or offers warranties related to Product X, those performance claims
+ and warranties are such Commercial Contributor&#039;s responsibility alone.
+ Under this section, the Commercial Contributor would have to defend claims
+ against the other Contributors related to those performance claims and
+ warranties, and if a court requires any other Contributor to pay any damages
+ as a result, the Commercial Contributor must pay those damages.
+ </p>
+ <h2 id="warranty">5. NO WARRANTY</h2>
+ <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
+ BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN &ldquo;AS IS&rdquo; BASIS, WITHOUT
+ WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
+ WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+ MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is
+ solely responsible for determining the appropriateness of using and
+ distributing the Program and assumes all risks associated with its
+ exercise of rights under this Agreement, including but not limited to the
+ risks and costs of program errors, compliance with applicable laws, damage
+ to or loss of data, programs or equipment, and unavailability or
+ interruption of operations.
+ </p>
+ <h2 id="disclaimer">6. DISCLAIMER OF LIABILITY</h2>
+ <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
+ BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY
+ LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS),
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
+ GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ </p>
+ <h2 id="general">7. GENERAL</h2>
+ <p>If any provision of this Agreement is invalid or unenforceable under
+ applicable law, it shall not affect the validity or enforceability of the
+ remainder of the terms of this Agreement, and without further action by the
+ parties hereto, such provision shall be reformed to the minimum extent
+ necessary to make such provision valid and enforceable.
+ </p>
+ <p>If Recipient institutes patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Program itself
+ (excluding combinations of the Program with other software or hardware)
+ infringes such Recipient&#039;s patent(s), then such Recipient&#039;s rights granted
+ under Section 2(b) shall terminate as of the date such litigation is filed.
+ </p>
+ <p>All Recipient&#039;s rights under this Agreement shall terminate if it fails to
+ comply with any of the material terms or conditions of this Agreement and
+ does not cure such failure in a reasonable period of time after becoming
+ aware of such noncompliance. If all Recipient&#039;s rights under this Agreement
+ terminate, Recipient agrees to cease use and distribution of the Program
+ as soon as reasonably practicable. However, Recipient&#039;s obligations under
+ this Agreement and any licenses granted by Recipient relating to the
+ Program shall continue and survive.
+ </p>
+ <p>Everyone is permitted to copy and distribute copies of this Agreement,
+ but in order to avoid inconsistency the Agreement is copyrighted and may
+ only be modified in the following manner. The Agreement Steward reserves
+ the right to publish new versions (including revisions) of this Agreement
+ from time to time. No one other than the Agreement Steward has the right
+ to modify this Agreement. The Eclipse Foundation is the initial Agreement
+ Steward. The Eclipse Foundation may assign the responsibility to serve as
+ the Agreement Steward to a suitable separate entity. Each new version of
+ the Agreement will be given a distinguishing version number. The Program
+ (including Contributions) may always be Distributed subject to the version
+ of the Agreement under which it was received. In addition, after a new
+ version of the Agreement is published, Contributor may elect to Distribute
+ the Program (including its Contributions) under the new version.
+ </p>
+ <p>Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+ receives no rights or licenses to the intellectual property of any
+ Contributor under this Agreement, whether expressly, by implication,
+ estoppel or otherwise. All rights in the Program not expressly granted
+ under this Agreement are reserved. Nothing in this Agreement is intended
+ to be enforceable by any entity that is not a Contributor or Recipient.
+ No third-party beneficiary rights are created under this Agreement.
+ </p>
+ <h2 id="exhibit-a">Exhibit A &ndash; Form of Secondary Licenses Notice</h2>
+ <p>&ldquo;This Source Code may also be made available under the following
+ Secondary Licenses when the conditions for such availability set forth
+ in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+ version(s), and exceptions or additional permissions here}.&rdquo;
+ </p>
+ <blockquote>
+ <p>Simply including a copy of this Agreement, including this Exhibit A
+ is not sufficient to license the Source Code under Secondary Licenses.
+ </p>
+ <p>If it is not possible or desirable to put the notice in a particular file,
+ then You may include the notice in a location (such as a LICENSE file in a
+ relevant directory) where a recipient would be likely to look for
+ such a notice.
+ </p>
+ <p>You may add additional accurate notices of copyright ownership.</p>
+ </blockquote>
+ </body>
+</html> \ No newline at end of file
diff --git a/features/org.eclipse.emf.diffmerge.patch.runtime.feature/feature.properties b/features/org.eclipse.emf.diffmerge.patch.runtime.feature/feature.properties
index e69de29..aacaabc 100644
--- a/features/org.eclipse.emf.diffmerge.patch.runtime.feature/feature.properties
+++ b/features/org.eclipse.emf.diffmerge.patch.runtime.feature/feature.properties
@@ -0,0 +1,173 @@
+###############################################################################
+# Copyright (c) 2016-2018 Thales Global Services S.A.S.
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+###############################################################################
+featureName = Model Patch Runtime Feature (Incubation)
+providerName = Eclipse Modeling Project
+
+description = EMF Diff/Merge Model Patch Runtime feature
+
+copyright=\
+Copyright (c) 2016-2018 Thales Global Services S.A.S.\n\
+This program and the accompanying materials are made\n\
+available under the terms of the Eclipse Public License 2.0\n\
+which is available at https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
+\n\
+Contributors:\n\
+Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel\n\
+Segesdi (IncQuery Labs Ltd.) - initial API and implementation\n
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+\n\
+November 22, 2017\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION\n\
+AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF\n\
+THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE\n\
+TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED\n\
+BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\
+AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY\n\
+APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU\n\
+MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public License\n\
+Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also\n\
+available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,\n\
+"Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code, documentation\n\
+and other files maintained in the Eclipse Foundation source code repository\n\
+("Repository") in software modules ("Modules") and made available as\n\
+downloadable archives ("Downloads").\n\
+\n\
+- Content may be structured and packaged into modules to facilitate\n\
+ delivering, extending, and upgrading the Content. Typical modules may\n\
+ include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and\n\
+ features ("Features").\n\
+- Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\
+ (Java\u2122 ARchive) in a directory named "plugins".\n\
+- A Feature is a bundle of one or more Plug-ins and/or Fragments and\n\
+ associated material. Each Feature may be packaged as a sub-directory in a\n\
+ directory named "features". Within a Feature, files named "feature.xml" may\n\
+ contain a list of the names and version numbers of the Plug-ins and/or\n\
+ Fragments associated with that Feature.\n\
+- Features may also include other Features ("Included Features"). Within a\n\
+ Feature, files named "feature.xml" may contain a list of the names and\n\
+ version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be contained in\n\
+files named "about.html" ("Abouts"). The terms and conditions governing Features\n\
+and Included Features should be contained in files named "license.html"\n\
+("Feature Licenses"). Abouts and Feature Licenses may be located in any\n\
+directory of a Download or Module including, but not limited to the following\n\
+locations:\n\
+\n\
+- The top-level (root) directory\n\
+- Plug-in and Fragment directories\n\
+- Inside Plug-ins and Fragments packaged as JARs\n\
+- Sub-directories of the directory named "src" of certain Plug-ins\n\
+- Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using\n\
+the Provisioning Technology (as defined below), you must agree to a license\n\
+("Feature Update License") during the installation process. If the Feature\n\
+contains Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform you\n\
+where you can locate them. Feature Update Licenses may be found in the "license"\n\
+property of files named "feature.properties" found within a Feature. Such\n\
+Abouts, Feature Licenses, and Feature Update Licenses contain the terms and\n\
+conditions (or references to such terms and conditions) that govern your use of\n\
+the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL\n\
+OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE\n\
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+- Eclipse Public License Version 1.0 (available at\n\
+ http://www.eclipse.org/legal/epl-v10.html)\n\
+- Eclipse Distribution License Version 1.0 (available at\n\
+ http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+- Common Public License Version 1.0 (available at\n\
+ http://www.eclipse.org/legal/cpl-v10.html)\n\
+- Apache Software License 1.1 (available at\n\
+ http://www.apache.org/licenses/LICENSE)\n\
+- Apache Software License 2.0 (available at\n\
+ http://www.apache.org/licenses/LICENSE-2.0)\n\
+- Mozilla Public License Version 1.1 (available at\n\
+ http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO\n\
+USE OF THE CONTENT. If no About, Feature License, or Feature Update License is\n\
+provided, please contact the Eclipse Foundation to determine what terms and\n\
+conditions govern that particular Content.\n\
+\n\
+Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which\n\
+include, but are not limited to, p2 and the Eclipse Update Manager\n\
+("Provisioning Technology") for the purpose of allowing users to install\n\
+software, documentation, information and/or other materials (collectively\n\
+"Installable Software"). This capability is provided with the intent of allowing\n\
+such users to install, extend and update Eclipse-based products. Information\n\
+about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install\n\
+Installable Software. You shall be responsible for enabling the applicable\n\
+license agreements relating to the Installable Software to be presented to, and\n\
+accepted by, the users of the Provisioning Technology in accordance with the\n\
+Specification. By using Provisioning Technology in such a manner and making it\n\
+available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the\n\
+following:\n\
+\n\
+1. A series of actions may occur ("Provisioning Process") in which a user may\n\
+ execute the Provisioning Technology on a machine ("Target Machine") with the\n\
+ intent of installing, extending or updating the functionality of an\n\
+ Eclipse-based product.\n\
+2. During the Provisioning Process, the Provisioning Technology may cause third\n\
+ party Installable Software or a portion thereof to be accessed and copied to\n\
+ the Target Machine.\n\
+3. Pursuant to the Specification, you will provide to the user the terms and\n\
+ conditions that govern the use of the Installable Software ("Installable\n\
+ Software Agreement") and such Installable Software Agreement shall be\n\
+ accessed from the Target Machine in accordance with the Specification. Such\n\
+ Installable Software Agreement must inform the user of the terms and\n\
+ conditions that govern the Installable Software and must solicit acceptance\n\
+ by the end user in the manner prescribed in such Installable\n\
+ Software Agreement. Upon such indication of agreement by the user, the\n\
+ provisioning Technology will complete installation of the\n\
+ Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are currently\n\
+may have restrictions on the import, possession, and use, and/or re-export to\n\
+another country, of encryption software. BEFORE using any encryption software,\n\
+please check the country's laws, regulations and policies concerning the import,\n\
+possession, or use, and re-export of encryption software, to see if this is\n\
+permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the\n\
+United States, other countries, or both.\n
+########### end of license property ##########################################
diff --git a/features/org.eclipse.emf.diffmerge.patch.runtime.feature/feature.xml b/features/org.eclipse.emf.diffmerge.patch.runtime.feature/feature.xml
index d713ada..4656d6b 100644
--- a/features/org.eclipse.emf.diffmerge.patch.runtime.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.patch.runtime.feature/feature.xml
@@ -1,32 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
-
- Contributors:
- Abel Hegedus, Tamas Borbas, Balazs Grill, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
+ Copyright (c) 2016-2018 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
+
+ Contributors:
+ Abel Hegedus, Tamas Borbas, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
-->
<feature
id="org.eclipse.emf.diffmerge.patch.runtime.feature"
- label="Model Patch Runtime Feature"
+ label="%featureName"
version="0.1.0.qualifier"
- provider-name="Eclipse Modeling Project"
+ provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
<description>
- EMF Diff/Merge Model Patch Runtime feature
+ %description
</description>
- <copyright url="http://www.eclipse.org/legal/epl-v10.html">
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
- Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
+ <copyright>
+ %copyright
</copyright>
<license url="%licenseURL">
diff --git a/features/org.eclipse.emf.diffmerge.patch.runtime.feature/license.html b/features/org.eclipse.emf.diffmerge.patch.runtime.feature/license.html
index f19c483..008b801 100644
--- a/features/org.eclipse.emf.diffmerge.patch.runtime.feature/license.html
+++ b/features/org.eclipse.emf.diffmerge.patch.runtime.feature/license.html
@@ -7,102 +7,183 @@
</head>
<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>February 1, 2011</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY &quot;CONTENT&quot;). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- (&quot;EPL&quot;). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
- repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;. Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
- Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
- other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
- install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
- href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
- (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
- applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
- in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
- Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
- <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
- on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
- product.</li>
- <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
- accessed and copied to the Target Machine.</li>
- <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
- Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
- Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
- the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
- indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+ <h2>Eclipse Foundation Software User Agreement</h2>
+ <p>November 22, 2017</p>
+
+ <h3>Usage Of Content</h3>
+
+ <p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION,
+ INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+ (COLLECTIVELY &quot;CONTENT&quot;). USE OF THE CONTENT IS GOVERNED BY
+ THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+ CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
+ BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS
+ GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY
+ APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
+ BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS
+ AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
+ AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT
+ USE THE CONTENT.</p>
+
+ <h3>Applicable Licenses</h3>
+
+ <p>
+ Unless otherwise indicated, all Content made available by the Eclipse
+ Foundation is provided to you under the terms and conditions of the
+ Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the
+ EPL is provided with this Content and is also available at <a
+ href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+ For purposes of the EPL, &quot;Program&quot; will mean the Content.
+ </p>
+
+ <p>Content includes, but is not limited to, source code, object
+ code, documentation and other files maintained in the Eclipse
+ Foundation source code repository (&quot;Repository&quot;) in software
+ modules (&quot;Modules&quot;) and made available as downloadable
+ archives (&quot;Downloads&quot;).</p>
+
+ <ul>
+ <li>Content may be structured and packaged into modules to
+ facilitate delivering, extending, and upgrading the Content. Typical
+ modules may include plug-ins (&quot;Plug-ins&quot;), plug-in
+ fragments (&quot;Fragments&quot;), and features
+ (&quot;Features&quot;).</li>
+ <li>Each Plug-in or Fragment may be packaged as a sub-directory
+ or JAR (Java&trade; ARchive) in a directory named
+ &quot;plugins&quot;.</li>
+ <li>A Feature is a bundle of one or more Plug-ins and/or
+ Fragments and associated material. Each Feature may be packaged as a
+ sub-directory in a directory named &quot;features&quot;. Within a
+ Feature, files named &quot;feature.xml&quot; may contain a list of
+ the names and version numbers of the Plug-ins and/or Fragments
+ associated with that Feature.</li>
+ <li>Features may also include other Features (&quot;Included
+ Features&quot;). Within a Feature, files named
+ &quot;feature.xml&quot; may contain a list of the names and version
+ numbers of Included Features.</li>
+ </ul>
+
+ <p>The terms and conditions governing Plug-ins and Fragments should
+ be contained in files named &quot;about.html&quot;
+ (&quot;Abouts&quot;). The terms and conditions governing Features and
+ Included Features should be contained in files named
+ &quot;license.html&quot; (&quot;Feature Licenses&quot;). Abouts and
+ Feature Licenses may be located in any directory of a Download or
+ Module including, but not limited to the following locations:</p>
+
+ <ul>
+ <li>The top-level (root) directory</li>
+ <li>Plug-in and Fragment directories</li>
+ <li>Inside Plug-ins and Fragments packaged as JARs</li>
+ <li>Sub-directories of the directory named &quot;src&quot; of
+ certain Plug-ins</li>
+ <li>Feature directories</li>
+ </ul>
+
+ <p>Note: if a Feature made available by the Eclipse Foundation is
+ installed using the Provisioning Technology (as defined below), you
+ must agree to a license (&quot;Feature Update License&quot;) during
+ the installation process. If the Feature contains Included Features,
+ the Feature Update License should either provide you with the terms
+ and conditions governing the Included Features or inform you where you
+ can locate them. Feature Update Licenses may be found in the
+ &quot;license&quot; property of files named
+ &quot;feature.properties&quot; found within a Feature. Such Abouts,
+ Feature Licenses, and Feature Update Licenses contain the terms and
+ conditions (or references to such terms and conditions) that govern
+ your use of the associated Content in that directory.</p>
+
+ <p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY
+ REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND
+ CONDITIONS. SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT
+ ARE NOT LIMITED TO):</p>
+
+ <ul>
+ <li>Eclipse Public License Version 1.0 (available at <a
+ href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>)
+ </li>
+ <li>Eclipse Distribution License Version 1.0 (available at <a
+ href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)
+ </li>
+ <li>Common Public License Version 1.0 (available at <a
+ href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)
+ </li>
+ <li>Apache Software License 1.1 (available at <a
+ href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)
+ </li>
+ <li>Apache Software License 2.0 (available at <a
+ href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)
+ </li>
+ <li>Mozilla Public License Version 1.1 (available at <a
+ href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)
+ </li>
+ </ul>
+
+ <p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND
+ CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License,
+ or Feature Update License is provided, please contact the Eclipse
+ Foundation to determine what terms and conditions govern that
+ particular Content.</p>
+
+
+ <h3>Use of Provisioning Technology</h3>
+
+ <p>
+ The Eclipse Foundation makes available provisioning software, examples
+ of which include, but are not limited to, p2 and the Eclipse Update
+ Manager (&quot;Provisioning Technology&quot;) for the purpose of
+ allowing users to install software, documentation, information and/or
+ other materials (collectively &quot;Installable Software&quot;). This
+ capability is provided with the intent of allowing such users to
+ install, extend and update Eclipse-based products. Information about
+ packaging Installable Software is available at <a
+ href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+ (&quot;Specification&quot;).
+ </p>
+
+ <p>You may use Provisioning Technology to allow other parties to
+ install Installable Software. You shall be responsible for enabling
+ the applicable license agreements relating to the Installable Software
+ to be presented to, and accepted by, the users of the Provisioning
+ Technology in accordance with the Specification. By using Provisioning
+ Technology in such a manner and making it available in accordance with
+ the Specification, you further acknowledge your agreement to, and the
+ acquisition of all necessary rights to permit the following:</p>
+
+ <ol>
+ <li>A series of actions may occur (&quot;Provisioning
+ Process&quot;) in which a user may execute the Provisioning
+ Technology on a machine (&quot;Target Machine&quot;) with the intent
+ of installing, extending or updating the functionality of an
+ Eclipse-based product.</li>
+ <li>During the Provisioning Process, the Provisioning Technology
+ may cause third party Installable Software or a portion thereof to be
+ accessed and copied to the Target Machine.</li>
+ <li>Pursuant to the Specification, you will provide to the user
+ the terms and conditions that govern the use of the Installable
+ Software (&quot;Installable Software Agreement&quot;) and such
+ Installable Software Agreement shall be accessed from the Target
+ Machine in accordance with the Specification. Such Installable
+ Software Agreement must inform the user of the terms and conditions
+ that govern the Installable Software and must solicit acceptance by
+ the end user in the manner prescribed in such Installable Software
+ Agreement. Upon such indication of agreement by the user, the
+ provisioning Technology will complete installation of the Installable
+ Software.</li>
+ </ol>
+
+ <h3>Cryptography</h3>
+
+ <p>Content may contain encryption software. The country in which
+ you are currently may have restrictions on the import, possession, and
+ use, and/or re-export to another country, of encryption software.
+ BEFORE using any encryption software, please check the country's laws,
+ regulations and policies concerning the import, possession, or use,
+ and re-export of encryption software, to see if this is permitted.</p>
+
+ <p>
+ <small>Java and all Java-based trademarks are trademarks of
+ Oracle Corporation in the United States, other countries, or both.</small>
+ </p>
</body>
</html>
diff --git a/features/org.eclipse.emf.diffmerge.patch.runtime.feature/pom.xml b/features/org.eclipse.emf.diffmerge.patch.runtime.feature/pom.xml
index a2047fa..f6d8511 100644
--- a/features/org.eclipse.emf.diffmerge.patch.runtime.feature/pom.xml
+++ b/features/org.eclipse.emf.diffmerge.patch.runtime.feature/pom.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- 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
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Balazs Grill, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/META-INF/MANIFEST.MF
index 001097c..d41500b 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/META-INF/MANIFEST.MF
@@ -22,4 +22,5 @@ Require-Bundle: org.eclipse.emf.diffmerge.patch;bundle-version="[0.1.0,0.2.0)",
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Import-Package: org.apache.log4j;version="1.2.15"
+Automatic-Module-Name: org.eclipse.emf.diffmerge.patch.persistence.emf
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/build.properties b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/build.properties
index 3e15bee..bc5ad1a 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/build.properties
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/build.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2016-2017 Thales Global Services S.A.S.
-# 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
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/plugin.properties b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/plugin.properties
index ab856e0..fa835d8 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/plugin.properties
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/plugin.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2016-2017 Thales Global Services S.A.S.
-# 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
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
pluginName = Model Patch EMF Persistence Plug-In (Incubation)
providerName = Eclipse Modeling Project
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/pom.xml b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/pom.xml
index a4f7a8f..ef581db 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/pom.xml
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/pom.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- 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
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/EMFModelPatchPersister.xtend b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/EMFModelPatchPersister.xtend
index f06a793..e5d391d 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/EMFModelPatchPersister.xtend
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/EMFModelPatchPersister.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/EMFModelPatchSerializer.xtend b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/EMFModelPatchSerializer.xtend
index 928f965..255302d 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/EMFModelPatchSerializer.xtend
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/EMFModelPatchSerializer.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EAttributeEntry.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EAttributeEntry.java
index bf235e0..82f597f 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EAttributeEntry.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EAttributeEntry.java
@@ -1,9 +1,10 @@
/**
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EChangeDirection.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EChangeDirection.java
index a04821c..902c301 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EChangeDirection.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EChangeDirection.java
@@ -1,9 +1,10 @@
/**
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EElementEntry.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EElementEntry.java
index b55abb1..a7be0a6 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EElementEntry.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EElementEntry.java
@@ -1,9 +1,10 @@
/**
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EIdentifiable.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EIdentifiable.java
index 8b4a17f..2ea15bb 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EIdentifiable.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EIdentifiable.java
@@ -1,9 +1,10 @@
/**
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatch.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatch.java
index fdb28da..51978b1 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatch.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatch.java
@@ -1,9 +1,10 @@
/**
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchEMFMetadata.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchEMFMetadata.java
index 21839b7..dae97c0 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchEMFMetadata.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchEMFMetadata.java
@@ -1,9 +1,10 @@
/**
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchElement.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchElement.java
index 7440d6e..9b591ce 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchElement.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchElement.java
@@ -1,9 +1,10 @@
/**
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchEntry.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchEntry.java
index 3a586ce..62863d5 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchEntry.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchEntry.java
@@ -1,9 +1,10 @@
/**
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchFactory.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchFactory.java
index dca5be0..82e526a 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchFactory.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchFactory.java
@@ -1,9 +1,10 @@
/**
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchMetadata.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchMetadata.java
index 6b3209a..874c2b2 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchMetadata.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchMetadata.java
@@ -1,9 +1,10 @@
/**
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchPackage.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchPackage.java
index b88e22b..f251c14 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchPackage.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchPackage.java
@@ -1,9 +1,10 @@
/**
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EReferenceEntry.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EReferenceEntry.java
index c427358..d06b32c 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EReferenceEntry.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EReferenceEntry.java
@@ -1,9 +1,10 @@
/**
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EStructuralFeatureEntry.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EStructuralFeatureEntry.java
index 432422e..9b33734 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EStructuralFeatureEntry.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EStructuralFeatureEntry.java
@@ -1,9 +1,10 @@
/**
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EAttributeEntryImpl.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EAttributeEntryImpl.java
index d53fb7a..6ccd980 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EAttributeEntryImpl.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EAttributeEntryImpl.java
@@ -1,9 +1,10 @@
/**
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EElementEntryImpl.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EElementEntryImpl.java
index f6d7a4e..905678e 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EElementEntryImpl.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EElementEntryImpl.java
@@ -1,9 +1,10 @@
/**
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EIdentifiableImpl.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EIdentifiableImpl.java
index d98b3dc..ae08144 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EIdentifiableImpl.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EIdentifiableImpl.java
@@ -1,9 +1,10 @@
/**
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchEMFMetadataImpl.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchEMFMetadataImpl.java
index e58d611..2c805ce 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchEMFMetadataImpl.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchEMFMetadataImpl.java
@@ -1,9 +1,10 @@
/**
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchElementImpl.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchElementImpl.java
index a8dd79b..b39af9e 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchElementImpl.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchElementImpl.java
@@ -1,9 +1,10 @@
/**
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchEntryImpl.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchEntryImpl.java
index cbfc863..57b512b 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchEntryImpl.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchEntryImpl.java
@@ -1,9 +1,10 @@
/**
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchFactoryImpl.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchFactoryImpl.java
index 2a3f914..8403106 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchFactoryImpl.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchFactoryImpl.java
@@ -1,9 +1,10 @@
/**
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchImpl.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchImpl.java
index ee3767b..179413e 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchImpl.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchImpl.java
@@ -1,9 +1,10 @@
/**
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchMetadataImpl.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchMetadataImpl.java
index ea37ee6..68e7e17 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchMetadataImpl.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchMetadataImpl.java
@@ -1,9 +1,10 @@
/**
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchPackageImpl.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchPackageImpl.java
index 9c9c768..6597e2a 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchPackageImpl.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchPackageImpl.java
@@ -1,9 +1,10 @@
/**
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EReferenceEntryImpl.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EReferenceEntryImpl.java
index 112b34a..9bc2916 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EReferenceEntryImpl.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EReferenceEntryImpl.java
@@ -1,9 +1,10 @@
/**
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EStructuralFeatureEntryImpl.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EStructuralFeatureEntryImpl.java
index fccbbf2..ad83385 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EStructuralFeatureEntryImpl.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EStructuralFeatureEntryImpl.java
@@ -1,9 +1,10 @@
/**
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/util/EModelPatchAdapterFactory.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/util/EModelPatchAdapterFactory.java
index 10f5744..173663e 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/util/EModelPatchAdapterFactory.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/util/EModelPatchAdapterFactory.java
@@ -1,9 +1,10 @@
/**
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/util/EModelPatchSwitch.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/util/EModelPatchSwitch.java
index 25f67dc..50ab020 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/util/EModelPatchSwitch.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/util/EModelPatchSwitch.java
@@ -1,9 +1,10 @@
/**
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/transform/EModelPatchToPOJO.xtend b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/transform/EModelPatchToPOJO.xtend
index ad6114e..3acd270 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/transform/EModelPatchToPOJO.xtend
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/transform/EModelPatchToPOJO.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/transform/ModelPatchToEMF.xtend b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/transform/ModelPatchToEMF.xtend
index ff2c00d..861f703 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/transform/ModelPatchToEMF.xtend
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/transform/ModelPatchToEMF.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/META-INF/MANIFEST.MF
index f95ed82..89bd3db 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/META-INF/MANIFEST.MF
@@ -10,3 +10,4 @@ Require-Bundle: com.google.gson;bundle-version="2.2.4",
com.google.guava;bundle-version="15.0.0"
Export-Package: org.eclipse.emf.diffmerge.patch.serializer.gson
Bundle-ClassPath: .
+Automatic-Module-Name: org.eclipse.emf.diffmerge.patch.persistence.json
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/build.properties b/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/build.properties
index 8babb8d..b612ecb 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/build.properties
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/build.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2016-2017 Thales Global Services S.A.S.
-# 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
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/plugin.properties b/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/plugin.properties
index f73f543..ac06927 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/plugin.properties
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/plugin.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2016-2017 Thales Global Services S.A.S.
-# 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
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
pluginName = Model Patch JSON Persistence Plug-In (Incubation)
providerName = Eclipse Modeling Project
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/pom.xml b/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/pom.xml
index f277062..30d4ef5 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/pom.xml
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/pom.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- 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
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/src/org/eclipse/emf/diffmerge/patch/serializer/gson/GsonModelPatchSerializer.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/src/org/eclipse/emf/diffmerge/patch/serializer/gson/GsonModelPatchSerializer.java
index 6bf928a..69e978e 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/src/org/eclipse/emf/diffmerge/patch/serializer/gson/GsonModelPatchSerializer.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/src/org/eclipse/emf/diffmerge/patch/serializer/gson/GsonModelPatchSerializer.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/src/org/eclipse/emf/diffmerge/patch/serializer/gson/typeadapters/AbstractSubclassAdapter.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/src/org/eclipse/emf/diffmerge/patch/serializer/gson/typeadapters/AbstractSubclassAdapter.java
index 35c23dc..c6d5928 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/src/org/eclipse/emf/diffmerge/patch/serializer/gson/typeadapters/AbstractSubclassAdapter.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/src/org/eclipse/emf/diffmerge/patch/serializer/gson/typeadapters/AbstractSubclassAdapter.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.patch.runtime/META-INF/MANIFEST.MF
index 2f93190..d434310 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/META-INF/MANIFEST.MF
@@ -18,4 +18,5 @@ Export-Package: org.eclipse.emf.diffmerge.patch.runtime,
org.eclipse.emf.diffmerge.patch.runtime.identifier,
org.eclipse.emf.diffmerge.patch.runtime.modelaccess
Import-Package: org.apache.log4j;version="1.2.15"
+Automatic-Module-Name: org.eclipse.emf.diffmerge.patch.runtime
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/about.html b/plugins/org.eclipse.emf.diffmerge.patch.runtime/about.html
index d8e1984..720a1d0 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/about.html
+++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/about.html
@@ -1,21 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
</head>
<body lang="EN-US">
<h2>About This Content</h2>
-<p>June 5, 2007</p>
+<p>August 17, 2018</p>
<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
</body>
</html> \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/build.properties b/plugins/org.eclipse.emf.diffmerge.patch.runtime/build.properties
index 6b228af..4e20993 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/build.properties
+++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/build.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2016-2017 Thales Global Services S.A.S.
-# 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
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/plugin.properties b/plugins/org.eclipse.emf.diffmerge.patch.runtime/plugin.properties
index 8d7c1ca..a3644f9 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/plugin.properties
+++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/plugin.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2016-2017 Thales Global Services S.A.S.
-# 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
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
pluginName = Model Patch Runtime Plug-In (Incubation)
providerName = Eclipse Modeling Project
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/pom.xml b/plugins/org.eclipse.emf.diffmerge.patch.runtime/pom.xml
index d02ab8d..45fb874 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/pom.xml
+++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/pom.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- 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
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/EMFModelPatchApplier.xtend b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/EMFModelPatchApplier.xtend
index 152e96e..dad708e 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/EMFModelPatchApplier.xtend
+++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/EMFModelPatchApplier.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/EMFModelPatchMetadata.xtend b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/EMFModelPatchMetadata.xtend
index 3fed911..5a5ce6a 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/EMFModelPatchMetadata.xtend
+++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/EMFModelPatchMetadata.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/EMFPatchApplication.xtend b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/EMFPatchApplication.xtend
index 61af8fb..bccac31 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/EMFPatchApplication.xtend
+++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/EMFPatchApplication.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/ModelPatchRecorder.xtend b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/ModelPatchRecorder.xtend
index cfab380..0c4b96e 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/ModelPatchRecorder.xtend
+++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/ModelPatchRecorder.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/BaseIndexEObjectLocator.xtend b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/BaseIndexEObjectLocator.xtend
index 97ab090..5568b8b 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/BaseIndexEObjectLocator.xtend
+++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/BaseIndexEObjectLocator.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/EMFIdentifierProvider.java b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/EMFIdentifierProvider.java
index ae8cea1..d2b632a 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/EMFIdentifierProvider.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/EMFIdentifierProvider.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/EObjectIdentifierProvider.java b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/EObjectIdentifierProvider.java
index 3f6bf3f..a6ec453 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/EObjectIdentifierProvider.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/EObjectIdentifierProvider.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/EObjectLocator.java b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/EObjectLocator.java
index d2e838f..0277d57 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/EObjectLocator.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/EObjectLocator.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/IDAttributeBasedEObjectIdentifierProvider.java b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/IDAttributeBasedEObjectIdentifierProvider.java
index acc355c..e6036bd 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/IDAttributeBasedEObjectIdentifierProvider.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/IDAttributeBasedEObjectIdentifierProvider.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/IdentifiedEMFObjectLocator.java b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/IdentifiedEMFObjectLocator.java
index 8ed10ea..d4bd897 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/IdentifiedEMFObjectLocator.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/IdentifiedEMFObjectLocator.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/TreeIteratorEObjectLocator.xtend b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/TreeIteratorEObjectLocator.xtend
index 1497c03..94c5e7e 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/TreeIteratorEObjectLocator.xtend
+++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/TreeIteratorEObjectLocator.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/AbstractEMFModleAccess.xtend b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/AbstractEMFModleAccess.xtend
index c30cbcd..8fc4faa 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/AbstractEMFModleAccess.xtend
+++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/AbstractEMFModleAccess.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/EMFModelAccess.xtend b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/EMFModelAccess.xtend
index 5b92ecc..ad6c400 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/EMFModelAccess.xtend
+++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/EMFModelAccess.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/ModelAccessProvider.xtend b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/ModelAccessProvider.xtend
index baf01d3..eee48b5 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/ModelAccessProvider.xtend
+++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/ModelAccessProvider.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/ModelAccessTypes.java b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/ModelAccessTypes.java
index 5e310ff..c42175d 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/ModelAccessTypes.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/ModelAccessTypes.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/SimpleReflectiveEMFModelAccess.xtend b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/SimpleReflectiveEMFModelAccess.xtend
index 8c50c7b..2d92680 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/SimpleReflectiveEMFModelAccess.xtend
+++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/SimpleReflectiveEMFModelAccess.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/ViatraModelAccess.xtend b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/ViatraModelAccess.xtend
index b7f1faa..98fc8e3 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/ViatraModelAccess.xtend
+++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/ViatraModelAccess.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.patch.ui/META-INF/MANIFEST.MF
index ec39d34..e6b3171 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/META-INF/MANIFEST.MF
@@ -34,4 +34,5 @@ Export-Package: org.eclipse.emf.diffmerge.patch.ui,
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.emf.diffmerge.patch.ui.ModelPatchUIPlugin
Import-Package: org.apache.log4j;version="1.2.0"
+Automatic-Module-Name: org.eclipse.emf.diffmerge.patch.ui
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/about.html b/plugins/org.eclipse.emf.diffmerge.patch.ui/about.html
index d8e1984..720a1d0 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/about.html
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/about.html
@@ -1,21 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
</head>
<body lang="EN-US">
<h2>About This Content</h2>
-<p>June 5, 2007</p>
+<p>August 17, 2018</p>
<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
</body>
</html> \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/build.properties b/plugins/org.eclipse.emf.diffmerge.patch.ui/build.properties
index ef79c67..80b9294 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/build.properties
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/build.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2016-2017 Thales Global Services S.A.S.
-# 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
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/plugin.properties b/plugins/org.eclipse.emf.diffmerge.patch.ui/plugin.properties
index ef61b0e..5f1a886 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/plugin.properties
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/plugin.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2016-2017 Thales Global Services S.A.S.
-# 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
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
pluginName = Model Patch GUI Plug-In (Incubation)
providerName = Eclipse Modeling Project
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/plugin.xml b/plugins/org.eclipse.emf.diffmerge.patch.ui/plugin.xml
index 4a83ddc..e404f75 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/plugin.xml
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/plugin.xml
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- 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
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/pom.xml b/plugins/org.eclipse.emf.diffmerge.patch.ui/pom.xml
index 58b8572..232140d 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/pom.xml
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/pom.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- 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
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/ModelPatchUIPlugin.java b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/ModelPatchUIPlugin.java
index 3bac6c1..252a24c 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/ModelPatchUIPlugin.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/ModelPatchUIPlugin.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/dialogs/ModelpatchEntryFilterCreationDialog.java b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/dialogs/ModelpatchEntryFilterCreationDialog.java
index 155b968..fdaa462 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/dialogs/ModelpatchEntryFilterCreationDialog.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/dialogs/ModelpatchEntryFilterCreationDialog.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/dialogs/ModelpatchViewerDialog.java b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/dialogs/ModelpatchViewerDialog.java
index 5270872..d010926 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/dialogs/ModelpatchViewerDialog.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/dialogs/ModelpatchViewerDialog.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/dialogs/PluginID.java b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/dialogs/PluginID.java
index a02ab46..24b2174 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/dialogs/PluginID.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/dialogs/PluginID.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/editors/ModelPatchEditorPart.java b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/editors/ModelPatchEditorPart.java
index 600ca95..6de511f 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/editors/ModelPatchEditorPart.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/editors/ModelPatchEditorPart.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/handlers/ComparisonSelectionUtil.xtend b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/handlers/ComparisonSelectionUtil.xtend
index d79b0f4..57172a5 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/handlers/ComparisonSelectionUtil.xtend
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/handlers/ComparisonSelectionUtil.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/handlers/ModelpatchApplicationHandler.xtend b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/handlers/ModelpatchApplicationHandler.xtend
index aafa406..ee8acc5 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/handlers/ModelpatchApplicationHandler.xtend
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/handlers/ModelpatchApplicationHandler.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/handlers/ModelpatchGenerationHandler.xtend b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/handlers/ModelpatchGenerationHandler.xtend
index 4afb906..0705ed7 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/handlers/ModelpatchGenerationHandler.xtend
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/handlers/ModelpatchGenerationHandler.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/preferences/ModelPatchPreferencePage.java b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/preferences/ModelPatchPreferencePage.java
index e5af756..c77e2f6 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/preferences/ModelPatchPreferencePage.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/preferences/ModelPatchPreferencePage.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/preferences/ModelPatchPreferenceProvider.java b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/preferences/ModelPatchPreferenceProvider.java
index ad85b28..65b0be2 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/preferences/ModelPatchPreferenceProvider.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/preferences/ModelPatchPreferenceProvider.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/DefaultEntryLabelProvider.xtend b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/DefaultEntryLabelProvider.xtend
index b13cf77..cdb9994 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/DefaultEntryLabelProvider.xtend
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/DefaultEntryLabelProvider.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/DescriptiveEntryLabelProvider.xtend b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/DescriptiveEntryLabelProvider.xtend
index 867c1c2..54c67fa 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/DescriptiveEntryLabelProvider.xtend
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/DescriptiveEntryLabelProvider.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/DialogFactory.xtend b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/DialogFactory.xtend
index dc2f1ef..3bbf2f4 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/DialogFactory.xtend
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/DialogFactory.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/EntryPropertyWrapper.java b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/EntryPropertyWrapper.java
index 9b4ddae..dd6d2d2 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/EntryPropertyWrapper.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/EntryPropertyWrapper.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/IEntryLabelProvider.java b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/IEntryLabelProvider.java
index fcb796f..f8ca550 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/IEntryLabelProvider.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/IEntryLabelProvider.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/IdentifiableWrapper.java b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/IdentifiableWrapper.java
index 69fa716..8877664 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/IdentifiableWrapper.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/IdentifiableWrapper.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/IdentifiableWrapperFactory.java b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/IdentifiableWrapperFactory.java
index 3dcd0cb..c9a1fe9 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/IdentifiableWrapperFactory.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/IdentifiableWrapperFactory.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchContentProvider.xtend b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchContentProvider.xtend
index e5b31fe..9f0497a 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchContentProvider.xtend
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchContentProvider.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchEntryFilterContentProvider.xtend b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchEntryFilterContentProvider.xtend
index 11247d3..b91ba35 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchEntryFilterContentProvider.xtend
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchEntryFilterContentProvider.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchEntryFilterLabelProvider.xtend b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchEntryFilterLabelProvider.xtend
index 755e1b7..743b045 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchEntryFilterLabelProvider.xtend
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchEntryFilterLabelProvider.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchEntryHelper.xtend b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchEntryHelper.xtend
index 5d3d2a9..defc363 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchEntryHelper.xtend
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchEntryHelper.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchLabelProvider.xtend b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchLabelProvider.xtend
index f98b78c..3d6e95a 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchLabelProvider.xtend
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchLabelProvider.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelpatchApplicationDTO.xtend b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelpatchApplicationDTO.xtend
index c93180f..4fdfa35 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelpatchApplicationDTO.xtend
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelpatchApplicationDTO.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/PersistenceTypes.java b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/PersistenceTypes.java
index 29301cd..7ddfbf8 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/PersistenceTypes.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/PersistenceTypes.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/SerializerProvider.xtend b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/SerializerProvider.xtend
index 534c14f..9909f7d 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/SerializerProvider.xtend
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/SerializerProvider.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/ModelpatchApplicationWizard.xtend b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/ModelpatchApplicationWizard.xtend
index 5f9564d..fbcde93 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/ModelpatchApplicationWizard.xtend
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/ModelpatchApplicationWizard.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchEDMWizardPage.java b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchEDMWizardPage.java
index 3d3329b..87962cc 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchEDMWizardPage.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchEDMWizardPage.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchFilteringWizardPage.java b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchFilteringWizardPage.java
index 5f4ebf2..3704f07 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchFilteringWizardPage.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchFilteringWizardPage.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchLoadingPatchWizardPage.java b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchLoadingPatchWizardPage.java
index 6f767b4..e20bb3e 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchLoadingPatchWizardPage.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchLoadingPatchWizardPage.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchResultWizardPage.java b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchResultWizardPage.java
index 6018040..111a63c 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchResultWizardPage.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchResultWizardPage.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk (IncQuery Labs Ltd.) - initial API and implementation
@@ -153,6 +154,7 @@ public class ModelpatchResultWizardPage extends WizardPage {
return getChildren(inputElement);
}
+ @SuppressWarnings("rawtypes")
@Override
public Object[] getChildren(Object parentElement) {
if (parentElement instanceof ModelPatchDiagnosticElement) {
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/wb/swt/SWTResourceManager.java b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/wb/swt/SWTResourceManager.java
index 35f557a..016ab4b 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/wb/swt/SWTResourceManager.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/wb/swt/SWTResourceManager.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2011 Google, Inc.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Google, Inc. - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.patch/META-INF/MANIFEST.MF
index 1730884..b066f3f 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.diffmerge.patch/META-INF/MANIFEST.MF
@@ -13,3 +13,4 @@ Export-Package: org.eclipse.emf.diffmerge.patch,
org.eclipse.emf.diffmerge.patch.persistence,
org.eclipse.emf.diffmerge.patch.serializer
Bundle-ClassPath: .
+Automatic-Module-Name: org.eclipse.emf.diffmerge.patch
diff --git a/plugins/org.eclipse.emf.diffmerge.patch/about.html b/plugins/org.eclipse.emf.diffmerge.patch/about.html
index d8e1984..720a1d0 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch/about.html
+++ b/plugins/org.eclipse.emf.diffmerge.patch/about.html
@@ -1,21 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
</head>
<body lang="EN-US">
<h2>About This Content</h2>
-<p>June 5, 2007</p>
+<p>August 17, 2018</p>
<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
</body>
</html> \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.diffmerge.patch/build.properties b/plugins/org.eclipse.emf.diffmerge.patch/build.properties
index 909ef3f..89387f3 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch/build.properties
+++ b/plugins/org.eclipse.emf.diffmerge.patch/build.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2016-2017 Thales Global Services S.A.S.
-# 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
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch/plugin.properties b/plugins/org.eclipse.emf.diffmerge.patch/plugin.properties
index ff2dfcc..5e37462 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch/plugin.properties
+++ b/plugins/org.eclipse.emf.diffmerge.patch/plugin.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2016-2017 Thales Global Services S.A.S.
-# 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
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
pluginName = Model Patch Plug-In (Incubation)
providerName = Eclipse Modeling Project
diff --git a/plugins/org.eclipse.emf.diffmerge.patch/pom.xml b/plugins/org.eclipse.emf.diffmerge.patch/pom.xml
index 7384c2b..6838067 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch/pom.xml
+++ b/plugins/org.eclipse.emf.diffmerge.patch/pom.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- 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
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/AbstractModelPatchEntry.java b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/AbstractModelPatchEntry.java
index 92f2b7e..d9d4435 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/AbstractModelPatchEntry.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/AbstractModelPatchEntry.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/AttributeEntry.java b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/AttributeEntry.java
index c3b33e5..0e404ec 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/AttributeEntry.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/AttributeEntry.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/ElementEntry.java b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/ElementEntry.java
index be123df..e4aa3e0 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/ElementEntry.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/ElementEntry.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/ReferenceEntry.java b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/ReferenceEntry.java
index 0ddb606..3ef7646 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/ReferenceEntry.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/ReferenceEntry.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/StructuralFeatureEntry.java b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/StructuralFeatureEntry.java
index 61c9f70..4e446ca 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/StructuralFeatureEntry.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/StructuralFeatureEntry.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/BaseModelPatchMetadata.java b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/BaseModelPatchMetadata.java
index bfac620..2aa8f6f 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/BaseModelPatchMetadata.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/BaseModelPatchMetadata.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ChangeDirection.java b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ChangeDirection.java
index 2e1f7b4..5c271e5 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ChangeDirection.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ChangeDirection.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ComplexMPEFilterType.java b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ComplexMPEFilterType.java
index aa72623..e414260 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ComplexMPEFilterType.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ComplexMPEFilterType.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/EntryType.java b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/EntryType.java
index 1081610..2e56e52 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/EntryType.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/EntryType.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/IModelPatchEntryFilter.java b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/IModelPatchEntryFilter.java
index e1a7710..78015d8 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/IModelPatchEntryFilter.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/IModelPatchEntryFilter.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/Identifiable.java b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/Identifiable.java
index dd3b719..3c9328e 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/Identifiable.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/Identifiable.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatch.java b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatch.java
index ff00ca2..8fbf52a 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatch.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatch.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchBuilder.java b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchBuilder.java
index 5934a3f..05a3ee7 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchBuilder.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchBuilder.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchDiagnosticElement.xtend b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchDiagnosticElement.xtend
index a74e9ff..e2ef1d5 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchDiagnosticElement.xtend
+++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchDiagnosticElement.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchEntry.java b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchEntry.java
index 841778f..840d399 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchEntry.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchEntry.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchEntryBuilder.java b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchEntryBuilder.java
index edf8a9a..6d3160e 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchEntryBuilder.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchEntryBuilder.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchEntryProperty.java b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchEntryProperty.java
index 2d83d2e..ecadbd4 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchEntryProperty.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchEntryProperty.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchException.java b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchException.java
index 4fe25cb..c706c1d 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchException.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchException.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchFilterApplier.xtend b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchFilterApplier.xtend
index a8329e2..58926e2 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchFilterApplier.xtend
+++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchFilterApplier.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchMetadata.java b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchMetadata.java
index 6034206..2d66313 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchMetadata.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchMetadata.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchReverser.xtend b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchReverser.xtend
index ff7c6a7..b3a221d 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchReverser.xtend
+++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchReverser.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/PatchApplication.xtend b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/PatchApplication.xtend
index 5b95dd0..40c1db5 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/PatchApplication.xtend
+++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/PatchApplication.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/PatchApplicationDiagnostic.java b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/PatchApplicationDiagnostic.java
index 10044bb..878fc02 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/PatchApplicationDiagnostic.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/PatchApplicationDiagnostic.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/filters/ComplexEntryFilter.xtend b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/filters/ComplexEntryFilter.xtend
index 4500fb7..e75af3c 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/filters/ComplexEntryFilter.xtend
+++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/filters/ComplexEntryFilter.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/filters/EntryDirectionFilter.xtend b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/filters/EntryDirectionFilter.xtend
index e413898..433994e 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/filters/EntryDirectionFilter.xtend
+++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/filters/EntryDirectionFilter.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/filters/EntryPropertyFilter.xtend b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/filters/EntryPropertyFilter.xtend
index fd090ee..be47216 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/filters/EntryPropertyFilter.xtend
+++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/filters/EntryPropertyFilter.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/filters/EntryTypeFilter.xtend b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/filters/EntryTypeFilter.xtend
index 9443819..5fbecd0 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/filters/EntryTypeFilter.xtend
+++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/filters/EntryTypeFilter.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/persistence/ModelPatchPersister.xtend b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/persistence/ModelPatchPersister.xtend
index 0c0035c..5e49f3e 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/persistence/ModelPatchPersister.xtend
+++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/persistence/ModelPatchPersister.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/serializer/IModelPatchSerializer.java b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/serializer/IModelPatchSerializer.java
index 77cf07f..1d29f40 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/serializer/IModelPatchSerializer.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/serializer/IModelPatchSerializer.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/releng/org.eclipse.emf.diffmerge.patch.parent/header.epl.txt b/releng/org.eclipse.emf.diffmerge.patch.parent/header.epl.txt
index 0b0d600..5f09e25 100644
--- a/releng/org.eclipse.emf.diffmerge.patch.parent/header.epl.txt
+++ b/releng/org.eclipse.emf.diffmerge.patch.parent/header.epl.txt
@@ -1,4 +1,5 @@
-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
+This program and the accompanying materials are made
+available under the terms of the Eclipse Public License 2.0
+which is available at https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0
diff --git a/releng/org.eclipse.emf.diffmerge.patch.parent/pom.xml b/releng/org.eclipse.emf.diffmerge.patch.parent/pom.xml
index bcbbb66..85065d0 100644
--- a/releng/org.eclipse.emf.diffmerge.patch.parent/pom.xml
+++ b/releng/org.eclipse.emf.diffmerge.patch.parent/pom.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2016-2017 Thales Global Services S.A.S. All rights reserved.
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html Contributors:
+<!-- Copyright (c) 2016-2018 Thales Global Services S.A.S. All rights reserved.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
+ Contributors:
Abel Hegedus, Tamas Borbas, Balazs Grill, Daniel Segesdi (IncQuery Labs Ltd.)
- initial API and implementation -->
@@ -74,11 +77,11 @@
<version>3.0</version>
<configuration>
<inlineHeader>
- 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
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
</inlineHeader>
<useDefaultExcludes>true</useDefaultExcludes>
<failIfMissing>true</failIfMissing>
diff --git a/releng/org.eclipse.emf.diffmerge.patch.product/pom.xml b/releng/org.eclipse.emf.diffmerge.patch.product/pom.xml
index 0c69f6a..3389325 100644
--- a/releng/org.eclipse.emf.diffmerge.patch.product/pom.xml
+++ b/releng/org.eclipse.emf.diffmerge.patch.product/pom.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- 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
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/releng/org.eclipse.emf.diffmerge.patch.target/pom.xml b/releng/org.eclipse.emf.diffmerge.patch.target/pom.xml
index 68ebb83..d8cfef9 100644
--- a/releng/org.eclipse.emf.diffmerge.patch.target/pom.xml
+++ b/releng/org.eclipse.emf.diffmerge.patch.target/pom.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- 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
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.all/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.diffmerge.patch.tests.all/META-INF/MANIFEST.MF
index 902a23b..f2bd1af 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.all/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.all/META-INF/MANIFEST.MF
@@ -20,4 +20,5 @@ Require-Bundle: com.google.guava,
org.eclipse.emf.diffmerge.patch.tests.persistence.emf;bundle-version="[0.1.0,0.2.0)"
Import-Package: org.apache.log4j;version="1.2.0"
Bundle-Vendor: %providerName
+Automatic-Module-Name: org.eclipse.emf.diffmerge.patch.tests.all
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.all/about.html b/tests/org.eclipse.emf.diffmerge.patch.tests.all/about.html
index d8e1984..720a1d0 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.all/about.html
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.all/about.html
@@ -1,21 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
</head>
<body lang="EN-US">
<h2>About This Content</h2>
-<p>June 5, 2007</p>
+<p>August 17, 2018</p>
<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
</body>
</html> \ No newline at end of file
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.all/build.properties b/tests/org.eclipse.emf.diffmerge.patch.tests.all/build.properties
index 8617b2f..d0cc9a2 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.all/build.properties
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.all/build.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2016-2017 Thales Global Services S.A.S.
-# 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
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Abel Hegedus, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.all/plugin.properties b/tests/org.eclipse.emf.diffmerge.patch.tests.all/plugin.properties
index d1a2ce7..6035930 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.all/plugin.properties
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.all/plugin.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2016-2017 Thales Global Services S.A.S.
-# 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
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
pluginName = Model Patch All Tests Plug-In (Incubation)
providerName = Eclipse Modeling Project
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.all/src/org/eclipse/emf/diffmerge/patch/tests/all/RunAllTestSuite.xtend b/tests/org.eclipse.emf.diffmerge.patch.tests.all/src/org/eclipse/emf/diffmerge/patch/tests/all/RunAllTestSuite.xtend
index f6627cd..ba4c570 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.all/src/org/eclipse/emf/diffmerge/patch/tests/all/RunAllTestSuite.xtend
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.all/src/org/eclipse/emf/diffmerge/patch/tests/all/RunAllTestSuite.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/META-INF/MANIFEST.MF
index dd4d679..aafd8b6 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/META-INF/MANIFEST.MF
@@ -25,3 +25,4 @@ Require-Bundle: com.google.guava;bundle-version="15.0.0",
org.eclipse.emf.diffmerge.patch.persistence.json;bundle-version="[0.1.0,0.2.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: org.apache.log4j;version="1.2.0"
+Automatic-Module-Name: org.eclipse.emf.diffmerge.patch.tests.emf
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/about.html b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/about.html
index d8e1984..720a1d0 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/about.html
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/about.html
@@ -1,21 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
</head>
<body lang="EN-US">
<h2>About This Content</h2>
-<p>June 5, 2007</p>
+<p>August 17, 2018</p>
<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
</body>
</html> \ No newline at end of file
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/build.properties b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/build.properties
index 20a532d..836a07d 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/build.properties
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/build.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2016-2017 Thales Global Services S.A.S.
-# 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
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo2_modified.cyberphysicalsystem b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo2_modified.cyberphysicalsystem
index 034b58b..a15d03e 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo2_modified.cyberphysicalsystem
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo2_modified.cyberphysicalsystem
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="ASCII"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- 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
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo2_original.cyberphysicalsystem b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo2_original.cyberphysicalsystem
index 1745b5e..6a85592 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo2_original.cyberphysicalsystem
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo2_original.cyberphysicalsystem
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="ASCII"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- 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
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_modified.cyberphysicalsystem b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_modified.cyberphysicalsystem
index acc8a9a..513a7ac 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_modified.cyberphysicalsystem
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_modified.cyberphysicalsystem
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="ASCII"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- 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
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_original.cyberphysicalsystem b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_original.cyberphysicalsystem
index 9650842..43829d7 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_original.cyberphysicalsystem
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_original.cyberphysicalsystem
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="ASCII"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- 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
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withExtraContainmentTree.cyberphysicalsystem b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withExtraContainmentTree.cyberphysicalsystem
index badc5a3..16c6e00 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withExtraContainmentTree.cyberphysicalsystem
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withExtraContainmentTree.cyberphysicalsystem
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="ASCII"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- 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
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withExtraContainmentTreeAndReferenceFromOut.cyberphysicalsystem b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withExtraContainmentTreeAndReferenceFromOut.cyberphysicalsystem
index a69a848..cb4b910 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withExtraContainmentTreeAndReferenceFromOut.cyberphysicalsystem
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withExtraContainmentTreeAndReferenceFromOut.cyberphysicalsystem
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="ASCII"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- 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
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withExtraContainmentTreeAndReferenceToOut.cyberphysicalsystem b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withExtraContainmentTreeAndReferenceToOut.cyberphysicalsystem
index 50d7860..46e5560 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withExtraContainmentTreeAndReferenceToOut.cyberphysicalsystem
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withExtraContainmentTreeAndReferenceToOut.cyberphysicalsystem
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="ASCII"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- 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
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withModifiedRefWhichHasEOpposite.cyberphysicalsystem b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withModifiedRefWhichHasEOpposite.cyberphysicalsystem
index 6bf13b1..4cdde17 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withModifiedRefWhichHasEOpposite.cyberphysicalsystem
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withModifiedRefWhichHasEOpposite.cyberphysicalsystem
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="ASCII"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- 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
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/plugin.properties b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/plugin.properties
index 25875e8..9770ca7 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/plugin.properties
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/plugin.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2016-2017 Thales Global Services S.A.S.
-# 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
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
pluginName = Model Patch EMF Support Tests Plug-In (Incubation)
providerName = Eclipse Modeling Project
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/pom.xml b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/pom.xml
index a057286..4a65fa4 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/pom.xml
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/pom.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- 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
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/CPSModelPatchApplierTest.xtend b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/CPSModelPatchApplierTest.xtend
index 4e0e2df..0213638 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/CPSModelPatchApplierTest.xtend
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/CPSModelPatchApplierTest.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/CPSModelPatchTest.xtend b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/CPSModelPatchTest.xtend
index bd9a37c..292fabe 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/CPSModelPatchTest.xtend
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/CPSModelPatchTest.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/EMFDiffMergeTest.xtend b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/EMFDiffMergeTest.xtend
index 8d3dff5..962cd3d 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/EMFDiffMergeTest.xtend
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/EMFDiffMergeTest.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/EMFModelAccessTest.xtend b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/EMFModelAccessTest.xtend
index 1c9083d..7f3679e 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/EMFModelAccessTest.xtend
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/EMFModelAccessTest.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/EMFModelPatchMetadataTest.xtend b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/EMFModelPatchMetadataTest.xtend
index 7dfdb33..99b03f3 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/EMFModelPatchMetadataTest.xtend
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/EMFModelPatchMetadataTest.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchApplierSmokeTests.xtend b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchApplierSmokeTests.xtend
index 9d592b8..2ce272d 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchApplierSmokeTests.xtend
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchApplierSmokeTests.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchEmfTestSuite.xtend b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchEmfTestSuite.xtend
index f36d197..00c7f0f 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchEmfTestSuite.xtend
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchEmfTestSuite.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchExporterTest.xtend b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchExporterTest.xtend
index 4a0728f..7c8f60f 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchExporterTest.xtend
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchExporterTest.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchRecorderTest.xtend b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchRecorderTest.xtend
index 388422e..293b5ed 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchRecorderTest.xtend
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchRecorderTest.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchScalerTest.java b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchScalerTest.java
index a5cd77e..75528d4 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchScalerTest.java
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchScalerTest.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/identifier/EMFIdentifierProviderTest.java b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/identifier/EMFIdentifierProviderTest.java
index 6baf67e..105464a 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/identifier/EMFIdentifierProviderTest.java
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/identifier/EMFIdentifierProviderTest.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/identifier/IdentifiedEMFObjectLocatorTest.java b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/identifier/IdentifiedEMFObjectLocatorTest.java
index 51cb9e5..6414708 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/identifier/IdentifiedEMFObjectLocatorTest.java
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/identifier/IdentifiedEMFObjectLocatorTest.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/identifier/IdentifierTestSuite.java b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/identifier/IdentifierTestSuite.java
index 62ad3ae..cf8cbb7 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/identifier/IdentifierTestSuite.java
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/identifier/IdentifierTestSuite.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.performance/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.diffmerge.patch.tests.performance/META-INF/MANIFEST.MF
index 2a0987d..c2cd00a 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.performance/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.performance/META-INF/MANIFEST.MF
@@ -24,3 +24,4 @@ Require-Bundle: org.junit;bundle-version="4.12.0",
org.eclipse.viatra.query.runtime.base.itc;bundle-version="[1.4.0,2.0.0)",
org.eclipse.emf.edit;bundle-version="2.9.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Automatic-Module-Name: org.eclipse.emf.diffmerge.patch.tests.performance
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.performance/about.html b/tests/org.eclipse.emf.diffmerge.patch.tests.performance/about.html
index d8e1984..720a1d0 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.performance/about.html
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.performance/about.html
@@ -1,21 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
</head>
<body lang="EN-US">
<h2>About This Content</h2>
-<p>June 5, 2007</p>
+<p>August 17, 2018</p>
<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
</body>
</html> \ No newline at end of file
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.performance/build.properties b/tests/org.eclipse.emf.diffmerge.patch.tests.performance/build.properties
index cb502e4..7aa9f45 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.performance/build.properties
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.performance/build.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2016-2017 Thales Global Services S.A.S.
-# 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
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Abel Hegedus, Tamas Borbas, Peter Lunk (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.performance/plugin.properties b/tests/org.eclipse.emf.diffmerge.patch.tests.performance/plugin.properties
index a49b113..d76e460 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.performance/plugin.properties
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.performance/plugin.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2016-2017 Thales Global Services S.A.S.
-# 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
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
pluginName = Model Patch Performance Tests Plug-In (Incubation)
providerName = Eclipse Modeling Project
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.performance/pom.xml b/tests/org.eclipse.emf.diffmerge.patch.tests.performance/pom.xml
index 4dfe82a..e9dd196 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.performance/pom.xml
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.performance/pom.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- 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
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Peter Lunk (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.performance/src/org/eclipse/emf/diffmerge/patch/tests/performance/CpsModelLoader.java b/tests/org.eclipse.emf.diffmerge.patch.tests.performance/src/org/eclipse/emf/diffmerge/patch/tests/performance/CpsModelLoader.java
index d2a974b..aa11a49 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.performance/src/org/eclipse/emf/diffmerge/patch/tests/performance/CpsModelLoader.java
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.performance/src/org/eclipse/emf/diffmerge/patch/tests/performance/CpsModelLoader.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.performance/src/org/eclipse/emf/diffmerge/patch/tests/performance/ModelPatchPerformanceTests.xtend b/tests/org.eclipse.emf.diffmerge.patch.tests.performance/src/org/eclipse/emf/diffmerge/patch/tests/performance/ModelPatchPerformanceTests.xtend
index 2720273..7297e00 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.performance/src/org/eclipse/emf/diffmerge/patch/tests/performance/ModelPatchPerformanceTests.xtend
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.performance/src/org/eclipse/emf/diffmerge/patch/tests/performance/ModelPatchPerformanceTests.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/META-INF/MANIFEST.MF
index f240da6..843e0ee 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/META-INF/MANIFEST.MF
@@ -12,3 +12,4 @@ Require-Bundle: org.junit;bundle-version="4.12.0",
org.eclipse.emf.diffmerge.patch.persistence.json;bundle-version="[0.1.0,0.2.0)"
Bundle-Vendor: %providerName
Export-Package: org.eclipse.emf.diffmerge.patch.tests.persistence.emf
+Automatic-Module-Name: org.eclipse.emf.diffmerge.patch.tests.persistence.emf
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/about.html b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/about.html
index d8e1984..720a1d0 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/about.html
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/about.html
@@ -1,21 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
</head>
<body lang="EN-US">
<h2>About This Content</h2>
-<p>June 5, 2007</p>
+<p>August 17, 2018</p>
<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
</body>
</html> \ No newline at end of file
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/build.properties b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/build.properties
index 909ef3f..89387f3 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/build.properties
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/build.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2016-2017 Thales Global Services S.A.S.
-# 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
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/plugin.properties b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/plugin.properties
index 8cf3b92..a41a02d 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/plugin.properties
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/plugin.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2016-2017 Thales Global Services S.A.S.
-# 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
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
pluginName = Model Patch EMF Persistence Tests Plug-In (Incubation)
providerName = Eclipse Modeling Project
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/pom.xml b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/pom.xml
index 7505279..d41345f 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/pom.xml
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/pom.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- 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
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/BaseModelPatchPersistenceEMFTest.java b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/BaseModelPatchPersistenceEMFTest.java
index 7e60ea5..abe4abf 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/BaseModelPatchPersistenceEMFTest.java
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/BaseModelPatchPersistenceEMFTest.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/ModelPatchPersistenceEMFTest.java b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/ModelPatchPersistenceEMFTest.java
index ebabb58..8c5e5a2 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/ModelPatchPersistenceEMFTest.java
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/ModelPatchPersistenceEMFTest.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/ModelPatchPersistenceEMFTestSuite.xtend b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/ModelPatchPersistenceEMFTestSuite.xtend
index 7b5d49a..56a9276 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/ModelPatchPersistenceEMFTestSuite.xtend
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/ModelPatchPersistenceEMFTestSuite.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/ModelPatchSerializerEMFTest.xtend b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/ModelPatchSerializerEMFTest.xtend
index 769470d..1dcb990 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/ModelPatchSerializerEMFTest.xtend
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/ModelPatchSerializerEMFTest.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/META-INF/MANIFEST.MF
index a1dee48..7a36d11 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/META-INF/MANIFEST.MF
@@ -10,3 +10,4 @@ Require-Bundle: org.junit;bundle-version="4.12.0",
org.eclipse.emf.diffmerge.patch.persistence.json;bundle-version="[0.1.0,0.2.0)"
Bundle-Vendor: %providerName
Export-Package: org.eclipse.emf.diffmerge.patch.tests.persistence.json
+Automatic-Module-Name: org.eclipse.emf.diffmerge.patch.tests.persistence.json
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/about.html b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/about.html
index d8e1984..720a1d0 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/about.html
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/about.html
@@ -1,21 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
</head>
<body lang="EN-US">
<h2>About This Content</h2>
-<p>June 5, 2007</p>
+<p>August 17, 2018</p>
<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
</body>
</html> \ No newline at end of file
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/build.properties b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/build.properties
index 909ef3f..89387f3 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/build.properties
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/build.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2016-2017 Thales Global Services S.A.S.
-# 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
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/plugin.properties b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/plugin.properties
index 9d5068f..da2c34e 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/plugin.properties
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/plugin.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2016-2017 Thales Global Services S.A.S.
-# 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
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
pluginName = Model Patch JSON Persistence Tests Plug-In (Incubation)
providerName = Eclipse Modeling Project
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/pom.xml b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/pom.xml
index 481bc2b..6519182 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/pom.xml
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/pom.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- 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
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/src/org/eclipse/emf/diffmerge/patch/tests/persistence/json/ModelPatchPersistenceJsonTest.java b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/src/org/eclipse/emf/diffmerge/patch/tests/persistence/json/ModelPatchPersistenceJsonTest.java
index 3fef874..1eb99c0 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/src/org/eclipse/emf/diffmerge/patch/tests/persistence/json/ModelPatchPersistenceJsonTest.java
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/src/org/eclipse/emf/diffmerge/patch/tests/persistence/json/ModelPatchPersistenceJsonTest.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/src/org/eclipse/emf/diffmerge/patch/tests/persistence/json/ModelPatchPersistenceJsonTestSuite.xtend b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/src/org/eclipse/emf/diffmerge/patch/tests/persistence/json/ModelPatchPersistenceJsonTestSuite.xtend
index 2e43c30..fc0b6c3 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/src/org/eclipse/emf/diffmerge/patch/tests/persistence/json/ModelPatchPersistenceJsonTestSuite.xtend
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/src/org/eclipse/emf/diffmerge/patch/tests/persistence/json/ModelPatchPersistenceJsonTestSuite.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.ui/pom.xml b/tests/org.eclipse.emf.diffmerge.patch.tests.ui/pom.xml
index 8cab5b9..19793b0 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.ui/pom.xml
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.ui/pom.xml
@@ -1,9 +1,10 @@
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- 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
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.diffmerge.patch.tests/META-INF/MANIFEST.MF
index c8154e6..2aa4da9 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests/META-INF/MANIFEST.MF
@@ -9,3 +9,4 @@ Require-Bundle: org.junit;bundle-version="4.12.0",
org.eclipse.xtend.lib
Bundle-Vendor: %providerName
Export-Package: org.eclipse.emf.diffmerge.patch.tests
+Automatic-Module-Name: org.eclipse.emf.diffmerge.patch.tests
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests/about.html b/tests/org.eclipse.emf.diffmerge.patch.tests/about.html
index d8e1984..720a1d0 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests/about.html
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests/about.html
@@ -1,21 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
</head>
<body lang="EN-US">
<h2>About This Content</h2>
-<p>June 5, 2007</p>
+<p>August 17, 2018</p>
<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
</body>
</html> \ No newline at end of file
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests/build.properties b/tests/org.eclipse.emf.diffmerge.patch.tests/build.properties
index 909ef3f..89387f3 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests/build.properties
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests/build.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2016-2017 Thales Global Services S.A.S.
-# 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
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests/plugin.properties b/tests/org.eclipse.emf.diffmerge.patch.tests/plugin.properties
index ad5c98c..b27cc40 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests/plugin.properties
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests/plugin.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2016-2017 Thales Global Services S.A.S.
-# 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
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
pluginName = Model Patch Tests Plug-In (Incubation)
providerName = Eclipse Modeling Project
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests/pom.xml b/tests/org.eclipse.emf.diffmerge.patch.tests/pom.xml
index 47d71cd..5d6831a 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests/pom.xml
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests/pom.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- 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
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/BasicReverseModelPatchTests.xtend b/tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/BasicReverseModelPatchTests.xtend
index 7ae4369..080ea5d 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/BasicReverseModelPatchTests.xtend
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/BasicReverseModelPatchTests.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/ComplexReverseModelPatchTest.xtend b/tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/ComplexReverseModelPatchTest.xtend
index 999dd65..4c85a45 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/ComplexReverseModelPatchTest.xtend
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/ComplexReverseModelPatchTest.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/ModelPatchFilterTest.xtend b/tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/ModelPatchFilterTest.xtend
index 96b6b7c..553c2e5 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/ModelPatchFilterTest.xtend
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/ModelPatchFilterTest.xtend
@@ -1,9 +1,10 @@
/**
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/ModelPatchTestSuite.xtend b/tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/ModelPatchTestSuite.xtend
index e5f9417..ed849d0 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/ModelPatchTestSuite.xtend
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/ModelPatchTestSuite.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * 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
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation

Back to the top