Merge branch 'master' into bugs/405065
diff --git a/doc/org.eclipse.uml2.doc-feature/feature.xml b/doc/org.eclipse.uml2.doc-feature/feature.xml
index 69e9f9e..bf29e13 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 83ab8b8..b267df7 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 @@
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 86a9315..c3da887 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 @@
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 efdf423..3d5de15 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 @@
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 52e79a2..ad18485 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 @@
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 51aae90..39b2684 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 @@
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 ef7ae9e..7e96664 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 f759d31..e0bcf3d 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 2203fea..7fe50b1 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 88386fd..030a8be 100644
--- a/plugins/org.eclipse.uml2/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.uml2/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
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 650ae59..5f63777 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 @@
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 7843de4..8bb70fc 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 @@
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
