Merge branch 'master' into bugs/405065bugs/405065

12 files changed, 18 insertions, 18 deletions

diff --git a/doc/org.eclipse.uml2.doc-feature/feature.xml b/doc/org.eclipse.uml2.doc-feature/feature.xml
index 69e9f9e89..bf29e1369 100644
--- a/doc/org.eclipse.uml2.doc-feature/feature.xml
+++ b/doc/org.eclipse.uml2.doc-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.uml2.doc"
       label="%feature.label"
-      version="4.1.0.qualifier"
+      version="5.0.0.qualifier"
       provider-name="%feature.provider-name"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.uml2.license"
@@ -13,7 +13,7 @@
    </description>
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
-      Copyright (c) 2004, 2013 IBM Corporation, CEA, and others.
+      Copyright (c) 2004, 2014 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
 which accompanies this distribution, and is available at
diff --git a/doc/org.eclipse.uml2.doc/META-INF/MANIFEST.MF b/doc/org.eclipse.uml2.doc/META-INF/MANIFEST.MF
index 83ab8b829..b267df7a3 100644
--- a/doc/org.eclipse.uml2.doc/META-INF/MANIFEST.MF
+++ b/doc/org.eclipse.uml2.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.uml2.doc; singleton:=true
-Bundle-Version: 4.1.0.qualifier
+Bundle-Version: 5.0.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.help
diff --git a/doc/org.eclipse.uml2.doc/about.properties b/doc/org.eclipse.uml2.doc/about.properties
index 86a9315f6..c3da8877b 100644
--- a/doc/org.eclipse.uml2.doc/about.properties
+++ b/doc/org.eclipse.uml2.doc/about.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2013 IBM Corporation, Embarcadero Technologies, CEA, and others.
+# Copyright (c) 2006, 2014 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
 # which accompanies this distribution, and is available at
@@ -23,5 +23,5 @@ aboutText = Unified Modeling Language 2.x Documentation\n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
-(c) Copyright Eclipse contributors and others 2003, 2013.  All rights reserved.\n\
+(c) Copyright Eclipse contributors and others 2003, 2014.  All rights reserved.\n\
 Visit http://www.eclipse.org/uml2
diff --git a/examples/org.eclipse.uml2.examples/META-INF/MANIFEST.MF b/examples/org.eclipse.uml2.examples/META-INF/MANIFEST.MF
index efdf423d5..3d5de1522 100644
--- a/examples/org.eclipse.uml2.examples/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.uml2.examples/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.uml2.examples
-Bundle-Version: 4.2.0.qualifier
+Bundle-Version: 5.0.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/examples/org.eclipse.uml2.examples/about.properties b/examples/org.eclipse.uml2.examples/about.properties
index 52e79a2b5..ad184855f 100644
--- a/examples/org.eclipse.uml2.examples/about.properties
+++ b/examples/org.eclipse.uml2.examples/about.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2013 IBM Corporation, Embarcadero Technologies, CEA, and others.
+# Copyright (c) 2006, 2014 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
 # which accompanies this distribution, and is available at
@@ -23,5 +23,5 @@ aboutText = Unified Modeling Language 2.x Examples\n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
-(c) Copyright Eclipse contributors and others 2003, 2013.  All rights reserved.\n\
+(c) Copyright Eclipse contributors and others 2003, 2014.  All rights reserved.\n\
 Visit http://www.eclipse.org/uml2
diff --git a/plugins/org.eclipse.uml2.ant/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.ant/META-INF/MANIFEST.MF
index 51aae9031..39b268430 100644
--- a/plugins/org.eclipse.uml2.ant/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.uml2.ant/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.uml2.ant;singleton:=true
-Bundle-Version: 5.0.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.uml2.codegen.ecore.ui-feature/feature.xml b/plugins/org.eclipse.uml2.codegen.ecore.ui-feature/feature.xml
index ef7ae9ecf..7e96664ac 100644
--- a/plugins/org.eclipse.uml2.codegen.ecore.ui-feature/feature.xml
+++ b/plugins/org.eclipse.uml2.codegen.ecore.ui-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.uml2.codegen.ecore.ui"
       label="%feature.label"
-      version="4.2.0.qualifier"
+      version="2.0.0.qualifier"
       provider-name="%feature.provider-name"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.uml2.license"
@@ -13,7 +13,7 @@
    </description>
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
-      Copyright (c) 2003, 2013 IBM Corporation, Embarcadero Technologies, CEA, and others.
+      Copyright (c) 2003, 2014 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
 which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.uml2.common-feature/feature.xml b/plugins/org.eclipse.uml2.common-feature/feature.xml
index f759d316b..e0bcf3d9e 100644
--- a/plugins/org.eclipse.uml2.common-feature/feature.xml
+++ b/plugins/org.eclipse.uml2.common-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.uml2.common"
       label="%feature.label"
-      version="4.2.0.qualifier"
+      version="2.0.0.qualifier"
       provider-name="%feature.provider-name"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.uml2.license"
@@ -13,7 +13,7 @@
    </description>
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
-      Copyright (c) 2003, 2013 IBM Corporation, Embarcadero Technologies, CEA, and others.
+      Copyright (c) 2003, 2014 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
 which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.uml2.common.edit-feature/feature.xml b/plugins/org.eclipse.uml2.common.edit-feature/feature.xml
index 2203fea69..7fe50b161 100644
--- a/plugins/org.eclipse.uml2.common.edit-feature/feature.xml
+++ b/plugins/org.eclipse.uml2.common.edit-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.uml2.common.edit"
       label="%feature.label"
-      version="4.2.0.qualifier"
+      version="2.0.0.qualifier"
       provider-name="%feature.provider-name"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.uml2.license"
@@ -13,7 +13,7 @@
    </description>
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
-      Copyright (c) 2003, 2013 IBM Corporation, Embarcadero Technologies, CEA, and others.
+      Copyright (c) 2003, 2014 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
 which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.uml2/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2/META-INF/MANIFEST.MF
index 88386fdc7..030a8be7f 100644
--- a/plugins/org.eclipse.uml2/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.uml2/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.uml2
-Bundle-Version: 4.2.0.qualifier
+Bundle-Version: 5.0.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/tests/org.eclipse.uml2.ant.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.uml2.ant.tests/META-INF/MANIFEST.MF
index 650ae59b1..5f6377736 100644
--- a/tests/org.eclipse.uml2.ant.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.uml2.ant.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.uml2.ant.tests;singleton:=true
-Bundle-Version: 5.0.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: uml2.ant.tests.jar
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/tests/org.eclipse.uml2.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.uml2.tests/META-INF/MANIFEST.MF
index 7843de4f4..8bb70fc34 100644
--- a/tests/org.eclipse.uml2.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.uml2.tests/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.uml2.tests
-Bundle-Version: 4.2.0.qualifier
+Bundle-Version: 5.0.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin