[535301] Updating org.eclipse.uml2.common to EPL v2.0.
diff --git a/plugins/org.eclipse.uml2.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.common/META-INF/MANIFEST.MF
index 2df8e05..f7633c9 100644
--- a/plugins/org.eclipse.uml2.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.uml2.common/META-INF/MANIFEST.MF
@@ -10,7 +10,8 @@
 Export-Package: org.eclipse.uml2.common,
  org.eclipse.uml2.common.util
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional;x-installation:=greedy,
- org.eclipse.emf.ecore;bundle-version="[2.14.0,3.0.0)";visibility:=reexport
+ org.eclipse.emf.ecore;bundle-version="[2.16.0,3.0.0)";visibility:=reexport
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.uml2.common.CommonPlugin$Implementation
+Automatic-Module-Name: org.eclipse.uml2.common
diff --git a/plugins/org.eclipse.uml2.common/about.html b/plugins/org.eclipse.uml2.common/about.html
index 598b368..1a90f7e 100644
--- a/plugins/org.eclipse.uml2.common/about.html
+++ b/plugins/org.eclipse.uml2.common/about.html
@@ -14,7 +14,7 @@
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
 Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/plugins/org.eclipse.uml2.common/about.mappings b/plugins/org.eclipse.uml2.common/about.mappings
index b98206b..34dd83c 100644
--- a/plugins/org.eclipse.uml2.common/about.mappings
+++ b/plugins/org.eclipse.uml2.common/about.mappings
@@ -1,13 +1,13 @@
-# Copyright (c) 2006, 2017 IBM Corporation, CEA, and others.
+# Copyright (c) 2006, 2018 IBM Corporation, CEA, and others.
 # All rights reserved.   This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors: 
 #   IBM - initial API and implementation
 #   Christian W. Damus (CEA) - 227616
-#   Kenn Hussey - 526568
+#   Kenn Hussey - 526568, 535301
 #
 
 # about.mappings
diff --git a/plugins/org.eclipse.uml2.common/about.properties b/plugins/org.eclipse.uml2.common/about.properties
index d3092d1..a620279 100644
--- a/plugins/org.eclipse.uml2.common/about.properties
+++ b/plugins/org.eclipse.uml2.common/about.properties
@@ -1,13 +1,13 @@
 # Copyright (c) 2006, 2018 IBM Corporation, Embarcadero Technologies, CEA, and others.
 # All rights reserved.   This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors: 
 #   IBM - initial API and implementation
 #   Kenn Hussey (Embarcadero Technologies) - 219804, 204200
-#   Kenn Hussey - 323181, 526568, 540812
+#   Kenn Hussey - 323181, 526568, 540812, 535301
 #   Kenn Hussey (CEA) - 424568, 459723
 #   Christian W. Damus (CEA) - 227616
 #
diff --git a/plugins/org.eclipse.uml2.common/build.properties b/plugins/org.eclipse.uml2.common/build.properties
index 2609065..f18943e 100644
--- a/plugins/org.eclipse.uml2.common/build.properties
+++ b/plugins/org.eclipse.uml2.common/build.properties
@@ -1,14 +1,15 @@
 # Copyright (c) 2005, 2018 IBM Corporation, Embarcadero Technologies, CEA, and others.
 # All rights reserved.   This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors: 
 #   IBM - initial API and implementation
 #   Kenn Hussey (Embarcadero Technologies) - 204200
 #   Christian W. Damus (CEA) - 227616
 #   Eike Stepper - 540812
+#   Kenn Hussey - 535301
 #
 
 # NLS_MESSAGEFORMAT_VAR
diff --git a/plugins/org.eclipse.uml2.common/plugin.properties b/plugins/org.eclipse.uml2.common/plugin.properties
index 0f4f270..3d94141 100644
--- a/plugins/org.eclipse.uml2.common/plugin.properties
+++ b/plugins/org.eclipse.uml2.common/plugin.properties
@@ -1,15 +1,15 @@
 # Copyright (c) 2005, 2018 IBM Corporation, Embarcadero Technologies, CEA, and others.
 # All rights reserved.   This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors: 
 #   IBM - initial API and implementation
 #   Kenn Hussey (Embarcadero Technologies) - 204200
 #   Eike Stepper - 540812
+#   Kenn Hussey - 535301
 #
-# $Id: plugin.properties,v 1.5 2009/04/07 18:24:53 jbruck Exp $
 
 # NLS_MESSAGEFORMAT_VAR
 
diff --git a/plugins/org.eclipse.uml2.common/plugin.xml b/plugins/org.eclipse.uml2.common/plugin.xml
index be11c0a..a212c13 100644
--- a/plugins/org.eclipse.uml2.common/plugin.xml
+++ b/plugins/org.eclipse.uml2.common/plugin.xml
@@ -4,12 +4,13 @@
 <!--
  Copyright (c) 2018 CEA, and others.
  All rights reserved.   This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
+ are made available under the terms of the Eclipse Public License v2.0
  which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ http://www.eclipse.org/legal/epl-v20.html
 
  Contributors:
    Eike Stepper - initial API and implementation
+   Kenn Husey - 535301
 
 -->
 
diff --git a/plugins/org.eclipse.uml2.common/schema/cache_adapter_override.exsd b/plugins/org.eclipse.uml2.common/schema/cache_adapter_override.exsd
index fd092f1..5c26b34 100644
--- a/plugins/org.eclipse.uml2.common/schema/cache_adapter_override.exsd
+++ b/plugins/org.eclipse.uml2.common/schema/cache_adapter_override.exsd
@@ -101,8 +101,8 @@
       </appinfo>
       <documentation>
          Copyright (c) 2018 CEA, and others.&lt;br&gt;
-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 &lt;a 
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at &lt;a 
+href=&quot;http://www.eclipse.org/legal/epl-v20.html&quot;&gt;http://www.eclipse.org/legal/epl-v20.html&lt;/a&gt;
       </documentation>
    </annotation>
 
diff --git a/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/CommonPlugin.java b/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/CommonPlugin.java
index 6fbfe67..e3ec41a 100644
--- a/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/CommonPlugin.java
+++ b/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/CommonPlugin.java
@@ -1,14 +1,14 @@
 /*
- * Copyright (c) 2009 IBM Corporation and others.
+ * Copyright (c) 2009, 2018 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - initial API and implementation
+ *   Kenn Hussey - 535301
  *
- * $Id: CommonPlugin.java,v 1.2 2009/03/13 19:54:31 jbruck Exp $
  */
 package org.eclipse.uml2.common;
 
diff --git a/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/CacheAdapter.java b/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/CacheAdapter.java
index 4acde0e..6a4d2c8 100644
--- a/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/CacheAdapter.java
+++ b/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/CacheAdapter.java
@@ -1,14 +1,14 @@
 /*
  * Copyright (c) 2004, 2018 IBM Corporation, Embarcadero Technologies, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200, 220065
- *   Kenn Hussey - 335125, 540812
+ *   Kenn Hussey - 335125, 540812, 535301
  *   Christian W. Damus (CEA) - 389632, 332057
  *   Kenn Hussey (CEA) - 418466, 455572
  *   Eike Stepper - 540812
diff --git a/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/DerivedEObjectEList.java b/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/DerivedEObjectEList.java
index eeeb5e2..f4c9302 100644
--- a/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/DerivedEObjectEList.java
+++ b/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/DerivedEObjectEList.java
@@ -1,14 +1,15 @@
 /*
- * Copyright (c) 2005, 2013 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, Embarcadero Technologies, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey (CEA) - 414745
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.common.util;
diff --git a/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/DerivedSubsetEObjectEList.java b/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/DerivedSubsetEObjectEList.java
index 9e1375a..822f93f 100644
--- a/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/DerivedSubsetEObjectEList.java
+++ b/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/DerivedSubsetEObjectEList.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation and others.
+ * Copyright (c) 2005, 2018 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey (CEA) - 465283
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.common.util;
diff --git a/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/DerivedUnionEObjectEList.java b/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/DerivedUnionEObjectEList.java
index 1b13e5e..5e04449 100644
--- a/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/DerivedUnionEObjectEList.java
+++ b/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/DerivedUnionEObjectEList.java
@@ -1,14 +1,14 @@
 /*
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2018 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - initial API and implementation
+ *   Kenn Hussey - 535301
  *
- * $Id: DerivedUnionEObjectEList.java,v 1.6 2007/04/04 03:15:12 khussey Exp $
  */
 package org.eclipse.uml2.common.util;
 
diff --git a/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/SubsetSupersetEDataTypeEList.java b/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/SubsetSupersetEDataTypeEList.java
index ff53be4..41bf466 100644
--- a/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/SubsetSupersetEDataTypeEList.java
+++ b/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/SubsetSupersetEDataTypeEList.java
@@ -1,12 +1,13 @@
 /*
- * Copyright (c) 2015 CEA and others.
+ * Copyright (c) 2015, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   CEA - initial API and implementation
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.common.util;
diff --git a/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/SubsetSupersetEDataTypeUniqueEList.java b/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/SubsetSupersetEDataTypeUniqueEList.java
index a663500..d57ebe6 100644
--- a/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/SubsetSupersetEDataTypeUniqueEList.java
+++ b/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/SubsetSupersetEDataTypeUniqueEList.java
@@ -1,12 +1,13 @@
 /*
- * Copyright (c) 2015 CEA and others.
+ * Copyright (c) 2015, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   CEA - initial API and implementation
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.common.util;
diff --git a/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/SubsetSupersetEObjectContainmentEList.java b/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/SubsetSupersetEObjectContainmentEList.java
index 58fb8c8..6460978 100644
--- a/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/SubsetSupersetEObjectContainmentEList.java
+++ b/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/SubsetSupersetEObjectContainmentEList.java
@@ -1,14 +1,14 @@
 /*
- * Copyright (c) 2006 IBM Corporation and others.
+ * Copyright (c) 2006, 2018 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - initial API and implementation
+ *   Kenn Hussey - 535301
  *
- * $Id: SubsetSupersetEObjectContainmentEList.java,v 1.3 2006/12/14 15:47:32 khussey Exp $
  */
 package org.eclipse.uml2.common.util;
 
diff --git a/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/SubsetSupersetEObjectContainmentWithInverseEList.java b/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/SubsetSupersetEObjectContainmentWithInverseEList.java
index 294149f..9f86146 100644
--- a/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/SubsetSupersetEObjectContainmentWithInverseEList.java
+++ b/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/SubsetSupersetEObjectContainmentWithInverseEList.java
@@ -1,14 +1,14 @@
 /*
- * Copyright (c) 2006 IBM Corporation and others.
+ * Copyright (c) 2006, 2018 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - initial API and implementation
+ *   Kenn Hussey - 535301
  *
- * $Id: SubsetSupersetEObjectContainmentWithInverseEList.java,v 1.3 2006/12/14 15:47:33 khussey Exp $
  */
 package org.eclipse.uml2.common.util;
 
diff --git a/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/SubsetSupersetEObjectEList.java b/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/SubsetSupersetEObjectEList.java
index d641766..68980d7 100644
--- a/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/SubsetSupersetEObjectEList.java
+++ b/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/SubsetSupersetEObjectEList.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2006, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2006, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey (CEA) - 459723
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.common.util;
diff --git a/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/SubsetSupersetEObjectResolvingEList.java b/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/SubsetSupersetEObjectResolvingEList.java
index 5298f6d..5a96a11 100644
--- a/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/SubsetSupersetEObjectResolvingEList.java
+++ b/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/SubsetSupersetEObjectResolvingEList.java
@@ -1,14 +1,14 @@
 /*
- * Copyright (c) 2006 IBM Corporation and others.
+ * Copyright (c) 2006, 2018 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - initial API and implementation
+ *   Kenn Hussey - 535301
  *
- * $Id: SubsetSupersetEObjectResolvingEList.java,v 1.3 2006/12/14 15:47:33 khussey Exp $
  */
 package org.eclipse.uml2.common.util;
 
diff --git a/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/SubsetSupersetEObjectWithInverseEList.java b/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/SubsetSupersetEObjectWithInverseEList.java
index 83b5b2f..452e863 100644
--- a/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/SubsetSupersetEObjectWithInverseEList.java
+++ b/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/SubsetSupersetEObjectWithInverseEList.java
@@ -1,14 +1,14 @@
 /*
- * Copyright (c) 2006 IBM Corporation and others.
+ * Copyright (c) 2006, 2018 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - initial API and implementation
+ *   Kenn Hussey - 535301
  *
- * $Id: SubsetSupersetEObjectWithInverseEList.java,v 1.3 2006/12/14 15:47:33 khussey Exp $
  */
 package org.eclipse.uml2.common.util;
 
diff --git a/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/SubsetSupersetEObjectWithInverseResolvingEList.java b/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/SubsetSupersetEObjectWithInverseResolvingEList.java
index 00ca7e9..c41f0e2 100644
--- a/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/SubsetSupersetEObjectWithInverseResolvingEList.java
+++ b/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/SubsetSupersetEObjectWithInverseResolvingEList.java
@@ -1,14 +1,14 @@
 /*
- * Copyright (c) 2006 IBM Corporation and others.
+ * Copyright (c) 2006, 2018 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - initial API and implementation
+ *   Kenn Hussey - 535301
  *
- * $Id: SubsetSupersetEObjectWithInverseResolvingEList.java,v 1.3 2006/12/14 15:47:33 khussey Exp $
  */
 package org.eclipse.uml2.common.util;
 
diff --git a/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/UML2Util.java b/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/UML2Util.java
index 3339941..25397da 100644
--- a/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/UML2Util.java
+++ b/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/UML2Util.java
@@ -1,9 +1,9 @@
 /*
  * Copyright (c) 2005, 2018 IBM Corporation, Embarcadero Technologies, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - initial API and implementation
@@ -12,6 +12,7 @@
  *   Kenn Hussey (CEA) - 316165, 322715, 212765, 421756, 424568, 443662
  *   Christian W. Damus (CEA) - 405065
  *   Eike Stepper - 540812
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.common.util;
diff --git a/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/UnionEObjectEList.java b/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/UnionEObjectEList.java
index c6fd9e6..158fbf2 100644
--- a/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/UnionEObjectEList.java
+++ b/plugins/org.eclipse.uml2.common/src/org/eclipse/uml2/common/util/UnionEObjectEList.java
@@ -1,13 +1,13 @@
 /*
- * Copyright (c) 2005, 2014 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey - 286329, 398462
+ *   Kenn Hussey - 286329, 398462, 535301
  *   Christian W. Damus (CEA) - 398462
  *   Kenn Hussey (CEA) - 212765, 403365, 420938, 421756, 432921
  */