Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Constant2018-05-28 13:10:47 +0000
committerOlivier Constant2018-05-28 13:10:47 +0000
commite96829af3676848719d1ff32a781a03c2cb6968e (patch)
treec4763bf6cbe8c5e4a8749d9ec00d41b2e267f1c9 /features
parent4b12a2aef25cd9f8b0129725420449b6319c879e (diff)
downloadorg.eclipse.emf.diffmerge.core-e96829af3676848719d1ff32a781a03c2cb6968e.tar.gz
org.eclipse.emf.diffmerge.core-e96829af3676848719d1ff32a781a03c2cb6968e.tar.xz
org.eclipse.emf.diffmerge.core-e96829af3676848719d1ff32a781a03c2cb6968e.zip
[releng] Update of contribution/notice files and copyright notices
Change-Id: I8fce49cd0fbe1bd2a201e7413cf74beb4cf5ca30 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
Diffstat (limited to 'features')
-rw-r--r--features/org.eclipse.emf.diffmerge.egit.feature/build.properties2
-rw-r--r--features/org.eclipse.emf.diffmerge.egit.feature/feature.properties4
-rw-r--r--features/org.eclipse.emf.diffmerge.egit.feature/feature.xml14
-rw-r--r--features/org.eclipse.emf.diffmerge.feature/build.properties2
-rw-r--r--features/org.eclipse.emf.diffmerge.feature/feature.properties4
-rw-r--r--features/org.eclipse.emf.diffmerge.feature/feature.xml14
-rw-r--r--features/org.eclipse.emf.diffmerge.gmf.feature/build.properties2
-rw-r--r--features/org.eclipse.emf.diffmerge.gmf.feature/feature.properties4
-rw-r--r--features/org.eclipse.emf.diffmerge.gmf.feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.diffmerge.sdk.feature/build.properties2
-rw-r--r--features/org.eclipse.emf.diffmerge.sdk.feature/feature.properties4
-rw-r--r--features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml14
-rw-r--r--features/org.eclipse.emf.diffmerge.sirius.feature/build.properties2
-rw-r--r--features/org.eclipse.emf.diffmerge.sirius.feature/feature.properties4
-rw-r--r--features/org.eclipse.emf.diffmerge.sirius.feature/feature.xml2
15 files changed, 59 insertions, 17 deletions
diff --git a/features/org.eclipse.emf.diffmerge.egit.feature/build.properties b/features/org.eclipse.emf.diffmerge.egit.feature/build.properties
index e6f773a4..ec000cb3 100644
--- a/features/org.eclipse.emf.diffmerge.egit.feature/build.properties
+++ b/features/org.eclipse.emf.diffmerge.egit.feature/build.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2016-2017 Thales Global Services S.A.S. and others.
+# Copyright (c) 2016-2018 Thales Global Services S.A.S. and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
diff --git a/features/org.eclipse.emf.diffmerge.egit.feature/feature.properties b/features/org.eclipse.emf.diffmerge.egit.feature/feature.properties
index 3a23ced9..d8ff89cc 100644
--- a/features/org.eclipse.emf.diffmerge.egit.feature/feature.properties
+++ b/features/org.eclipse.emf.diffmerge.egit.feature/feature.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.
# 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
@@ -9,7 +9,7 @@ featureName = EMF Diff/Merge EGit Integration Feature (Incubation)
providerName = Eclipse Modeling Project
description = An integration of EMF Diff/Merge with EGit.
copyright=\
-Copyright (c) 2016-2017 Thales Global Services S.A.S.\n\
+Copyright (c) 2016-2018 Thales Global Services S.A.S.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Public License v1.0\n\
which accompanies this distribution, and is available at\n\
diff --git a/features/org.eclipse.emf.diffmerge.egit.feature/feature.xml b/features/org.eclipse.emf.diffmerge.egit.feature/feature.xml
index f0232afe..8ddedeb9 100644
--- a/features/org.eclipse.emf.diffmerge.egit.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.egit.feature/feature.xml
@@ -1,4 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ <copyright>
+
+ 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:
+ Thales Global Services S.A.S - initial API and implementation
+
+ </copyright>
+-->
<feature
id="org.eclipse.emf.diffmerge.egit.feature"
label="%featureName"
diff --git a/features/org.eclipse.emf.diffmerge.feature/build.properties b/features/org.eclipse.emf.diffmerge.feature/build.properties
index edbb5293..366d35ff 100644
--- a/features/org.eclipse.emf.diffmerge.feature/build.properties
+++ b/features/org.eclipse.emf.diffmerge.feature/build.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2010-2017 Thales Global Services S.A.S.
+# Copyright (c) 2010-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
diff --git a/features/org.eclipse.emf.diffmerge.feature/feature.properties b/features/org.eclipse.emf.diffmerge.feature/feature.properties
index 89a6b51b..ed22bfdd 100644
--- a/features/org.eclipse.emf.diffmerge.feature/feature.properties
+++ b/features/org.eclipse.emf.diffmerge.feature/feature.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2006-2017 Thales Global Services S.A.S.
+# Copyright (c) 2006-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
@@ -15,7 +15,7 @@ model reuse, iterative model transformations, bridges between\n\
models or modeling tools, collaborative modeling environments,\n\
or versioning systems.\n
copyright=\
-Copyright (c) 2006-2017 Thales Global Services S.A.S.\n\
+Copyright (c) 2006-2018 Thales Global Services S.A.S.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Public License v1.0\n\
which accompanies this distribution, and is available at\n\
diff --git a/features/org.eclipse.emf.diffmerge.feature/feature.xml b/features/org.eclipse.emf.diffmerge.feature/feature.xml
index a4b3fec7..80f75fbf 100644
--- a/features/org.eclipse.emf.diffmerge.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.feature/feature.xml
@@ -1,4 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ <copyright>
+
+ Copyright (c) 2006-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:
+ Thales Global Services S.A.S - initial API and implementation
+
+ </copyright>
+-->
<feature
id="org.eclipse.emf.diffmerge.feature"
label="%featureName"
diff --git a/features/org.eclipse.emf.diffmerge.gmf.feature/build.properties b/features/org.eclipse.emf.diffmerge.gmf.feature/build.properties
index 51dd31eb..9eebe778 100644
--- a/features/org.eclipse.emf.diffmerge.gmf.feature/build.properties
+++ b/features/org.eclipse.emf.diffmerge.gmf.feature/build.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2006-2017 Thales Global Services S.A.S.
+# Copyright (c) 2006-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
diff --git a/features/org.eclipse.emf.diffmerge.gmf.feature/feature.properties b/features/org.eclipse.emf.diffmerge.gmf.feature/feature.properties
index e7f3f3b3..a5308f87 100644
--- a/features/org.eclipse.emf.diffmerge.gmf.feature/feature.properties
+++ b/features/org.eclipse.emf.diffmerge.gmf.feature/feature.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2006-2017 Thales Global Services S.A.S.
+# Copyright (c) 2006-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
@@ -9,7 +9,7 @@ featureName = EMF Diff/Merge GMF Feature (Incubation)
providerName = Eclipse Modeling Project
description = A customization of EMF Diff/Merge for GMF.
copyright=\
-Copyright (c) 2006-2017 Thales Global Services S.A.S.\n\
+Copyright (c) 2006-2018 Thales Global Services S.A.S.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Public License v1.0\n\
which accompanies this distribution, and is available at\n\
diff --git a/features/org.eclipse.emf.diffmerge.gmf.feature/feature.xml b/features/org.eclipse.emf.diffmerge.gmf.feature/feature.xml
index e001793b..ce617e1b 100644
--- a/features/org.eclipse.emf.diffmerge.gmf.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.gmf.feature/feature.xml
@@ -2,7 +2,7 @@
<!--
<copyright>
- Copyright (c) 2006-2017 Thales Global Services S.A.S.
+ Copyright (c) 2006-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
diff --git a/features/org.eclipse.emf.diffmerge.sdk.feature/build.properties b/features/org.eclipse.emf.diffmerge.sdk.feature/build.properties
index edbb5293..366d35ff 100644
--- a/features/org.eclipse.emf.diffmerge.sdk.feature/build.properties
+++ b/features/org.eclipse.emf.diffmerge.sdk.feature/build.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2010-2017 Thales Global Services S.A.S.
+# Copyright (c) 2010-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
diff --git a/features/org.eclipse.emf.diffmerge.sdk.feature/feature.properties b/features/org.eclipse.emf.diffmerge.sdk.feature/feature.properties
index 99a5295a..f8bfa059 100644
--- a/features/org.eclipse.emf.diffmerge.sdk.feature/feature.properties
+++ b/features/org.eclipse.emf.diffmerge.sdk.feature/feature.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2010-2017 Thales Global Services S.A.S.
+# Copyright (c) 2010-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
@@ -15,7 +15,7 @@ model refactoring, iterative model transformations, bridges between\n\
models or modeling tools, collaborative modeling environments,\n\
or versioning systems.\n
copyright=\
-Copyright (c) 2010-2017 Thales Global Services S.A.S.\n\
+Copyright (c) 2010-2018 Thales Global Services S.A.S.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Public License v1.0\n\
which accompanies this distribution, and is available at\n\
diff --git a/features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml b/features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml
index 5f8928df..3c8e728c 100644
--- a/features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml
@@ -1,4 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ <copyright>
+
+ Copyright (c) 2006-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:
+ Thales Global Services S.A.S - initial API and implementation
+
+ </copyright>
+-->
<feature
id="org.eclipse.emf.diffmerge.sdk.feature"
label="%featureName"
diff --git a/features/org.eclipse.emf.diffmerge.sirius.feature/build.properties b/features/org.eclipse.emf.diffmerge.sirius.feature/build.properties
index 51dd31eb..9eebe778 100644
--- a/features/org.eclipse.emf.diffmerge.sirius.feature/build.properties
+++ b/features/org.eclipse.emf.diffmerge.sirius.feature/build.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2006-2017 Thales Global Services S.A.S.
+# Copyright (c) 2006-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
diff --git a/features/org.eclipse.emf.diffmerge.sirius.feature/feature.properties b/features/org.eclipse.emf.diffmerge.sirius.feature/feature.properties
index a54371b4..c0598642 100644
--- a/features/org.eclipse.emf.diffmerge.sirius.feature/feature.properties
+++ b/features/org.eclipse.emf.diffmerge.sirius.feature/feature.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2006-2017 Thales Global Services S.A.S.
+# Copyright (c) 2006-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
@@ -9,7 +9,7 @@ featureName = EMF Diff/Merge Sirius Feature (Incubation)
providerName = Eclipse Modeling Project
description = A customization of EMF Diff/Merge for Sirius.
copyright=\
-Copyright (c) 2006-2017 Thales Global Services S.A.S.\n\
+Copyright (c) 2006-2018 Thales Global Services S.A.S.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Public License v1.0\n\
which accompanies this distribution, and is available at\n\
diff --git a/features/org.eclipse.emf.diffmerge.sirius.feature/feature.xml b/features/org.eclipse.emf.diffmerge.sirius.feature/feature.xml
index b474c878..edf5265b 100644
--- a/features/org.eclipse.emf.diffmerge.sirius.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.sirius.feature/feature.xml
@@ -2,7 +2,7 @@
<!--
<copyright>
- Copyright (c) 2006-2017 Thales Global Services S.A.S.
+ Copyright (c) 2006-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

Back to the top