[535301] Updating org.eclipse.uml2.ant to EPL v2.0.
diff --git a/plugins/org.eclipse.uml2.ant/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.ant/META-INF/MANIFEST.MF
index b373fb2..456026c 100644
--- a/plugins/org.eclipse.uml2.ant/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.uml2.ant/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.uml2.ant;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.5.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-ClassPath: .
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.uml2.uml;bundle-version="[5.4.0,6.0.0)",
- org.eclipse.emf.ant;bundle-version="[2.8.0,3.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)",
+ org.eclipse.emf.ant;bundle-version="[2.10.0,3.0.0)",
org.apache.ant;bundle-version="[1.7.0,2.0.0)",
org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)"
Export-Package: org.eclipse.uml2.ant,
@@ -18,3 +18,4 @@
org.eclipse.uml2.ant.util
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.uml2.ant.AntPlugin
+Automatic-Module-Name: org.eclipse.uml2.ant
diff --git a/plugins/org.eclipse.uml2.ant/about.html b/plugins/org.eclipse.uml2.ant/about.html
index 598b368..1a90f7e 100644
--- a/plugins/org.eclipse.uml2.ant/about.html
+++ b/plugins/org.eclipse.uml2.ant/about.html
@@ -14,7 +14,7 @@
<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
Eclipse Public License Version 1.0 ("EPL"). 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, "Program" 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.ant/build.properties b/plugins/org.eclipse.uml2.ant/build.properties
index b4c9113..c5601ed 100644
--- a/plugins/org.eclipse.uml2.ant/build.properties
+++ b/plugins/org.eclipse.uml2.ant/build.properties
@@ -1,12 +1,13 @@
-# Copyright (c) 2013, 2014 CEA and others.
+# Copyright (c) 2013, 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:
# Christian W. Damus (CEA) - initial API and implementation
# Christian W. Damus (CEA) - 286404
+# Kenn Hussey - 535301
#
source.. = src/
diff --git a/plugins/org.eclipse.uml2.ant/plugin.properties b/plugins/org.eclipse.uml2.ant/plugin.properties
index 801cc29..c9f3506 100644
--- a/plugins/org.eclipse.uml2.ant/plugin.properties
+++ b/plugins/org.eclipse.uml2.ant/plugin.properties
@@ -1,12 +1,13 @@
-# Copyright (c) 2013, 2014 CEA and others.
+# Copyright (c) 2013, 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:
# Christian W. Damus (CEA) - initial API and implementation
# Christian W. Damus (CEA) - 286404
+# Kenn Hussey - 535301
#
# NLS_MESSAGEFORMAT_VAR
diff --git a/plugins/org.eclipse.uml2.ant/plugin.xml b/plugins/org.eclipse.uml2.ant/plugin.xml
index edf6549..0818d24 100644
--- a/plugins/org.eclipse.uml2.ant/plugin.xml
+++ b/plugins/org.eclipse.uml2.ant/plugin.xml
@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<!--
- Copyright (c) 2013, 2014 CEA and others.
+ Copyright (c) 2013, 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:
Christian W. Damus (CEA) - initial API and implementation
Christian W. Damus (CEA) - 286404
+ Kenn Hussey - 535301
-->
diff --git a/plugins/org.eclipse.uml2.ant/src/org/eclipse/uml2/ant/AntPlugin.java b/plugins/org.eclipse.uml2.ant/src/org/eclipse/uml2/ant/AntPlugin.java
index c888baa..7af7f17 100644
--- a/plugins/org.eclipse.uml2.ant/src/org/eclipse/uml2/ant/AntPlugin.java
+++ b/plugins/org.eclipse.uml2.ant/src/org/eclipse/uml2/ant/AntPlugin.java
@@ -1,14 +1,15 @@
/*
- * Copyright (c) 2013, 2014 CEA and others.
+ * Copyright (c) 2013, 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:
* Christian W. Damus (CEA) - initial API and implementation
* Christian W. Damus (CEA) - 286404
+ * Kenn Hussey - 535301
*
*/
package org.eclipse.uml2.ant;
diff --git a/plugins/org.eclipse.uml2.ant/src/org/eclipse/uml2/ant/app/DefineProfileApplication.java b/plugins/org.eclipse.uml2.ant/src/org/eclipse/uml2/ant/app/DefineProfileApplication.java
index d87ce17..5071176 100644
--- a/plugins/org.eclipse.uml2.ant/src/org/eclipse/uml2/ant/app/DefineProfileApplication.java
+++ b/plugins/org.eclipse.uml2.ant/src/org/eclipse/uml2/ant/app/DefineProfileApplication.java
@@ -1,14 +1,14 @@
/*
- * Copyright (c) 2007, 2014 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2007, 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) - 213218
- * Kenn Hussey (CEA) - 322715
+ * Kenn Hussey (CEA) - 322715, 535301
* Christian W. Damus (CEA) - 286404 (adapted from UMLImporterApplication)
* Christian W. Damus (CEA) - 405065
*
diff --git a/plugins/org.eclipse.uml2.ant/src/org/eclipse/uml2/ant/app/IDiagnosticReporter.java b/plugins/org.eclipse.uml2.ant/src/org/eclipse/uml2/ant/app/IDiagnosticReporter.java
index e9bb93f..a850556 100644
--- a/plugins/org.eclipse.uml2.ant/src/org/eclipse/uml2/ant/app/IDiagnosticReporter.java
+++ b/plugins/org.eclipse.uml2.ant/src/org/eclipse/uml2/ant/app/IDiagnosticReporter.java
@@ -1,14 +1,15 @@
/*
- * Copyright (c) 2013, 2014 CEA and others.
+ * Copyright (c) 2013, 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:
* Christian W. Damus (CEA) - initial API and implementation
* Christian W. Damus (CEA) - 286404
+ * Kenn Hussey - 535301
*
*/
package org.eclipse.uml2.ant.app;
diff --git a/plugins/org.eclipse.uml2.ant/tasks/org/eclipse/uml2/ant/taskdefs/DefineProfileTask.java b/plugins/org.eclipse.uml2.ant/tasks/org/eclipse/uml2/ant/taskdefs/DefineProfileTask.java
index a51f14a..cba926a 100644
--- a/plugins/org.eclipse.uml2.ant/tasks/org/eclipse/uml2/ant/taskdefs/DefineProfileTask.java
+++ b/plugins/org.eclipse.uml2.ant/tasks/org/eclipse/uml2/ant/taskdefs/DefineProfileTask.java
@@ -1,13 +1,14 @@
/*
- * Copyright (c) 2013, 2014 CEA and others.
+ * Copyright (c) 2013, 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:
* Christian W. Damus (CEA) - initial API and implementation
* Christian W. Damus (CEA) - 286404
+ * Kenn Hussey - 535301
*/
package org.eclipse.uml2.ant.taskdefs;
diff --git a/plugins/org.eclipse.uml2.ant/tasks/org/eclipse/uml2/ant/util/AntDiagnosticReporter.java b/plugins/org.eclipse.uml2.ant/tasks/org/eclipse/uml2/ant/util/AntDiagnosticReporter.java
index 6df98d1..2eeca75 100644
--- a/plugins/org.eclipse.uml2.ant/tasks/org/eclipse/uml2/ant/util/AntDiagnosticReporter.java
+++ b/plugins/org.eclipse.uml2.ant/tasks/org/eclipse/uml2/ant/util/AntDiagnosticReporter.java
@@ -1,14 +1,15 @@
/*
- * Copyright (c) 2013, 2014 CEA and others.
+ * Copyright (c) 2013, 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:
* Christian W. Damus (CEA) - initial API and implementation
* Christian W. Damus (CEA) - 286404
+ * Kenn Hussey - 535301
*
*/
package org.eclipse.uml2.ant.util;
