Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Constant2018-09-07 11:36:40 -0400
committerOlivier Constant2018-10-03 04:38:38 -0400
commit777560051c3b922787aae661dd390092be4e2f38 (patch)
tree988c6f44b08d0fc3b12ddb353d9e3bf1c3e5e693
parent17084c20f7195e9a2c760b6f61956a04ce80198b (diff)
downloadorg.eclipse.emf.diffmerge.patch-777560051c3b922787aae661dd390092be4e2f38.tar.gz
org.eclipse.emf.diffmerge.patch-777560051c3b922787aae661dd390092be4e2f38.tar.xz
org.eclipse.emf.diffmerge.patch-777560051c3b922787aae661dd390092be4e2f38.zip
Bug 538800 - Upgrade version to 0.11.0v0.11.0
- diffmerge.patch: copyrights only, following license change Change-Id: I7eb5d5c41d80ea6d57b0dea1a752f6d1723704f5 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
-rw-r--r--examples/org.eclipse.emf.diffmerge.patch.examples.cps/demo_corrected.cyberphysicalsystem2
-rw-r--r--examples/org.eclipse.emf.diffmerge.patch.examples.cps/demo_modified.cyberphysicalsystem2
-rw-r--r--examples/org.eclipse.emf.diffmerge.patch.examples.cps/demo_original.cyberphysicalsystem2
-rw-r--r--examples/org.eclipse.emf.diffmerge.patch.examples/build.properties2
-rw-r--r--examples/org.eclipse.emf.diffmerge.patch.examples/plugin.properties2
-rw-r--r--examples/org.eclipse.emf.diffmerge.patch.examples/plugin.xml2
-rw-r--r--examples/org.eclipse.emf.diffmerge.patch.examples/pom.xml2
-rw-r--r--features/org.eclipse.emf.diffmerge.patch.feature.dependencies/build.properties2
-rw-r--r--features/org.eclipse.emf.diffmerge.patch.feature.dependencies/pom.xml2
-rw-r--r--features/org.eclipse.emf.diffmerge.patch.feature/build.properties2
-rw-r--r--features/org.eclipse.emf.diffmerge.patch.feature/pom.xml2
-rw-r--r--features/org.eclipse.emf.diffmerge.patch.runtime.feature/build.properties2
-rw-r--r--features/org.eclipse.emf.diffmerge.patch.runtime.feature/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/build.properties2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/model/modelpatch.genmodel2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/plugin.properties2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/EMFModelPatchPersister.xtend2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/EMFModelPatchSerializer.xtend2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EAttributeEntry.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EChangeDirection.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EElementEntry.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EIdentifiable.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatch.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchEMFMetadata.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchElement.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchEntry.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchFactory.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchMetadata.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchPackage.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EReferenceEntry.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EStructuralFeatureEntry.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EAttributeEntryImpl.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EElementEntryImpl.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EIdentifiableImpl.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchEMFMetadataImpl.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchElementImpl.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchEntryImpl.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchFactoryImpl.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchImpl.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchMetadataImpl.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchPackageImpl.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EReferenceEntryImpl.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EStructuralFeatureEntryImpl.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/util/EModelPatchAdapterFactory.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/util/EModelPatchSwitch.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/transform/EModelPatchToPOJO.xtend2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/transform/ModelPatchToEMF.xtend2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.json/build.properties2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.json/plugin.properties2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.json/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.json/src/org/eclipse/emf/diffmerge/patch/serializer/gson/GsonModelPatchSerializer.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.json/src/org/eclipse/emf/diffmerge/patch/serializer/gson/typeadapters/AbstractSubclassAdapter.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/build.properties2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/plugin.properties2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/EMFModelPatchApplier.xtend2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/EMFModelPatchMetadata.xtend2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/EMFPatchApplication.xtend2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/ModelPatchRecorder.xtend2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/BaseIndexEObjectLocator.xtend2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/EMFIdentifierProvider.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/EObjectIdentifierProvider.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/EObjectLocator.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/IDAttributeBasedEObjectIdentifierProvider.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/IdentifiedEMFObjectLocator.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/TreeIteratorEObjectLocator.xtend2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/AbstractEMFModleAccess.xtend2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/EMFModelAccess.xtend2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/ModelAccessProvider.xtend2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/ModelAccessTypes.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/SimpleReflectiveEMFModelAccess.xtend2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/ViatraModelAccess.xtend2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/build.properties2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/plugin.properties2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/plugin.xml2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/ModelPatchUIPlugin.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/dialogs/ModelpatchEntryFilterCreationDialog.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/dialogs/ModelpatchViewerDialog.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/dialogs/PluginID.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/editors/ModelPatchEditorPart.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/handlers/ComparisonSelectionUtil.xtend2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/handlers/ModelpatchApplicationHandler.xtend2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/handlers/ModelpatchGenerationHandler.xtend2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/preferences/ModelPatchPreferencePage.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/preferences/ModelPatchPreferenceProvider.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/DefaultEntryLabelProvider.xtend2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/DescriptiveEntryLabelProvider.xtend2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/DialogFactory.xtend2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/EntryPropertyWrapper.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/IEntryLabelProvider.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/IdentifiableWrapper.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/IdentifiableWrapperFactory.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchContentProvider.xtend2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchEntryFilterContentProvider.xtend2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchEntryFilterLabelProvider.xtend2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchEntryHelper.xtend2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchLabelProvider.xtend2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelpatchApplicationDTO.xtend2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/PersistenceTypes.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/SerializerProvider.xtend2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/ModelpatchApplicationWizard.xtend2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchEDMWizardPage.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchFilteringWizardPage.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchLoadingPatchWizardPage.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchResultWizardPage.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/build.properties2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/plugin.properties2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/AbstractModelPatchEntry.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/AttributeEntry.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/ElementEntry.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/ReferenceEntry.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/StructuralFeatureEntry.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/BaseModelPatchMetadata.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ChangeDirection.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ComplexMPEFilterType.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/EntryType.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/IModelPatchEntryFilter.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/Identifiable.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatch.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchBuilder.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchDiagnosticElement.xtend2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchEntry.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchEntryBuilder.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchEntryProperty.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchException.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchFilterApplier.xtend2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchMetadata.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchReverser.xtend2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/PatchApplication.xtend2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/PatchApplicationDiagnostic.java2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/filters/ComplexEntryFilter.xtend2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/filters/EntryDirectionFilter.xtend2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/filters/EntryPropertyFilter.xtend2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/filters/EntryTypeFilter.xtend2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/persistence/ModelPatchPersister.xtend2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/serializer/IModelPatchSerializer.java2
-rw-r--r--releng/org.eclipse.emf.diffmerge.patch.product/modelpatch_rcp.product2
-rw-r--r--releng/org.eclipse.emf.diffmerge.patch.product/pom.xml2
-rw-r--r--releng/org.eclipse.emf.diffmerge.patch.target/pom.xml2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.all/build.properties2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.all/plugin.properties2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.all/src/org/eclipse/emf/diffmerge/patch/tests/all/RunAllTestSuite.xtend2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/build.properties2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/ClockRadio.melodymodeller4
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo2_modified.cyberphysicalsystem2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo2_original.cyberphysicalsystem2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_modified.cyberphysicalsystem2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_original.cyberphysicalsystem2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withExtraContainmentTree.cyberphysicalsystem2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withExtraContainmentTreeAndReferenceFromOut.cyberphysicalsystem2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withExtraContainmentTreeAndReferenceToOut.cyberphysicalsystem2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withModifiedRefWhichHasEOpposite.cyberphysicalsystem2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/plugin.properties2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/pom.xml2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/CPSModelPatchApplierTest.xtend2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/CPSModelPatchTest.xtend2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/EMFDiffMergeTest.xtend2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/EMFModelAccessTest.xtend2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/EMFModelPatchMetadataTest.xtend2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchApplierSmokeTests.xtend2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchEmfTestSuite.xtend2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchExporterTest.xtend2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchRecorderTest.xtend2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchScalerTest.java2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/identifier/EMFIdentifierProviderTest.java2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/identifier/IdentifiedEMFObjectLocatorTest.java2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/identifier/IdentifierTestSuite.java2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.performance/build.properties2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.performance/plugin.properties2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.performance/pom.xml2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.performance/src/org/eclipse/emf/diffmerge/patch/tests/performance/CpsModelLoader.java2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.performance/src/org/eclipse/emf/diffmerge/patch/tests/performance/ModelPatchPerformanceTests.xtend2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/build.properties2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/plugin.properties2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/pom.xml2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/BaseModelPatchPersistenceEMFTest.java2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/ModelPatchPersistenceEMFTest.java2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/ModelPatchPersistenceEMFTestSuite.xtend2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/ModelPatchSerializerEMFTest.xtend2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/build.properties2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/plugin.properties2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/pom.xml2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/src/org/eclipse/emf/diffmerge/patch/tests/persistence/json/ModelPatchPersistenceJsonTest.java2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/src/org/eclipse/emf/diffmerge/patch/tests/persistence/json/ModelPatchPersistenceJsonTestSuite.xtend2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.ui/pom.xml2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests/build.properties2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests/plugin.properties2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests/pom.xml2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/BasicReverseModelPatchTests.xtend2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/ComplexReverseModelPatchTest.xtend2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/ModelPatchFilterTest.xtend2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/ModelPatchTestSuite.xtend2
195 files changed, 196 insertions, 196 deletions
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 3eaba6a..6fc013e 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,6 +1,6 @@
<?xml version="1.0" encoding="ASCII"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ 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/
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 513a7ac..3eb8c26 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,6 +1,6 @@
<?xml version="1.0" encoding="ASCII"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ 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/
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 43829d7..fc7ef40 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,6 +1,6 @@
<?xml version="1.0" encoding="ASCII"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ 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/
diff --git a/examples/org.eclipse.emf.diffmerge.patch.examples/build.properties b/examples/org.eclipse.emf.diffmerge.patch.examples/build.properties
index 174db2f..2c7bd3f 100644
--- a/examples/org.eclipse.emf.diffmerge.patch.examples/build.properties
+++ b/examples/org.eclipse.emf.diffmerge.patch.examples/build.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2016-2017 Thales Global Services S.A.S.
+# 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/
diff --git a/examples/org.eclipse.emf.diffmerge.patch.examples/plugin.properties b/examples/org.eclipse.emf.diffmerge.patch.examples/plugin.properties
index ee9d45b..cced9e8 100644
--- a/examples/org.eclipse.emf.diffmerge.patch.examples/plugin.properties
+++ b/examples/org.eclipse.emf.diffmerge.patch.examples/plugin.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2016-2017 Thales Global Services S.A.S.
+# 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/
diff --git a/examples/org.eclipse.emf.diffmerge.patch.examples/plugin.xml b/examples/org.eclipse.emf.diffmerge.patch.examples/plugin.xml
index 158c106..3b627e3 100644
--- a/examples/org.eclipse.emf.diffmerge.patch.examples/plugin.xml
+++ b/examples/org.eclipse.emf.diffmerge.patch.examples/plugin.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ 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/
diff --git a/examples/org.eclipse.emf.diffmerge.patch.examples/pom.xml b/examples/org.eclipse.emf.diffmerge.patch.examples/pom.xml
index f2d2d08..6aff256 100644
--- a/examples/org.eclipse.emf.diffmerge.patch.examples/pom.xml
+++ b/examples/org.eclipse.emf.diffmerge.patch.examples/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ 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/
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 bcd5f37..7f13d3e 100644
--- a/features/org.eclipse.emf.diffmerge.patch.feature.dependencies/build.properties
+++ b/features/org.eclipse.emf.diffmerge.patch.feature.dependencies/build.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2016-2017 Thales Global Services S.A.S.
+# 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/
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 5fcd1ae..5c2b065 100644
--- a/features/org.eclipse.emf.diffmerge.patch.feature.dependencies/pom.xml
+++ b/features/org.eclipse.emf.diffmerge.patch.feature.dependencies/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ 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/
diff --git a/features/org.eclipse.emf.diffmerge.patch.feature/build.properties b/features/org.eclipse.emf.diffmerge.patch.feature/build.properties
index 8eb0d6a..df1cd33 100644
--- a/features/org.eclipse.emf.diffmerge.patch.feature/build.properties
+++ b/features/org.eclipse.emf.diffmerge.patch.feature/build.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2016-2017 Thales Global Services S.A.S.
+# 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/
diff --git a/features/org.eclipse.emf.diffmerge.patch.feature/pom.xml b/features/org.eclipse.emf.diffmerge.patch.feature/pom.xml
index b56da71..e532d4b 100644
--- a/features/org.eclipse.emf.diffmerge.patch.feature/pom.xml
+++ b/features/org.eclipse.emf.diffmerge.patch.feature/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ 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/
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 8eb0d6a..df1cd33 100644
--- a/features/org.eclipse.emf.diffmerge.patch.runtime.feature/build.properties
+++ b/features/org.eclipse.emf.diffmerge.patch.runtime.feature/build.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2016-2017 Thales Global Services S.A.S.
+# 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/
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 f6d8511..6512119 100644
--- a/features/org.eclipse.emf.diffmerge.patch.runtime.feature/pom.xml
+++ b/features/org.eclipse.emf.diffmerge.patch.runtime.feature/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ 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/
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 bc5ad1a..7650721 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/build.properties
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/build.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2016-2017 Thales Global Services S.A.S.
+# 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/
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/model/modelpatch.genmodel b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/model/modelpatch.genmodel
index 39e13a7..f1406aa 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/model/modelpatch.genmodel
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/model/modelpatch.genmodel
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2016-2017 Thales Global Services S.A.S.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation"
+ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2016-2018 Thales Global Services S.A.S.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation"
modelDirectory="/org.eclipse.emf.diffmerge.patch.persistence.emf/src" modelPluginID="org.eclipse.emf.diffmerge.patch.persistence.emf"
modelName="EModelPatch" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
importerID="org.eclipse.emf.importer.ecore" complianceLevel="7.0" copyrightFields="false"
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 fa835d8..3d9bf6f 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/plugin.properties
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/plugin.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2016-2017 Thales Global Services S.A.S.
+# 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/
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 ef581db..28d850a 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/pom.xml
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ 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/
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 e5d391d..ecee983 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2017 Thales Global Services S.A.S.
+ * Copyright (c) 2017-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/
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 255302d..f900afd 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2017 Thales Global Services S.A.S.
+ * Copyright (c) 2017-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/
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 82f597f..95db976 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,5 +1,5 @@
/**
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 902c301..4f5fe94 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,5 +1,5 @@
/**
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 a7be0a6..178a835 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,5 +1,5 @@
/**
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 2ea15bb..5e05837 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,5 +1,5 @@
/**
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 51978b1..5e5444a 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,5 +1,5 @@
/**
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 dae97c0..f9c7bfe 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,5 +1,5 @@
/**
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 9b591ce..6ee09e2 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,5 +1,5 @@
/**
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 62863d5..d0eec54 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,5 +1,5 @@
/**
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 82e526a..ce016dd 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,5 +1,5 @@
/**
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 874c2b2..f007fca 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,5 +1,5 @@
/**
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 f251c14..9788d86 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,5 +1,5 @@
/**
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 d06b32c..24e3c64 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,5 +1,5 @@
/**
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 9b33734..204fc3b 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,5 +1,5 @@
/**
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 6ccd980..b1577d4 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,5 +1,5 @@
/**
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 905678e..9878d71 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,5 +1,5 @@
/**
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 ae08144..1452be8 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,5 +1,5 @@
/**
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 2c805ce..296dfc3 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,5 +1,5 @@
/**
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 b39af9e..6de54ec 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,5 +1,5 @@
/**
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 57b512b..9cb295d 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,5 +1,5 @@
/**
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 8403106..9e2c80d 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,5 +1,5 @@
/**
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 179413e..2c45a07 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,5 +1,5 @@
/**
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 68e7e17..8658299 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,5 +1,5 @@
/**
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 6597e2a..d5dde98 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,5 +1,5 @@
/**
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 9bc2916..ab9c350 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,5 +1,5 @@
/**
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 ad83385..f3acf8a 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,5 +1,5 @@
/**
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 173663e..e5f35ec 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,5 +1,5 @@
/**
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 50ab020..dbf7611 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,5 +1,5 @@
/**
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 3acd270..340bb63 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2017 Thales Global Services S.A.S.
+ * Copyright (c) 2017-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/
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 861f703..e8233df 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2017 Thales Global Services S.A.S.
+ * Copyright (c) 2017-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/
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 b612ecb..56995f9 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/build.properties
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/build.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2016-2017 Thales Global Services S.A.S.
+# 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/
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 ac06927..0288fab 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/plugin.properties
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/plugin.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2016-2017 Thales Global Services S.A.S.
+# 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/
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 30d4ef5..52cb557 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/pom.xml
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ 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/
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 69e978e..d026eaa 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 c6d5928..13ba2aa 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/build.properties b/plugins/org.eclipse.emf.diffmerge.patch.runtime/build.properties
index 4e20993..7144ba7 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/build.properties
+++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/build.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2016-2017 Thales Global Services S.A.S.
+# 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/
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/plugin.properties b/plugins/org.eclipse.emf.diffmerge.patch.runtime/plugin.properties
index a3644f9..cbd5fbc 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/plugin.properties
+++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/plugin.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2016-2017 Thales Global Services S.A.S.
+# 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/
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/pom.xml b/plugins/org.eclipse.emf.diffmerge.patch.runtime/pom.xml
index 45fb874..093e308 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/pom.xml
+++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ 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/
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 dad708e..69a9be1 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 5a5ce6a..8478eae 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 bccac31..b11947f 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 0c4b96e..13a0532 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 5568b8b..0bd21e6 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 d2b632a..94e3c77 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 a6ec453..b62eebb 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 0277d57..a2b30d2 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 e6036bd..9bede69 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2017 Thales Global Services S.A.S.
+ * Copyright (c) 2017-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/
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 d4bd897..59f87c3 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 94c5e7e..90b852a 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 8fc4faa..6ebe427 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 ad6c400..751c8f3 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 eee48b5..21c290f 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 c42175d..4d14354 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 2d92680..805f26a 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 98fc8e3..853a243 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/build.properties b/plugins/org.eclipse.emf.diffmerge.patch.ui/build.properties
index 80b9294..d676b4a 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/build.properties
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/build.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2016-2017 Thales Global Services S.A.S.
+# 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/
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/plugin.properties b/plugins/org.eclipse.emf.diffmerge.patch.ui/plugin.properties
index 5f1a886..10227ea 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/plugin.properties
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/plugin.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2016-2017 Thales Global Services S.A.S.
+# 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/
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/plugin.xml b/plugins/org.eclipse.emf.diffmerge.patch.ui/plugin.xml
index e404f75..d4761aa 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/plugin.xml
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/plugin.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ 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/
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/pom.xml b/plugins/org.eclipse.emf.diffmerge.patch.ui/pom.xml
index 232140d..aacdfbf 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/pom.xml
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ 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/
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 252a24c..18e0b7d 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 fdaa462..8ebc933 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 d010926..32b27eb 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 24b2174..5d4fc81 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 6de511f..708293a 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 57172a5..60a6620 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 ee8acc5..c10f9f1 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 0705ed7..509a5a5 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 c77e2f6..f9e5189 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 65b0be2..5913f6f 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 cdb9994..60cccd3 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 54c67fa..59833b7 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 3bbf2f4..ab52ec2 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 dd6d2d2..e2123a3 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 f8ca550..802fb93 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 8877664..9bda3d1 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 c9a1fe9..08f628f 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 9f0497a..e389aa1 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 b91ba35..8911b4f 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 743b045..ae02c6e 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 defc363..311fb9b 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 3d6e95a..931374d 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 4fdfa35..847c836 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 7ddfbf8..1f23504 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 9909f7d..9b6153d 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 fbcde93..424283b 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 9e362f9..2b8afa9 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 3704f07..89af8bb 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 e20bb3e..58ac6be 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 111a63c..00c4a96 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
diff --git a/plugins/org.eclipse.emf.diffmerge.patch/build.properties b/plugins/org.eclipse.emf.diffmerge.patch/build.properties
index 89387f3..5f03c34 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch/build.properties
+++ b/plugins/org.eclipse.emf.diffmerge.patch/build.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2016-2017 Thales Global Services S.A.S.
+# 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/
diff --git a/plugins/org.eclipse.emf.diffmerge.patch/plugin.properties b/plugins/org.eclipse.emf.diffmerge.patch/plugin.properties
index 5e37462..6ed629c 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch/plugin.properties
+++ b/plugins/org.eclipse.emf.diffmerge.patch/plugin.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2016-2017 Thales Global Services S.A.S.
+# 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/
diff --git a/plugins/org.eclipse.emf.diffmerge.patch/pom.xml b/plugins/org.eclipse.emf.diffmerge.patch/pom.xml
index 6838067..fafbfca 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch/pom.xml
+++ b/plugins/org.eclipse.emf.diffmerge.patch/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ 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/
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 d9d4435..c2771e7 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 0e404ec..e430e2a 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 e4aa3e0..1456206 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 3ef7646..1356480 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 4e446ca..812a5b0 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 2aa8f6f..c8a290a 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 5c271e5..eaadbab 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 e414260..e55f03c 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 2e56e52..2ed07b9 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 78015d8..2ac9383 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 3c9328e..3469830 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 8fbf52a..33be151 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 05a3ee7..ee70076 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 e2ef1d5..5c6a148 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 840d399..fb90511 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 6d3160e..1ce27b5 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 ecadbd4..4513f73 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 c706c1d..5a7e372 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 58926e2..78fbdcf 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 2d66313..5f5c9c8 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 b3a221d..657fd30 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 40c1db5..b763608 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 878fc02..47f4181 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 e75af3c..31b51fb 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 433994e..4909ed7 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 be47216..41f5acf 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 5fbecd0..62319d7 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 5e49f3e..9387b44 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2017 Thales Global Services S.A.S.
+ * Copyright (c) 2017-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/
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 1d29f40..4edce13 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
diff --git a/releng/org.eclipse.emf.diffmerge.patch.product/modelpatch_rcp.product b/releng/org.eclipse.emf.diffmerge.patch.product/modelpatch_rcp.product
index c11b42b..4d90a58 100644
--- a/releng/org.eclipse.emf.diffmerge.patch.product/modelpatch_rcp.product
+++ b/releng/org.eclipse.emf.diffmerge.patch.product/modelpatch_rcp.product
@@ -26,7 +26,7 @@
<license>
<url>http://www.eclipse.org/legal/epl-v10.html</url>
<text>
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ 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 v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
Contributors:
diff --git a/releng/org.eclipse.emf.diffmerge.patch.product/pom.xml b/releng/org.eclipse.emf.diffmerge.patch.product/pom.xml
index 3389325..e42ba35 100644
--- a/releng/org.eclipse.emf.diffmerge.patch.product/pom.xml
+++ b/releng/org.eclipse.emf.diffmerge.patch.product/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ 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/
diff --git a/releng/org.eclipse.emf.diffmerge.patch.target/pom.xml b/releng/org.eclipse.emf.diffmerge.patch.target/pom.xml
index d8cfef9..3282320 100644
--- a/releng/org.eclipse.emf.diffmerge.patch.target/pom.xml
+++ b/releng/org.eclipse.emf.diffmerge.patch.target/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ 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/
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 d0cc9a2..e2c5811 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.all/build.properties
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.all/build.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2016-2017 Thales Global Services S.A.S.
+# 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/
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 6035930..334a2b3 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.all/plugin.properties
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.all/plugin.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2016-2017 Thales Global Services S.A.S.
+# 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/
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 ba4c570..0f389d3 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 836a07d..de68699 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/build.properties
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/build.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2016-2017 Thales Global Services S.A.S.
+# 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/
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/ClockRadio.melodymodeller b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/ClockRadio.melodymodeller
index 67f021a..5612899 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/ClockRadio.melodymodeller
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/ClockRadio.melodymodeller
@@ -1051,7 +1051,7 @@
id="5826e8ae-6abb-44ff-8b2a-c5075fbb46ad" targetElement="#72da48fd-a612-4a5d-94ea-9761766be7a6"
sourceElement="#e28f24ea-c6f0-4fa6-ae8e-080e5fa52fc3"/>
<ownedFunctionalExchanges xsi:type="org.polarsys.capella.core.data.fa:FunctionalExchange"
- id="7e183eb2-89b3-49bc-9414-201792e5971f" name="new current time"
+ id="7e183eb2-89b3-49bc-9414-201892e5971f" name="new current time"
target="#64270f20-0db3-46b2-9627-9774c9167f70" source="#668aae30-0c45-49cf-ba27-6cd3943877b1"/>
</ownedFunctions>
<ownedFunctions xsi:type="org.polarsys.capella.core.data.la:LogicalFunction"
@@ -2109,7 +2109,7 @@
id="7dcdf8ea-cf11-4709-a682-f0db549ce99c" name="Clock HMI" source="#8ce9d84a-c8d4-4b75-b00c-b3b2e857f109"
target="#fcb423f6-0fdf-47f8-843d-6da0ad81ec81" kind="FLOW">
<ownedComponentExchangeFunctionalExchangeAllocations xsi:type="org.polarsys.capella.core.data.fa:ComponentExchangeFunctionalExchangeAllocation"
- id="fdf4475f-f537-4bb9-bc80-94445cefceb4" targetElement="#7e183eb2-89b3-49bc-9414-201792e5971f"
+ id="fdf4475f-f537-4bb9-bc80-94445cefceb4" targetElement="#7e183eb2-89b3-49bc-9414-201892e5971f"
sourceElement="#7dcdf8ea-cf11-4709-a682-f0db549ce99c"/>
</ownedComponentExchanges>
<ownedComponentExchanges xsi:type="org.polarsys.capella.core.data.fa:ComponentExchange"
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 a15d03e..c3cd177 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,6 +1,6 @@
<?xml version="1.0" encoding="ASCII"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ 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/
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 6a85592..e797fb7 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,6 +1,6 @@
<?xml version="1.0" encoding="ASCII"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ 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/
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 513a7ac..3eb8c26 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,6 +1,6 @@
<?xml version="1.0" encoding="ASCII"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ 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/
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 43829d7..fc7ef40 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,6 +1,6 @@
<?xml version="1.0" encoding="ASCII"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ 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/
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 16c6e00..a3be22b 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,6 +1,6 @@
<?xml version="1.0" encoding="ASCII"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ 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/
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 cb4b910..0a86465 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,6 +1,6 @@
<?xml version="1.0" encoding="ASCII"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ 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/
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 46e5560..df30177 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,6 +1,6 @@
<?xml version="1.0" encoding="ASCII"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ 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/
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 4cdde17..61663d1 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,6 +1,6 @@
<?xml version="1.0" encoding="ASCII"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ 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/
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 9770ca7..3fa1691 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/plugin.properties
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/plugin.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2016-2017 Thales Global Services S.A.S.
+# 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/
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 4a65fa4..9694d8a 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/pom.xml
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ 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/
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 0213638..b8d6db5 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 292fabe..817288f 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 962cd3d..63c196e 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 7f3679e..6fe1ddd 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 99b03f3..f77fc54 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 2ce272d..04ea9a7 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 00c7f0f..1b3dd5f 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 7c8f60f..137f5e5 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 293b5ed..88692f6 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 75528d4..b1145f5 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 105464a..a570ee5 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 6414708..391595b 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 cf8cbb7..8c31d7a 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 7aa9f45..ac8b2b7 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.performance/build.properties
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.performance/build.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2016-2017 Thales Global Services S.A.S.
+# 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/
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 d76e460..2de7afa 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.performance/plugin.properties
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.performance/plugin.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2016-2017 Thales Global Services S.A.S.
+# 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/
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 e9dd196..7654894 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.performance/pom.xml
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.performance/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ 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/
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 aa11a49..c812ee9 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 7297e00..b508598 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 89387f3..5f03c34 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,5 +1,5 @@
###############################################################################
-# Copyright (c) 2016-2017 Thales Global Services S.A.S.
+# 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/
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 a41a02d..3706510 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,5 +1,5 @@
###############################################################################
-# Copyright (c) 2016-2017 Thales Global Services S.A.S.
+# 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/
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 d41345f..d353834 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,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ 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/
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 abe4abf..0ccb1de 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2017 Thales Global Services S.A.S.
+ * Copyright (c) 2017-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/
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 8c5e5a2..ade47a3 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 56a9276..9c3996d 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 1dcb990..47572ba 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2017 Thales Global Services S.A.S.
+ * Copyright (c) 2017-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/
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 89387f3..5f03c34 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,5 +1,5 @@
###############################################################################
-# Copyright (c) 2016-2017 Thales Global Services S.A.S.
+# 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/
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 da2c34e..4c0c4f1 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,5 +1,5 @@
###############################################################################
-# Copyright (c) 2016-2017 Thales Global Services S.A.S.
+# 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/
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 6519182..e894579 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,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ 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/
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 1eb99c0..f940259 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 fc0b6c3..bd1e568 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 19793b0..a780493 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.ui/pom.xml
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.ui/pom.xml
@@ -1,5 +1,5 @@
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ 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/
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests/build.properties b/tests/org.eclipse.emf.diffmerge.patch.tests/build.properties
index 89387f3..5f03c34 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests/build.properties
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests/build.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2016-2017 Thales Global Services S.A.S.
+# 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/
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests/plugin.properties b/tests/org.eclipse.emf.diffmerge.patch.tests/plugin.properties
index b27cc40..a9b3146 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests/plugin.properties
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests/plugin.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2016-2017 Thales Global Services S.A.S.
+# 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/
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests/pom.xml b/tests/org.eclipse.emf.diffmerge.patch.tests/pom.xml
index 5d6831a..9c462fc 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests/pom.xml
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ 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/
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 080ea5d..14a18a9 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 4c85a45..8fb54e9 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/
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 553c2e5..682862c 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,5 +1,5 @@
/**
- * Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ * 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/
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 ed849d0..1ee82a7 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,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016-2017, Thales Global Services S.A.S.
+ * 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/

Back to the top