Bug 563955 - updated license information

updated source files and license text

Change-Id: I0b4b4b30a312c7059a5399b474cac4f1db50e047
Signed-off-by: Ralph Soika <ralph.soika@imixs.com>
diff --git a/.gitignore b/.gitignore
index d578ae1..659c865 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,8 @@
 *.java._trace

 *.java_trace

 *.smap

+

+# Eclipse Project settings

+.settings

+.project

+.classpath

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..e23ece2
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,277 @@
+Eclipse Public License - v 2.0
+
+    THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+    PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
+    OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+  a) in the case of the initial Contributor, the initial content
+     Distributed under this Agreement, and
+
+  b) in the case of each subsequent Contributor:
+     i) changes to the Program, and
+     ii) additions to the Program;
+  where such changes and/or additions to the Program originate from
+  and are Distributed by that particular Contributor. A Contribution
+  "originates" from a Contributor if it was added to the Program by
+  such Contributor itself or anyone acting on such Contributor's behalf.
+  Contributions do not include changes or additions to the Program that
+  are not Modified Works.
+
+"Contributor" means any person or entity that Distributes the Program.
+
+"Licensed Patents" mean patent claims licensable by a Contributor which
+are necessarily infringed by the use or sale of its Contribution alone
+or when combined with the Program.
+
+"Program" means the Contributions Distributed in accordance with this
+Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement
+or any Secondary License (as applicable), including Contributors.
+
+"Derivative Works" shall mean any work, whether in Source Code or other
+form, that is based on (or derived from) the Program and for which the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship.
+
+"Modified Works" shall mean any work in Source Code or other form that
+results from an addition to, deletion from, or modification of the
+contents of the Program, including, for purposes of clarity any new file
+in Source Code form that contains any contents of the Program. Modified
+Works shall not include works that contain only declarations,
+interfaces, types, classes, structures, or files of the Program solely
+in each case in order to link to, bind by name, or subclass the Program
+or Modified Works thereof.
+
+"Distribute" means the acts of a) distributing or b) making available
+in any manner that enables the transfer of a copy.
+
+"Source Code" means the form of a Program preferred for making
+modifications, including but not limited to software source code,
+documentation source, and configuration files.
+
+"Secondary License" means either the GNU General Public License,
+Version 2.0, or any later versions of that license, including any
+exceptions or additional permissions as identified by the initial
+Contributor.
+
+2. GRANT OF RIGHTS
+
+  a) Subject to the terms of this Agreement, each Contributor hereby
+  grants Recipient a non-exclusive, worldwide, royalty-free copyright
+  license to reproduce, prepare Derivative Works of, publicly display,
+  publicly perform, Distribute and sublicense the Contribution of such
+  Contributor, if any, and such Derivative Works.
+
+  b) Subject to the terms of this Agreement, each Contributor hereby
+  grants Recipient a non-exclusive, worldwide, royalty-free patent
+  license under Licensed Patents to make, use, sell, offer to sell,
+  import and otherwise transfer the Contribution of such Contributor,
+  if any, in Source Code or other form. This patent license shall
+  apply to the combination of the Contribution and the Program if, at
+  the time the Contribution is added by the Contributor, such addition
+  of the Contribution causes such combination to be covered by the
+  Licensed Patents. The patent license shall not apply to any other
+  combinations which include the Contribution. No hardware per se is
+  licensed hereunder.
+
+  c) Recipient understands that although each Contributor grants the
+  licenses to its Contributions set forth herein, no assurances are
+  provided by any Contributor that the Program does not infringe the
+  patent or other intellectual property rights of any other entity.
+  Each Contributor disclaims any liability to Recipient for claims
+  brought by any other entity based on infringement of intellectual
+  property rights or otherwise. As a condition to exercising the
+  rights and licenses granted hereunder, each Recipient hereby
+  assumes sole responsibility to secure any other intellectual
+  property rights needed, if any. For example, if a third party
+  patent license is required to allow Recipient to Distribute the
+  Program, it is Recipient's responsibility to acquire that license
+  before distributing the Program.
+
+  d) Each Contributor represents that to its knowledge it has
+  sufficient copyright rights in its Contribution, if any, to grant
+  the copyright license set forth in this Agreement.
+
+  e) Notwithstanding the terms of any Secondary License, no
+  Contributor makes additional grants to any Recipient (other than
+  those set forth in this Agreement) as a result of such Recipient's
+  receipt of the Program under the terms of a Secondary License
+  (if permitted under the terms of Section 3).
+
+3. REQUIREMENTS
+
+3.1 If a Contributor Distributes the Program in any form, then:
+
+  a) the Program must also be made available as Source Code, in
+  accordance with section 3.2, and the Contributor must accompany
+  the Program with a statement that the Source Code for the Program
+  is available under this Agreement, and informs Recipients how to
+  obtain it in a reasonable manner on or through a medium customarily
+  used for software exchange; and
+
+  b) the Contributor may Distribute the Program under a license
+  different than this Agreement, provided that such license:
+     i) effectively disclaims on behalf of all other Contributors all
+     warranties and conditions, express and implied, including
+     warranties or conditions of title and non-infringement, and
+     implied warranties or conditions of merchantability and fitness
+     for a particular purpose;
+
+     ii) effectively excludes on behalf of all other Contributors all
+     liability for damages, including direct, indirect, special,
+     incidental and consequential damages, such as lost profits;
+
+     iii) does not attempt to limit or alter the recipients' rights
+     in the Source Code under section 3.2; and
+
+     iv) requires any subsequent distribution of the Program by any
+     party to be under a license that satisfies the requirements
+     of this section 3.
+
+3.2 When the Program is Distributed as Source Code:
+
+  a) it must be made available under this Agreement, or if the
+  Program (i) is combined with other material in a separate file or
+  files made available under a Secondary License, and (ii) the initial
+  Contributor attached to the Source Code the notice described in
+  Exhibit A of this Agreement, then the Program may be made available
+  under the terms of such Secondary Licenses, and
+
+  b) a copy of this Agreement must be included with each copy of
+  the Program.
+
+3.3 Contributors may not remove or alter any copyright, patent,
+trademark, attribution notices, disclaimers of warranty, or limitations
+of liability ("notices") contained within the Program from any copy of
+the Program which they Distribute, provided that Contributors may add
+their own appropriate notices.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities
+with respect to end users, business partners and the like. While this
+license is intended to facilitate the commercial use of the Program,
+the Contributor who includes the Program in a commercial product
+offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes
+the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and indemnify every
+other Contributor ("Indemnified Contributor") against any losses,
+damages and costs (collectively "Losses") arising from claims, lawsuits
+and other legal actions brought by a third party against the Indemnified
+Contributor to the extent caused by the acts or omissions of such
+Commercial Contributor in connection with its distribution of the Program
+in a commercial product offering. The obligations in this section do not
+apply to any claims or Losses relating to any actual or alleged
+intellectual property infringement. In order to qualify, an Indemnified
+Contributor must: a) promptly notify the Commercial Contributor in
+writing of such claim, and b) allow the Commercial Contributor to control,
+and cooperate with the Commercial Contributor in, the defense and any
+related settlement negotiations. The Indemnified Contributor may
+participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those performance
+claims and warranties, and if a court requires any other Contributor to
+pay any damages as a result, the Commercial Contributor must pay
+those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
+BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
+TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
+PURPOSE. Each Recipient is solely responsible for determining the
+appropriateness of using and distributing the Program and assumes all
+risks associated with its exercise of rights under this Agreement,
+including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs
+or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
+SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
+EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further
+action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other software
+or hardware) infringes such Recipient's patent(s), then such Recipient's
+rights granted under Section 2(b) shall terminate as of the date such
+litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of
+time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use
+and distribution of the Program as soon as reasonably practicable.
+However, Recipient's obligations under this Agreement and any licenses
+granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement,
+but in order to avoid inconsistency the Agreement is copyrighted and
+may only be modified in the following manner. The Agreement Steward
+reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement
+Steward has the right to modify this Agreement. The Eclipse Foundation
+is the initial Agreement Steward. The Eclipse Foundation may assign the
+responsibility to serve as the Agreement Steward to a suitable separate
+entity. Each new version of the Agreement will be given a distinguishing
+version number. The Program (including Contributions) may always be
+Distributed subject to the version of the Agreement under which it was
+received. In addition, after a new version of the Agreement is published,
+Contributor may elect to Distribute the Program (including its
+Contributions) under the new version.
+
+Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+receives no rights or licenses to the intellectual property of any
+Contributor under this Agreement, whether expressly, by implication,
+estoppel or otherwise. All rights in the Program not expressly granted
+under this Agreement are reserved. Nothing in this Agreement is intended
+to be enforceable by any entity that is not a Contributor or Recipient.
+No third-party beneficiary rights are created under this Agreement.
+
+Exhibit A - Form of Secondary Licenses Notice
+
+"This Source Code may also be made available under the following 
+Secondary Licenses when the conditions for such availability set forth 
+in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+version(s), and exceptions or additional permissions here}."
+
+  Simply including a copy of this Agreement, including this Exhibit A
+  is not sufficient to license the Source Code under Secondary Licenses.
+
+  If it is not possible or desirable to put the notice in a particular
+  file, then You may include the notice in a location (such as a LICENSE
+  file in a relevant directory) where a recipient would be likely to
+  look for such a notice.
+
+  You may add additional accurate notices of copyright ownership.
\ No newline at end of file
diff --git a/examples/plugins/org.eclipse.bpel.extensionsample.model/build.properties b/examples/plugins/org.eclipse.bpel.extensionsample.model/build.properties
index afc5822..294df93 100644
--- a/examples/plugins/org.eclipse.bpel.extensionsample.model/build.properties
+++ b/examples/plugins/org.eclipse.bpel.extensionsample.model/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################

 # Copyright (c) 2008, 2012 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 2.0

 # which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0

 #

 # Contributors:

 #     IBM Corporation - initial API and implementation

diff --git a/examples/plugins/org.eclipse.bpel.extensionsample.model/plugin.properties b/examples/plugins/org.eclipse.bpel.extensionsample.model/plugin.properties
index 78cb4ea..52bb1fc 100644
--- a/examples/plugins/org.eclipse.bpel.extensionsample.model/plugin.properties
+++ b/examples/plugins/org.eclipse.bpel.extensionsample.model/plugin.properties
@@ -1,9 +1,11 @@
 ###############################################################################

 # Copyright (c) 2008, 2012 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 2.0

 # which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0

 #

 # Contributors:

 #     IBM Corporation - initial API and implementation

diff --git a/examples/plugins/org.eclipse.bpel.extensionsample.model/src/org/eclipse/bpel/extensionsample/model/util/ExtensionSampleActivityDeserializer.java b/examples/plugins/org.eclipse.bpel.extensionsample.model/src/org/eclipse/bpel/extensionsample/model/util/ExtensionSampleActivityDeserializer.java
index 08ab18f..743e9a1 100644
--- a/examples/plugins/org.eclipse.bpel.extensionsample.model/src/org/eclipse/bpel/extensionsample/model/util/ExtensionSampleActivityDeserializer.java
+++ b/examples/plugins/org.eclipse.bpel.extensionsample.model/src/org/eclipse/bpel/extensionsample/model/util/ExtensionSampleActivityDeserializer.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/examples/plugins/org.eclipse.bpel.extensionsample.model/src/org/eclipse/bpel/extensionsample/model/util/ExtensionSampleActivitySerializer.java b/examples/plugins/org.eclipse.bpel.extensionsample.model/src/org/eclipse/bpel/extensionsample/model/util/ExtensionSampleActivitySerializer.java
index 8e49906..6325d0d 100644
--- a/examples/plugins/org.eclipse.bpel.extensionsample.model/src/org/eclipse/bpel/extensionsample/model/util/ExtensionSampleActivitySerializer.java
+++ b/examples/plugins/org.eclipse.bpel.extensionsample.model/src/org/eclipse/bpel/extensionsample/model/util/ExtensionSampleActivitySerializer.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/examples/plugins/org.eclipse.bpel.extensionsample.model/src/org/eclipse/bpel/extensionsample/model/util/ExtensionSampleUtils.java b/examples/plugins/org.eclipse.bpel.extensionsample.model/src/org/eclipse/bpel/extensionsample/model/util/ExtensionSampleUtils.java
index 45bacc8..c908db9 100644
--- a/examples/plugins/org.eclipse.bpel.extensionsample.model/src/org/eclipse/bpel/extensionsample/model/util/ExtensionSampleUtils.java
+++ b/examples/plugins/org.eclipse.bpel.extensionsample.model/src/org/eclipse/bpel/extensionsample/model/util/ExtensionSampleUtils.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/examples/plugins/org.eclipse.bpel.extensionsample.model/src/org/eclipse/bpel/extensionsample/model/util/ExtensionsampleConstants.java b/examples/plugins/org.eclipse.bpel.extensionsample.model/src/org/eclipse/bpel/extensionsample/model/util/ExtensionsampleConstants.java
index fd0733d..fc975f0 100644
--- a/examples/plugins/org.eclipse.bpel.extensionsample.model/src/org/eclipse/bpel/extensionsample/model/util/ExtensionsampleConstants.java
+++ b/examples/plugins/org.eclipse.bpel.extensionsample.model/src/org/eclipse/bpel/extensionsample/model/util/ExtensionsampleConstants.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/examples/plugins/org.eclipse.bpel.extensionssample.ui/build.properties b/examples/plugins/org.eclipse.bpel.extensionssample.ui/build.properties
index ffd2a82..cb04ea4 100644
--- a/examples/plugins/org.eclipse.bpel.extensionssample.ui/build.properties
+++ b/examples/plugins/org.eclipse.bpel.extensionssample.ui/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################

 # Copyright (c) 2008, 2012 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 2.0

 # which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0

 #

 # Contributors:

 #     IBM Corporation - initial API and implementation

diff --git a/examples/plugins/org.eclipse.bpel.extensionssample.ui/src/org/eclipse/bpel/extensionssample/ui/Activator.java b/examples/plugins/org.eclipse.bpel.extensionssample.ui/src/org/eclipse/bpel/extensionssample/ui/Activator.java
index e147f04..c21a658 100644
--- a/examples/plugins/org.eclipse.bpel.extensionssample.ui/src/org/eclipse/bpel/extensionssample/ui/Activator.java
+++ b/examples/plugins/org.eclipse.bpel.extensionssample.ui/src/org/eclipse/bpel/extensionssample/ui/Activator.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/examples/plugins/org.eclipse.bpel.extensionssample.ui/src/org/eclipse/bpel/extensionssample/ui/ExtensionSampleUIConstants.java b/examples/plugins/org.eclipse.bpel.extensionssample.ui/src/org/eclipse/bpel/extensionssample/ui/ExtensionSampleUIConstants.java
index af96193..e5e381f 100644
--- a/examples/plugins/org.eclipse.bpel.extensionssample.ui/src/org/eclipse/bpel/extensionssample/ui/ExtensionSampleUIConstants.java
+++ b/examples/plugins/org.eclipse.bpel.extensionssample.ui/src/org/eclipse/bpel/extensionssample/ui/ExtensionSampleUIConstants.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/examples/plugins/org.eclipse.bpel.extensionssample.ui/src/org/eclipse/bpel/extensionssample/ui/adapters/SampleSimpleActivityAdapter.java b/examples/plugins/org.eclipse.bpel.extensionssample.ui/src/org/eclipse/bpel/extensionssample/ui/adapters/SampleSimpleActivityAdapter.java
index ebb7a4e..f9fced6 100644
--- a/examples/plugins/org.eclipse.bpel.extensionssample.ui/src/org/eclipse/bpel/extensionssample/ui/adapters/SampleSimpleActivityAdapter.java
+++ b/examples/plugins/org.eclipse.bpel.extensionssample.ui/src/org/eclipse/bpel/extensionssample/ui/adapters/SampleSimpleActivityAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/examples/plugins/org.eclipse.bpel.extensionssample.ui/src/org/eclipse/bpel/extensionssample/ui/adapters/SampleStructuredActivityAdapter.java b/examples/plugins/org.eclipse.bpel.extensionssample.ui/src/org/eclipse/bpel/extensionssample/ui/adapters/SampleStructuredActivityAdapter.java
index 2adf514..a1234ec 100644
--- a/examples/plugins/org.eclipse.bpel.extensionssample.ui/src/org/eclipse/bpel/extensionssample/ui/adapters/SampleStructuredActivityAdapter.java
+++ b/examples/plugins/org.eclipse.bpel.extensionssample.ui/src/org/eclipse/bpel/extensionssample/ui/adapters/SampleStructuredActivityAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/examples/plugins/org.eclipse.bpel.extensionssample.ui/src/org/eclipse/bpel/extensionssample/ui/factories/ExtensionSampleUIAdapterFactory.java b/examples/plugins/org.eclipse.bpel.extensionssample.ui/src/org/eclipse/bpel/extensionssample/ui/factories/ExtensionSampleUIAdapterFactory.java
index bbf2ef4..b50db2f 100644
--- a/examples/plugins/org.eclipse.bpel.extensionssample.ui/src/org/eclipse/bpel/extensionssample/ui/factories/ExtensionSampleUIAdapterFactory.java
+++ b/examples/plugins/org.eclipse.bpel.extensionssample.ui/src/org/eclipse/bpel/extensionssample/ui/factories/ExtensionSampleUIAdapterFactory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/examples/plugins/org.eclipse.bpel.extensionssample.ui/src/org/eclipse/bpel/extensionssample/ui/factories/ExtensionSampleUIObjectFactory.java b/examples/plugins/org.eclipse.bpel.extensionssample.ui/src/org/eclipse/bpel/extensionssample/ui/factories/ExtensionSampleUIObjectFactory.java
index 9861610..385e3da 100644
--- a/examples/plugins/org.eclipse.bpel.extensionssample.ui/src/org/eclipse/bpel/extensionssample/ui/factories/ExtensionSampleUIObjectFactory.java
+++ b/examples/plugins/org.eclipse.bpel.extensionssample.ui/src/org/eclipse/bpel/extensionssample/ui/factories/ExtensionSampleUIObjectFactory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/examples/plugins/org.eclipse.bpel.extensionssample.ui/src/org/eclipse/bpel/extensionssample/ui/palette/ExtensionSamplePaletteProvider.java b/examples/plugins/org.eclipse.bpel.extensionssample.ui/src/org/eclipse/bpel/extensionssample/ui/palette/ExtensionSamplePaletteProvider.java
index 25c4e46..263ddc8 100644
--- a/examples/plugins/org.eclipse.bpel.extensionssample.ui/src/org/eclipse/bpel/extensionssample/ui/palette/ExtensionSamplePaletteProvider.java
+++ b/examples/plugins/org.eclipse.bpel.extensionssample.ui/src/org/eclipse/bpel/extensionssample/ui/palette/ExtensionSamplePaletteProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/examples/plugins/org.eclipse.bpel.extensionssample.ui/src/org/eclipse/bpel/extensionssample/ui/popup/actions/PopupAction.java b/examples/plugins/org.eclipse.bpel.extensionssample.ui/src/org/eclipse/bpel/extensionssample/ui/popup/actions/PopupAction.java
index 3a3d5cb..9203513 100644
--- a/examples/plugins/org.eclipse.bpel.extensionssample.ui/src/org/eclipse/bpel/extensionssample/ui/popup/actions/PopupAction.java
+++ b/examples/plugins/org.eclipse.bpel.extensionssample.ui/src/org/eclipse/bpel/extensionssample/ui/popup/actions/PopupAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/examples/plugins/org.eclipse.bpel.extensionssample.ui/src/org/eclipse/bpel/extensionssample/ui/properties/SampleSimpleActivityPropertySection.java b/examples/plugins/org.eclipse.bpel.extensionssample.ui/src/org/eclipse/bpel/extensionssample/ui/properties/SampleSimpleActivityPropertySection.java
index 8c35e9c..d592bf5 100644
--- a/examples/plugins/org.eclipse.bpel.extensionssample.ui/src/org/eclipse/bpel/extensionssample/ui/properties/SampleSimpleActivityPropertySection.java
+++ b/examples/plugins/org.eclipse.bpel.extensionssample.ui/src/org/eclipse/bpel/extensionssample/ui/properties/SampleSimpleActivityPropertySection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/examples/plugins/org.eclipse.bpel.extensionssample.ui/src/org/eclipse/bpel/extensionssample/ui/properties/SampleStructuredActivityPropertySection.java b/examples/plugins/org.eclipse.bpel.extensionssample.ui/src/org/eclipse/bpel/extensionssample/ui/properties/SampleStructuredActivityPropertySection.java
index 2f07538..759617b 100644
--- a/examples/plugins/org.eclipse.bpel.extensionssample.ui/src/org/eclipse/bpel/extensionssample/ui/properties/SampleStructuredActivityPropertySection.java
+++ b/examples/plugins/org.eclipse.bpel.extensionssample.ui/src/org/eclipse/bpel/extensionssample/ui/properties/SampleStructuredActivityPropertySection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/examples/plugins/org.eclipse.xtext.example.arithmetics.ui/src/org/eclipse/xtext/example/arithmetics/ui/ArithmeticsUiModule.java b/examples/plugins/org.eclipse.xtext.example.arithmetics.ui/src/org/eclipse/xtext/example/arithmetics/ui/ArithmeticsUiModule.java
index 7c724e3..d79d4f8 100644
--- a/examples/plugins/org.eclipse.xtext.example.arithmetics.ui/src/org/eclipse/xtext/example/arithmetics/ui/ArithmeticsUiModule.java
+++ b/examples/plugins/org.eclipse.xtext.example.arithmetics.ui/src/org/eclipse/xtext/example/arithmetics/ui/ArithmeticsUiModule.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2010 itemis AG (http://www.itemis.eu) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 package org.eclipse.xtext.example.arithmetics.ui;
 
diff --git a/examples/plugins/org.eclipse.xtext.example.arithmetics.ui/src/org/eclipse/xtext/example/arithmetics/ui/autoedit/AutoEditStrategy.java b/examples/plugins/org.eclipse.xtext.example.arithmetics.ui/src/org/eclipse/xtext/example/arithmetics/ui/autoedit/AutoEditStrategy.java
index 8f0ad59..08d9b3d 100644
--- a/examples/plugins/org.eclipse.xtext.example.arithmetics.ui/src/org/eclipse/xtext/example/arithmetics/ui/autoedit/AutoEditStrategy.java
+++ b/examples/plugins/org.eclipse.xtext.example.arithmetics.ui/src/org/eclipse/xtext/example/arithmetics/ui/autoedit/AutoEditStrategy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2010 itemis AG (http://www.itemis.eu) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 package org.eclipse.xtext.example.arithmetics.ui.autoedit;
 
diff --git a/examples/plugins/org.eclipse.xtext.example.arithmetics.ui/src/org/eclipse/xtext/example/arithmetics/ui/autoedit/InterpreterAutoEdit.java b/examples/plugins/org.eclipse.xtext.example.arithmetics.ui/src/org/eclipse/xtext/example/arithmetics/ui/autoedit/InterpreterAutoEdit.java
index 76fb153..d164ca2 100644
--- a/examples/plugins/org.eclipse.xtext.example.arithmetics.ui/src/org/eclipse/xtext/example/arithmetics/ui/autoedit/InterpreterAutoEdit.java
+++ b/examples/plugins/org.eclipse.xtext.example.arithmetics.ui/src/org/eclipse/xtext/example/arithmetics/ui/autoedit/InterpreterAutoEdit.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2010 itemis AG (http://www.itemis.eu) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
 package org.eclipse.xtext.example.arithmetics.ui.autoedit;
diff --git a/examples/plugins/org.eclipse.xtext.example.arithmetics.ui/src/org/eclipse/xtext/example/arithmetics/ui/contentassist/ArithmeticsProposalProvider.java b/examples/plugins/org.eclipse.xtext.example.arithmetics.ui/src/org/eclipse/xtext/example/arithmetics/ui/contentassist/ArithmeticsProposalProvider.java
index f66ca84..8214c8f 100644
--- a/examples/plugins/org.eclipse.xtext.example.arithmetics.ui/src/org/eclipse/xtext/example/arithmetics/ui/contentassist/ArithmeticsProposalProvider.java
+++ b/examples/plugins/org.eclipse.xtext.example.arithmetics.ui/src/org/eclipse/xtext/example/arithmetics/ui/contentassist/ArithmeticsProposalProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2010 itemis AG (http://www.itemis.eu) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 package org.eclipse.xtext.example.arithmetics.ui.contentassist;
 
diff --git a/examples/plugins/org.eclipse.xtext.example.arithmetics.ui/src/org/eclipse/xtext/example/arithmetics/ui/labeling/ArithmeticsDescriptionLabelProvider.java b/examples/plugins/org.eclipse.xtext.example.arithmetics.ui/src/org/eclipse/xtext/example/arithmetics/ui/labeling/ArithmeticsDescriptionLabelProvider.java
index c7dc205..17ec5f5 100644
--- a/examples/plugins/org.eclipse.xtext.example.arithmetics.ui/src/org/eclipse/xtext/example/arithmetics/ui/labeling/ArithmeticsDescriptionLabelProvider.java
+++ b/examples/plugins/org.eclipse.xtext.example.arithmetics.ui/src/org/eclipse/xtext/example/arithmetics/ui/labeling/ArithmeticsDescriptionLabelProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2010 itemis AG (http://www.itemis.eu) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 package org.eclipse.xtext.example.arithmetics.ui.labeling;
 
diff --git a/examples/plugins/org.eclipse.xtext.example.arithmetics.ui/src/org/eclipse/xtext/example/arithmetics/ui/labeling/ArithmeticsLabelProvider.java b/examples/plugins/org.eclipse.xtext.example.arithmetics.ui/src/org/eclipse/xtext/example/arithmetics/ui/labeling/ArithmeticsLabelProvider.java
index d7abe1f..73cde21 100644
--- a/examples/plugins/org.eclipse.xtext.example.arithmetics.ui/src/org/eclipse/xtext/example/arithmetics/ui/labeling/ArithmeticsLabelProvider.java
+++ b/examples/plugins/org.eclipse.xtext.example.arithmetics.ui/src/org/eclipse/xtext/example/arithmetics/ui/labeling/ArithmeticsLabelProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2010 itemis AG (http://www.itemis.eu) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 package org.eclipse.xtext.example.arithmetics.ui.labeling;
 
diff --git a/examples/plugins/org.eclipse.xtext.example.arithmetics.ui/src/org/eclipse/xtext/example/arithmetics/ui/outline/ArithmeticsOutlineTreeProvider.java b/examples/plugins/org.eclipse.xtext.example.arithmetics.ui/src/org/eclipse/xtext/example/arithmetics/ui/outline/ArithmeticsOutlineTreeProvider.java
index 6dfda52..b08ce2d 100644
--- a/examples/plugins/org.eclipse.xtext.example.arithmetics.ui/src/org/eclipse/xtext/example/arithmetics/ui/outline/ArithmeticsOutlineTreeProvider.java
+++ b/examples/plugins/org.eclipse.xtext.example.arithmetics.ui/src/org/eclipse/xtext/example/arithmetics/ui/outline/ArithmeticsOutlineTreeProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2010 itemis AG (http://www.itemis.eu) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 package org.eclipse.xtext.example.arithmetics.ui.outline;
 
diff --git a/examples/plugins/org.eclipse.xtext.example.arithmetics.ui/src/org/eclipse/xtext/example/arithmetics/ui/quickfix/ArithmeticsQuickfixProvider.java b/examples/plugins/org.eclipse.xtext.example.arithmetics.ui/src/org/eclipse/xtext/example/arithmetics/ui/quickfix/ArithmeticsQuickfixProvider.java
index c9a3304..f823868 100644
--- a/examples/plugins/org.eclipse.xtext.example.arithmetics.ui/src/org/eclipse/xtext/example/arithmetics/ui/quickfix/ArithmeticsQuickfixProvider.java
+++ b/examples/plugins/org.eclipse.xtext.example.arithmetics.ui/src/org/eclipse/xtext/example/arithmetics/ui/quickfix/ArithmeticsQuickfixProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2010 itemis AG (http://www.itemis.eu) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 package org.eclipse.xtext.example.arithmetics.ui.quickfix;
 
diff --git a/examples/plugins/org.eclipse.xtext.example.arithmetics/src/org/eclipse/xtext/example/arithmetics/Arithmetics.mwe2 b/examples/plugins/org.eclipse.xtext.example.arithmetics/src/org/eclipse/xtext/example/arithmetics/Arithmetics.mwe2
index 33b2773..70f1dbb 100644
--- a/examples/plugins/org.eclipse.xtext.example.arithmetics/src/org/eclipse/xtext/example/arithmetics/Arithmetics.mwe2
+++ b/examples/plugins/org.eclipse.xtext.example.arithmetics/src/org/eclipse/xtext/example/arithmetics/Arithmetics.mwe2
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2010 itemis AG (http://www.itemis.eu) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 module org.eclipse.xtext.example.arithmetics.Arithmetics
 
diff --git a/examples/plugins/org.eclipse.xtext.example.arithmetics/src/org/eclipse/xtext/example/arithmetics/Arithmetics.xtext b/examples/plugins/org.eclipse.xtext.example.arithmetics/src/org/eclipse/xtext/example/arithmetics/Arithmetics.xtext
index a4634ff..68d82cd 100644
--- a/examples/plugins/org.eclipse.xtext.example.arithmetics/src/org/eclipse/xtext/example/arithmetics/Arithmetics.xtext
+++ b/examples/plugins/org.eclipse.xtext.example.arithmetics/src/org/eclipse/xtext/example/arithmetics/Arithmetics.xtext
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2010 itemis AG (http://www.itemis.eu) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 grammar org.eclipse.xtext.example.arithmetics.Arithmetics with org.eclipse.xtext.common.Terminals
 
diff --git a/examples/plugins/org.eclipse.xtext.example.arithmetics/src/org/eclipse/xtext/example/arithmetics/ArithmeticsRuntimeModule.java b/examples/plugins/org.eclipse.xtext.example.arithmetics/src/org/eclipse/xtext/example/arithmetics/ArithmeticsRuntimeModule.java
index bb5f66e..db22961 100644
--- a/examples/plugins/org.eclipse.xtext.example.arithmetics/src/org/eclipse/xtext/example/arithmetics/ArithmeticsRuntimeModule.java
+++ b/examples/plugins/org.eclipse.xtext.example.arithmetics/src/org/eclipse/xtext/example/arithmetics/ArithmeticsRuntimeModule.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2010 itemis AG (http://www.itemis.eu) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 package org.eclipse.xtext.example.arithmetics;
 
diff --git a/examples/plugins/org.eclipse.xtext.example.arithmetics/src/org/eclipse/xtext/example/arithmetics/formatting/ArithmeticsFormatter.java b/examples/plugins/org.eclipse.xtext.example.arithmetics/src/org/eclipse/xtext/example/arithmetics/formatting/ArithmeticsFormatter.java
index 228d816..ed43558 100644
--- a/examples/plugins/org.eclipse.xtext.example.arithmetics/src/org/eclipse/xtext/example/arithmetics/formatting/ArithmeticsFormatter.java
+++ b/examples/plugins/org.eclipse.xtext.example.arithmetics/src/org/eclipse/xtext/example/arithmetics/formatting/ArithmeticsFormatter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2010 itemis AG (http://www.itemis.eu) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 package org.eclipse.xtext.example.arithmetics.formatting;
 
diff --git a/examples/plugins/org.eclipse.xtext.example.arithmetics/src/org/eclipse/xtext/example/arithmetics/interpreter/Calculator.java b/examples/plugins/org.eclipse.xtext.example.arithmetics/src/org/eclipse/xtext/example/arithmetics/interpreter/Calculator.java
index b92565d..9cac121 100644
--- a/examples/plugins/org.eclipse.xtext.example.arithmetics/src/org/eclipse/xtext/example/arithmetics/interpreter/Calculator.java
+++ b/examples/plugins/org.eclipse.xtext.example.arithmetics/src/org/eclipse/xtext/example/arithmetics/interpreter/Calculator.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2010 itemis AG (http://www.itemis.eu) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
 package org.eclipse.xtext.example.arithmetics.interpreter;
diff --git a/examples/plugins/org.eclipse.xtext.example.arithmetics/src/org/eclipse/xtext/example/arithmetics/scoping/ArithmeticsScopeProvider.java b/examples/plugins/org.eclipse.xtext.example.arithmetics/src/org/eclipse/xtext/example/arithmetics/scoping/ArithmeticsScopeProvider.java
index f51240e..5e17a5e 100644
--- a/examples/plugins/org.eclipse.xtext.example.arithmetics/src/org/eclipse/xtext/example/arithmetics/scoping/ArithmeticsScopeProvider.java
+++ b/examples/plugins/org.eclipse.xtext.example.arithmetics/src/org/eclipse/xtext/example/arithmetics/scoping/ArithmeticsScopeProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2010 itemis AG (http://www.itemis.eu) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 package org.eclipse.xtext.example.arithmetics.scoping;
 
diff --git a/examples/plugins/org.eclipse.xtext.example.arithmetics/src/org/eclipse/xtext/example/arithmetics/scoping/LinkingService.java b/examples/plugins/org.eclipse.xtext.example.arithmetics/src/org/eclipse/xtext/example/arithmetics/scoping/LinkingService.java
index e2260b7..9f079fe 100644
--- a/examples/plugins/org.eclipse.xtext.example.arithmetics/src/org/eclipse/xtext/example/arithmetics/scoping/LinkingService.java
+++ b/examples/plugins/org.eclipse.xtext.example.arithmetics/src/org/eclipse/xtext/example/arithmetics/scoping/LinkingService.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2010 itemis AG (http://www.itemis.eu) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 package org.eclipse.xtext.example.arithmetics.scoping;
 
diff --git a/examples/plugins/org.eclipse.xtext.example.arithmetics/src/org/eclipse/xtext/example/arithmetics/scoping/NameProvider.java b/examples/plugins/org.eclipse.xtext.example.arithmetics/src/org/eclipse/xtext/example/arithmetics/scoping/NameProvider.java
index 3aca661..76c400a 100644
--- a/examples/plugins/org.eclipse.xtext.example.arithmetics/src/org/eclipse/xtext/example/arithmetics/scoping/NameProvider.java
+++ b/examples/plugins/org.eclipse.xtext.example.arithmetics/src/org/eclipse/xtext/example/arithmetics/scoping/NameProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2010 itemis AG (http://www.itemis.eu) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 package org.eclipse.xtext.example.arithmetics.scoping;
 
diff --git a/examples/plugins/org.eclipse.xtext.example.arithmetics/src/org/eclipse/xtext/example/arithmetics/validation/ArithmeticsJavaValidator.java b/examples/plugins/org.eclipse.xtext.example.arithmetics/src/org/eclipse/xtext/example/arithmetics/validation/ArithmeticsJavaValidator.java
index a5928f0..526d2b5 100644
--- a/examples/plugins/org.eclipse.xtext.example.arithmetics/src/org/eclipse/xtext/example/arithmetics/validation/ArithmeticsJavaValidator.java
+++ b/examples/plugins/org.eclipse.xtext.example.arithmetics/src/org/eclipse/xtext/example/arithmetics/validation/ArithmeticsJavaValidator.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2010 itemis AG (http://www.itemis.eu) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
 package org.eclipse.xtext.example.arithmetics.validation;
diff --git a/features/org.eclipse.bpel.apache.ode.runtime.feature/about.html b/features/org.eclipse.bpel.apache.ode.runtime.feature/about.html
index 363bc9d..31a983e 100644
--- a/features/org.eclipse.bpel.apache.ode.runtime.feature/about.html
+++ b/features/org.eclipse.bpel.apache.ode.runtime.feature/about.html
@@ -13,8 +13,10 @@
 
 <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>.
+Eclipse Public License 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+>https://www.eclipse.org/legal/epl-2.0/
+>
+>SPDX-License-Identifier: EPL-2.0</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/features/org.eclipse.bpel.apache.ode.runtime.feature/feature.properties b/features/org.eclipse.bpel.apache.ode.runtime.feature/feature.properties
index 922a814..aab393c 100644
--- a/features/org.eclipse.bpel.apache.ode.runtime.feature/feature.properties
+++ b/features/org.eclipse.bpel.apache.ode.runtime.feature/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 #  Copyright (c) 2012 EBM WebSourcing
 # 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 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #     EBM WebSourcing - initial API and implementation
@@ -29,14 +31,18 @@
 copyright=\
  Copyright (c) 2011 Eclipse.org.\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\
+ are made available under the terms of the Eclipse Public License 2.0\n\
  which accompanies this distribution, and is available at\n\
- http://www.eclipse.org/legal/epl-v10.html\n
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0\n
 ################ end of copyright property ####################################
 
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
-licenseURL=http://www.eclipse.org/legal/epl-v10.html
+=https://www.eclipse.org/legal/epl-2.0/
+=
+=SPDX-License-Identifier: EPL-2.0
 
 # "license" property - text of the "Feature Update License"
 # should be plain text version of license agreement pointed to be "licenseURL"
@@ -62,8 +68,10 @@
 \n\
 Unless otherwise indicated, all Content made available by the\n\
 Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+the Eclipse Public License 2.0 ("EPL"). A copy of the EPL is\n\
+t https://www.eclipse.org/legal/epl-2.0/
+t
+t SPDX-License-Identifier: EPL-2.0.\n\
 For purposes of the EPL, "Program" will mean the Content.\n\
 \n\
 Content includes, but is not limited to, source code, object code,\n\
diff --git a/features/org.eclipse.bpel.apache.ode.runtime.feature/license.html b/features/org.eclipse.bpel.apache.ode.runtime.feature/license.html
index b8b0438..7351bd3 100644
--- a/features/org.eclipse.bpel.apache.ode.runtime.feature/license.html
+++ b/features/org.eclipse.bpel.apache.ode.runtime.feature/license.html
@@ -22,9 +22,11 @@
 

 <p>Unless otherwise indicated, all Content made available by the Eclipse

  Foundation is provided to you under the terms and conditions of the 

-Eclipse Public License Version 1.0

+Eclipse Public License 2.0

    ("EPL").  A copy of the EPL is provided with this Content and is also

- available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+>https://www.eclipse.org/legal/epl-2.0/
+>
+>SPDX-License-Identifier: EPL-2.0</a>.

    For purposes of the EPL, "Program" will mean the Content.</p>

 

 <p>Content includes, but is not limited to, source code, object code, 

diff --git a/features/org.eclipse.bpel.common.feature/about.html b/features/org.eclipse.bpel.common.feature/about.html
index 363bc9d..31a983e 100644
--- a/features/org.eclipse.bpel.common.feature/about.html
+++ b/features/org.eclipse.bpel.common.feature/about.html
@@ -13,8 +13,10 @@
 
 <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>.
+Eclipse Public License 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+>https://www.eclipse.org/legal/epl-2.0/
+>
+>SPDX-License-Identifier: EPL-2.0</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/features/org.eclipse.bpel.common.feature/feature.properties b/features/org.eclipse.bpel.common.feature/feature.properties
index 113ae51..c19a63a 100644
--- a/features/org.eclipse.bpel.common.feature/feature.properties
+++ b/features/org.eclipse.bpel.common.feature/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 #  Copyright (c) 2012 EBM WebSourcing
 # 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 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #     EBM WebSourcing - initial API and implementation
@@ -29,9 +31,11 @@
 copyright=\
  Copyright (c) 2011 Eclipse.org.\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\
+ are made available under the terms of the Eclipse Public License 2.0\n\
  which accompanies this distribution, and is available at\n\
- http://www.eclipse.org/legal/epl-v10.html\n\
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0\n\
  \n\
  Contributors:\n\
      EBM WebSourcing - initial API and implementation\n
@@ -39,7 +43,9 @@
 
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
-licenseURL=http://www.eclipse.org/legal/epl-v10.html
+=https://www.eclipse.org/legal/epl-2.0/
+=
+=SPDX-License-Identifier: EPL-2.0
 
 # "license" property - text of the "Feature Update License"
 # should be plain text version of license agreement pointed to be "licenseURL"
@@ -65,8 +71,10 @@
 \n\
 Unless otherwise indicated, all Content made available by the\n\
 Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+the Eclipse Public License 2.0 ("EPL"). A copy of the EPL is\n\
+t https://www.eclipse.org/legal/epl-2.0/
+t
+t SPDX-License-Identifier: EPL-2.0.\n\
 For purposes of the EPL, "Program" will mean the Content.\n\
 \n\
 Content includes, but is not limited to, source code, object code,\n\
diff --git a/features/org.eclipse.bpel.common.feature/license.html b/features/org.eclipse.bpel.common.feature/license.html
index b8b0438..7351bd3 100644
--- a/features/org.eclipse.bpel.common.feature/license.html
+++ b/features/org.eclipse.bpel.common.feature/license.html
@@ -22,9 +22,11 @@
 

 <p>Unless otherwise indicated, all Content made available by the Eclipse

  Foundation is provided to you under the terms and conditions of the 

-Eclipse Public License Version 1.0

+Eclipse Public License 2.0

    ("EPL").  A copy of the EPL is provided with this Content and is also

- available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+>https://www.eclipse.org/legal/epl-2.0/
+>
+>SPDX-License-Identifier: EPL-2.0</a>.

    For purposes of the EPL, "Program" will mean the Content.</p>

 

 <p>Content includes, but is not limited to, source code, object code, 

diff --git a/features/org.eclipse.bpel.feature/about.html b/features/org.eclipse.bpel.feature/about.html
index 363bc9d..31a983e 100644
--- a/features/org.eclipse.bpel.feature/about.html
+++ b/features/org.eclipse.bpel.feature/about.html
@@ -13,8 +13,10 @@
 
 <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>.
+Eclipse Public License 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+>https://www.eclipse.org/legal/epl-2.0/
+>
+>SPDX-License-Identifier: EPL-2.0</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/features/org.eclipse.bpel.feature/feature.properties b/features/org.eclipse.bpel.feature/feature.properties
index 8037aa2..481f1e4 100644
--- a/features/org.eclipse.bpel.feature/feature.properties
+++ b/features/org.eclipse.bpel.feature/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 #  Copyright (c) 2012 EBM WebSourcing
 # 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 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #     EBM WebSourcing - initial API and implementation
@@ -29,14 +31,18 @@
 copyright=\
  Copyright (c) 2011 Eclipse.org.\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\
+ are made available under the terms of the Eclipse Public License 2.0\n\
  which accompanies this distribution, and is available at\n\
- http://www.eclipse.org/legal/epl-v10.html\n
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0\n
 ################ end of copyright property ####################################
 
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
-licenseURL=http://www.eclipse.org/legal/epl-v10.html
+=https://www.eclipse.org/legal/epl-2.0/
+=
+=SPDX-License-Identifier: EPL-2.0
 
 # "license" property - text of the "Feature Update License"
 # should be plain text version of license agreement pointed to be "licenseURL"
@@ -62,8 +68,10 @@
 \n\
 Unless otherwise indicated, all Content made available by the\n\
 Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+the Eclipse Public License 2.0 ("EPL"). A copy of the EPL is\n\
+t https://www.eclipse.org/legal/epl-2.0/
+t
+t SPDX-License-Identifier: EPL-2.0.\n\
 For purposes of the EPL, "Program" will mean the Content.\n\
 \n\
 Content includes, but is not limited to, source code, object code,\n\
diff --git a/features/org.eclipse.bpel.feature/license.html b/features/org.eclipse.bpel.feature/license.html
index b8b0438..7351bd3 100644
--- a/features/org.eclipse.bpel.feature/license.html
+++ b/features/org.eclipse.bpel.feature/license.html
@@ -22,9 +22,11 @@
 

 <p>Unless otherwise indicated, all Content made available by the Eclipse

  Foundation is provided to you under the terms and conditions of the 

-Eclipse Public License Version 1.0

+Eclipse Public License 2.0

    ("EPL").  A copy of the EPL is provided with this Content and is also

- available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+>https://www.eclipse.org/legal/epl-2.0/
+>
+>SPDX-License-Identifier: EPL-2.0</a>.

    For purposes of the EPL, "Program" will mean the Content.</p>

 

 <p>Content includes, but is not limited to, source code, object code, 

diff --git a/features/org.eclipse.bpel.jboss.riftsaw.runtime.feature/about.html b/features/org.eclipse.bpel.jboss.riftsaw.runtime.feature/about.html
index 363bc9d..31a983e 100644
--- a/features/org.eclipse.bpel.jboss.riftsaw.runtime.feature/about.html
+++ b/features/org.eclipse.bpel.jboss.riftsaw.runtime.feature/about.html
@@ -13,8 +13,10 @@
 
 <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>.
+Eclipse Public License 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+>https://www.eclipse.org/legal/epl-2.0/
+>
+>SPDX-License-Identifier: EPL-2.0</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/features/org.eclipse.bpel.jboss.riftsaw.runtime.feature/feature.properties b/features/org.eclipse.bpel.jboss.riftsaw.runtime.feature/feature.properties
index eb81ce9..24c686c 100644
--- a/features/org.eclipse.bpel.jboss.riftsaw.runtime.feature/feature.properties
+++ b/features/org.eclipse.bpel.jboss.riftsaw.runtime.feature/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 #  Copyright (c) 2012 EBM WebSourcing
 # 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 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #     EBM WebSourcing - initial API and implementation
@@ -29,14 +31,18 @@
 copyright=\
  Copyright (c) 2011 Eclipse.org.\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\
+ are made available under the terms of the Eclipse Public License 2.0\n\
  which accompanies this distribution, and is available at\n\
- http://www.eclipse.org/legal/epl-v10.html\n
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0\n
 ################ end of copyright property ####################################
 
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
-licenseURL=http://www.eclipse.org/legal/epl-v10.html
+=https://www.eclipse.org/legal/epl-2.0/
+=
+=SPDX-License-Identifier: EPL-2.0
 
 # "license" property - text of the "Feature Update License"
 # should be plain text version of license agreement pointed to be "licenseURL"
@@ -62,8 +68,10 @@
 \n\
 Unless otherwise indicated, all Content made available by the\n\
 Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+the Eclipse Public License 2.0 ("EPL"). A copy of the EPL is\n\
+t https://www.eclipse.org/legal/epl-2.0/
+t
+t SPDX-License-Identifier: EPL-2.0.\n\
 For purposes of the EPL, "Program" will mean the Content.\n\
 \n\
 Content includes, but is not limited to, source code, object code,\n\
diff --git a/features/org.eclipse.bpel.jboss.riftsaw.runtime.feature/license.html b/features/org.eclipse.bpel.jboss.riftsaw.runtime.feature/license.html
index b8b0438..7351bd3 100644
--- a/features/org.eclipse.bpel.jboss.riftsaw.runtime.feature/license.html
+++ b/features/org.eclipse.bpel.jboss.riftsaw.runtime.feature/license.html
@@ -22,9 +22,11 @@
 

 <p>Unless otherwise indicated, all Content made available by the Eclipse

  Foundation is provided to you under the terms and conditions of the 

-Eclipse Public License Version 1.0

+Eclipse Public License 2.0

    ("EPL").  A copy of the EPL is provided with this Content and is also

- available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+>https://www.eclipse.org/legal/epl-2.0/
+>
+>SPDX-License-Identifier: EPL-2.0</a>.

    For purposes of the EPL, "Program" will mean the Content.</p>

 

 <p>Content includes, but is not limited to, source code, object code, 

diff --git a/features/org.eclipse.bpel.releng/build.properties b/features/org.eclipse.bpel.releng/build.properties
index 47dcdae..0c5a0f2 100644
--- a/features/org.eclipse.bpel.releng/build.properties
+++ b/features/org.eclipse.bpel.releng/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2003, 2006 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 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/features/org.eclipse.bpel.source.feature/about.html b/features/org.eclipse.bpel.source.feature/about.html
index 363bc9d..31a983e 100644
--- a/features/org.eclipse.bpel.source.feature/about.html
+++ b/features/org.eclipse.bpel.source.feature/about.html
@@ -13,8 +13,10 @@
 
 <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>.
+Eclipse Public License 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+>https://www.eclipse.org/legal/epl-2.0/
+>
+>SPDX-License-Identifier: EPL-2.0</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/features/org.eclipse.bpel.source.feature/feature.properties b/features/org.eclipse.bpel.source.feature/feature.properties
index c6cc340..5df6e25 100644
--- a/features/org.eclipse.bpel.source.feature/feature.properties
+++ b/features/org.eclipse.bpel.source.feature/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 #  Copyright (c) 2012 EBM WebSourcing
 # 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 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #     EBM WebSourcing - initial API and implementation
@@ -29,14 +31,18 @@
 copyright=\
  Copyright (c) 2011 Eclipse.org.\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\
+ are made available under the terms of the Eclipse Public License 2.0\n\
  which accompanies this distribution, and is available at\n\
- http://www.eclipse.org/legal/epl-v10.html\n
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0\n
 ################ end of copyright property ####################################
 
 # "licenseURL" property - URL of the "Feature License"
 # do not translate value - just change to point to a locale-specific HTML page
-licenseURL=http://www.eclipse.org/legal/epl-v10.html
+=https://www.eclipse.org/legal/epl-2.0/
+=
+=SPDX-License-Identifier: EPL-2.0
 
 # "license" property - text of the "Feature Update License"
 # should be plain text version of license agreement pointed to be "licenseURL"
@@ -62,8 +68,10 @@
 \n\
 Unless otherwise indicated, all Content made available by the\n\
 Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+the Eclipse Public License 2.0 ("EPL"). A copy of the EPL is\n\
+t https://www.eclipse.org/legal/epl-2.0/
+t
+t SPDX-License-Identifier: EPL-2.0.\n\
 For purposes of the EPL, "Program" will mean the Content.\n\
 \n\
 Content includes, but is not limited to, source code, object code,\n\
diff --git a/features/org.eclipse.bpel.source.feature/license.html b/features/org.eclipse.bpel.source.feature/license.html
index b8b0438..7351bd3 100644
--- a/features/org.eclipse.bpel.source.feature/license.html
+++ b/features/org.eclipse.bpel.source.feature/license.html
@@ -22,9 +22,11 @@
 

 <p>Unless otherwise indicated, all Content made available by the Eclipse

  Foundation is provided to you under the terms and conditions of the 

-Eclipse Public License Version 1.0

+Eclipse Public License 2.0

    ("EPL").  A copy of the EPL is provided with this Content and is also

- available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+>https://www.eclipse.org/legal/epl-2.0/
+>
+>SPDX-License-Identifier: EPL-2.0</a>.

    For purposes of the EPL, "Program" will mean the Content.</p>

 

 <p>Content includes, but is not limited to, source code, object code, 

diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.model/about.html b/plugins/org.eclipse.bpel.apache.ode.deploy.model/about.html
index 363bc9d..31a983e 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.model/about.html
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.model/about.html
@@ -13,8 +13,10 @@
 
 <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>.
+Eclipse Public License 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+>https://www.eclipse.org/legal/epl-2.0/
+>
+>SPDX-License-Identifier: EPL-2.0</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.bpel.apache.ode.deploy.model/model/odeDeploymentDescriptor.genmodel b/plugins/org.eclipse.bpel.apache.ode.deploy.model/model/odeDeploymentDescriptor.genmodel
index 458553f..e48d70c 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.model/model/odeDeploymentDescriptor.genmodel
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.model/model/odeDeploymentDescriptor.genmodel
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;    IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation"
+;https://www.eclipse.org/legal/epl-2.0/
+;
+;SPDX-License-Identifier: EPL-2.0&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;    IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation"
     modelDirectory="/org.eclipse.bpel.apache.ode.deploy.model/src" modelPluginID="org.eclipse.bpel.apache.ode.deploy.model"
     modelName="OdeDeploymentDescriptor" importerID="org.eclipse.emf.importer.ecore"
     complianceLevel="5.0" copyrightFields="false" usedGenPackages="../../org.eclipse.bpel.model/src/model/bpel.genmodel#//model ../../org.eclipse.bpel.model/src/model/bpel.genmodel#//partnerlinktype ../../org.eclipse.bpel.model/src/model/bpel.genmodel#//messageproperties platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.wst.wsdl/model/WSDL.genmodel#//wsdl platform:/plugin/org.eclipse.xsd/model/XSD.genmodel#//xsd">
diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/BindingType.java b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/BindingType.java
index 00ddf9b..9af1028 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/BindingType.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/BindingType.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 IBM Corporation, University of Stuttgart (IAAS) 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/DocumentRoot.java b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/DocumentRoot.java
index b1d31d5..f467327 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/DocumentRoot.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/DocumentRoot.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/GenerateType.java b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/GenerateType.java
index 819392f..9f234af 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/GenerateType.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/GenerateType.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/MexInterceptorsType.java b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/MexInterceptorsType.java
index 60d7563..4396c8b 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/MexInterceptorsType.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/MexInterceptorsType.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/ProcessType.java b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/ProcessType.java
index a5d2e3a..311505d 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/ProcessType.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/ProcessType.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/PropertyType.java b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/PropertyType.java
index 8092ee3..06f0819 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/PropertyType.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/PropertyType.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TDeployment.java b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TDeployment.java
index 491e9f8..a23d54b 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TDeployment.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TDeployment.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TEnableEventList.java b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TEnableEventList.java
index e2c2eb1..86c2c3d 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TEnableEventList.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TEnableEventList.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TInvoke.java b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TInvoke.java
index 5197e71..f3c8a51 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TInvoke.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TInvoke.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TMexInterceptor.java b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TMexInterceptor.java
index 3cb6c7c..2620653 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TMexInterceptor.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TMexInterceptor.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TProcessEvents.java b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TProcessEvents.java
index 2b01ff1..c82ab0e 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TProcessEvents.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TProcessEvents.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TProvide.java b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TProvide.java
index 43f835b..efab10e 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TProvide.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TProvide.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TScopeEvents.java b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TScopeEvents.java
index 056a471..3f127b6 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TScopeEvents.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TScopeEvents.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TService.java b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TService.java
index 3f09cd5..1304c3e 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TService.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TService.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/ddFactory.java b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/ddFactory.java
index 504ef9a..9552299 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/ddFactory.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/ddFactory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/ddPackage.java b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/ddPackage.java
index 7d3acce..a77f70a 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/ddPackage.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/ddPackage.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/BindingTypeImpl.java b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/BindingTypeImpl.java
index e628797..7b0085f 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/BindingTypeImpl.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/BindingTypeImpl.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/DocumentRootImpl.java b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/DocumentRootImpl.java
index efa0975..dc2fa56 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/DocumentRootImpl.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/DocumentRootImpl.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/MexInterceptorsTypeImpl.java b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/MexInterceptorsTypeImpl.java
index 4ba7797..5812109 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/MexInterceptorsTypeImpl.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/MexInterceptorsTypeImpl.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/ProcessTypeImpl.java b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/ProcessTypeImpl.java
index a176051..8a3b596 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/ProcessTypeImpl.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/ProcessTypeImpl.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/PropertyTypeImpl.java b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/PropertyTypeImpl.java
index 3934034..b14e479 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/PropertyTypeImpl.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/PropertyTypeImpl.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TDeploymentImpl.java b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TDeploymentImpl.java
index d610e2c..a479a05 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TDeploymentImpl.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TDeploymentImpl.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TEnableEventListImpl.java b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TEnableEventListImpl.java
index 5549697..3efb223 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TEnableEventListImpl.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TEnableEventListImpl.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TInvokeImpl.java b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TInvokeImpl.java
index b7d5821..1b607c7 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TInvokeImpl.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TInvokeImpl.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TMexInterceptorImpl.java b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TMexInterceptorImpl.java
index 39bafae..4e2a028 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TMexInterceptorImpl.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TMexInterceptorImpl.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TProcessEventsImpl.java b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TProcessEventsImpl.java
index 5f721e5..6afefa1 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TProcessEventsImpl.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TProcessEventsImpl.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TProvideImpl.java b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TProvideImpl.java
index b89ae0b..7ebc160 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TProvideImpl.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TProvideImpl.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TScopeEventsImpl.java b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TScopeEventsImpl.java
index dc968f5..0ccd059 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TScopeEventsImpl.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TScopeEventsImpl.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TServiceImpl.java b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TServiceImpl.java
index 8aa31cb..3e9fa06 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TServiceImpl.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TServiceImpl.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/ddFactoryImpl.java b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/ddFactoryImpl.java
index b1b703e..63bf308 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/ddFactoryImpl.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/ddFactoryImpl.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/ddPackageImpl.java b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/ddPackageImpl.java
index dda9e00..2317be2 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/ddPackageImpl.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/ddPackageImpl.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/util/DDXMLHelperImpl.java b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/util/DDXMLHelperImpl.java
index 3df41c7..f7b4692 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/util/DDXMLHelperImpl.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/util/DDXMLHelperImpl.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/util/ddAdapterFactory.java b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/util/ddAdapterFactory.java
index c25ed0a..a86b027 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/util/ddAdapterFactory.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/util/ddAdapterFactory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/util/ddResourceFactoryImpl.java b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/util/ddResourceFactoryImpl.java
index 10124b5..a88d9ce 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/util/ddResourceFactoryImpl.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/util/ddResourceFactoryImpl.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/util/ddResourceImpl.java b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/util/ddResourceImpl.java
index 54814b1..ed4960f 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/util/ddResourceImpl.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/util/ddResourceImpl.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/util/ddSwitch.java b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/util/ddSwitch.java
index 5971a5d..35cd345 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/util/ddSwitch.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/util/ddSwitch.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/util/ddXMLProcessor.java b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/util/ddXMLProcessor.java
index 944f382..7beddb6 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/util/ddXMLProcessor.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/util/ddXMLProcessor.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.ui/about.html b/plugins/org.eclipse.bpel.apache.ode.deploy.ui/about.html
index 363bc9d..31a983e 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.ui/about.html
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.ui/about.html
@@ -13,8 +13,10 @@
 
 <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>.
+Eclipse Public License 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+>https://www.eclipse.org/legal/epl-2.0/
+>
+>SPDX-License-Identifier: EPL-2.0</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.bpel.apache.ode.deploy.ui/build.properties b/plugins/org.eclipse.bpel.apache.ode.deploy.ui/build.properties
index 5466ba4..fc00de2 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.ui/build.properties
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.ui/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################

 # Copyright (c) 2008, 2012 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 2.0

 # which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0

 #

 # Contributors:

 #     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/Activator.java b/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/Activator.java
index f2e832d..d8c0590 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/Activator.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/Activator.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 IBM Corporation, University of Stuttgart (IAAS) 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/editors/ODEDeployMultiPageEditor.java b/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/editors/ODEDeployMultiPageEditor.java
index a8db7b5..addac45 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/editors/ODEDeployMultiPageEditor.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/editors/ODEDeployMultiPageEditor.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 IBM Corporation, University of Stuttgart (IAAS) 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/editors/ODEDeployMultiPageEditorContributor.java b/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/editors/ODEDeployMultiPageEditorContributor.java
index ee0eb15..f8a49bc 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/editors/ODEDeployMultiPageEditorContributor.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/editors/ODEDeployMultiPageEditorContributor.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 IBM Corporation, University of Stuttgart (IAAS) 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/messages/ODEDeployUI.properties b/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/messages/ODEDeployUI.properties
index 5d0a5ac..8694ba8 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/messages/ODEDeployUI.properties
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/messages/ODEDeployUI.properties
@@ -1,9 +1,11 @@
 ###############################################################################

 # Copyright (c) 2008, 2012 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 2.0

 # which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0

 #

 # Contributors:

 #     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/messages/ODEDeployUIMessages.java b/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/messages/ODEDeployUIMessages.java
index cfd5d32..957386d 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/messages/ODEDeployUIMessages.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/messages/ODEDeployUIMessages.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/pages/ProcessPage.java b/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/pages/ProcessPage.java
index f38e9a7..e5bb980 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/pages/ProcessPage.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/pages/ProcessPage.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 IBM Corporation, University of Stuttgart (IAAS) 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/pages/ServiceCellEditor.java b/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/pages/ServiceCellEditor.java
index 9fb8dcf..8f29fbf 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/pages/ServiceCellEditor.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/pages/ServiceCellEditor.java
@@ -3,9 +3,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 IBM Corporation, University of Stuttgart (IAAS) 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util/DeployResourceSetImpl.java b/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util/DeployResourceSetImpl.java
index 0324a7d..95eed34 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util/DeployResourceSetImpl.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util/DeployResourceSetImpl.java
@@ -1,9 +1,11 @@
 /*

  * Copyright (c) 2010, 2012 JBoss, Inc. 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  */

 package org.eclipse.bpel.apache.ode.deploy.ui.util;

 

diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util/DeployUtils.java b/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util/DeployUtils.java
index 80b0718..61b2a89 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util/DeployUtils.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util/DeployUtils.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 IBM Corporation, University of Stuttgart (IAAS) 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util/InterfaceTableListener.java b/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util/InterfaceTableListener.java
index be722d9..3fe4e23 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util/InterfaceTableListener.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util/InterfaceTableListener.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 IBM Corporation, University of Stuttgart (IAAS) 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/wizards/NewODEDeployWizard.java b/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/wizards/NewODEDeployWizard.java
index e3e9113..7e0d774 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/wizards/NewODEDeployWizard.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/wizards/NewODEDeployWizard.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/wizards/ODEDeployWizardPage.java b/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/wizards/ODEDeployWizardPage.java
index 73c8f43..6f17815 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/wizards/ODEDeployWizardPage.java
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/wizards/ODEDeployWizardPage.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.apache.ode.runtime/about.html b/plugins/org.eclipse.bpel.apache.ode.runtime/about.html
index 363bc9d..31a983e 100644
--- a/plugins/org.eclipse.bpel.apache.ode.runtime/about.html
+++ b/plugins/org.eclipse.bpel.apache.ode.runtime/about.html
@@ -13,8 +13,10 @@
 
 <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>.
+Eclipse Public License 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+>https://www.eclipse.org/legal/epl-2.0/
+>
+>SPDX-License-Identifier: EPL-2.0</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.bpel.apache.ode.runtime/build.properties b/plugins/org.eclipse.bpel.apache.ode.runtime/build.properties
index aa6bb38..515fd0e 100644
--- a/plugins/org.eclipse.bpel.apache.ode.runtime/build.properties
+++ b/plugins/org.eclipse.bpel.apache.ode.runtime/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################

 # Copyright (c) 2008, 2012 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 2.0

 # which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0

 #

 # Contributors:

 #     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.apache.ode.runtime/plugin.properties b/plugins/org.eclipse.bpel.apache.ode.runtime/plugin.properties
index 74cd83a..0ccd390 100644
--- a/plugins/org.eclipse.bpel.apache.ode.runtime/plugin.properties
+++ b/plugins/org.eclipse.bpel.apache.ode.runtime/plugin.properties
@@ -1,9 +1,11 @@
 ###############################################################################

 # Copyright (c) 2008, 2012 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 2.0

 # which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0

 #

 # Contributors:

 #     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.apache.ode.runtime/src/org/eclipse/bpel/apache/ode/runtime/OdeBPELPublisher.java b/plugins/org.eclipse.bpel.apache.ode.runtime/src/org/eclipse/bpel/apache/ode/runtime/OdeBPELPublisher.java
index e600baa..2497f76 100644
--- a/plugins/org.eclipse.bpel.apache.ode.runtime/src/org/eclipse/bpel/apache/ode/runtime/OdeBPELPublisher.java
+++ b/plugins/org.eclipse.bpel.apache.ode.runtime/src/org/eclipse/bpel/apache/ode/runtime/OdeBPELPublisher.java
@@ -3,9 +3,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2012 IBM Corporation, University of Stuttgart (IAAS) 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.apache.ode.runtime/src/org/eclipse/bpel/apache/ode/runtime/OdePlugin.java b/plugins/org.eclipse.bpel.apache.ode.runtime/src/org/eclipse/bpel/apache/ode/runtime/OdePlugin.java
index 8d8f31e..510a5e1 100644
--- a/plugins/org.eclipse.bpel.apache.ode.runtime/src/org/eclipse/bpel/apache/ode/runtime/OdePlugin.java
+++ b/plugins/org.eclipse.bpel.apache.ode.runtime/src/org/eclipse/bpel/apache/ode/runtime/OdePlugin.java
@@ -3,9 +3,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 IBM Corporation, University of Stuttgart (IAAS) 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.apache.ode.runtime/src/org/eclipse/bpel/apache/ode/runtime/OdeServerRuntime.java b/plugins/org.eclipse.bpel.apache.ode.runtime/src/org/eclipse/bpel/apache/ode/runtime/OdeServerRuntime.java
index 2ae9009..1624288 100644
--- a/plugins/org.eclipse.bpel.apache.ode.runtime/src/org/eclipse/bpel/apache/ode/runtime/OdeServerRuntime.java
+++ b/plugins/org.eclipse.bpel.apache.ode.runtime/src/org/eclipse/bpel/apache/ode/runtime/OdeServerRuntime.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.cheatsheet/about.html b/plugins/org.eclipse.bpel.cheatsheet/about.html
index 363bc9d..31a983e 100644
--- a/plugins/org.eclipse.bpel.cheatsheet/about.html
+++ b/plugins/org.eclipse.bpel.cheatsheet/about.html
@@ -13,8 +13,10 @@
 
 <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>.
+Eclipse Public License 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+>https://www.eclipse.org/legal/epl-2.0/
+>
+>SPDX-License-Identifier: EPL-2.0</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.bpel.cheatsheet/build.properties b/plugins/org.eclipse.bpel.cheatsheet/build.properties
index 5db5838..d743daa 100644
--- a/plugins/org.eclipse.bpel.cheatsheet/build.properties
+++ b/plugins/org.eclipse.bpel.cheatsheet/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################

 # Copyright (c) 2008, 2012 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 2.0

 # which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0

 #

 # Contributors:

 #     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.cheatsheet/plugin.properties b/plugins/org.eclipse.bpel.cheatsheet/plugin.properties
index a8dba7c..f6d4259 100644
--- a/plugins/org.eclipse.bpel.cheatsheet/plugin.properties
+++ b/plugins/org.eclipse.bpel.cheatsheet/plugin.properties
@@ -1,9 +1,11 @@
 ###############################################################################

 # Copyright (c) 2010, 2012 Red Hat, Inc. 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 2.0

 # which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0

 # 

 # Contributors:

 #     JBoss by Red Hat - Initial implementation.

diff --git a/plugins/org.eclipse.bpel.cheatsheet/src/org/eclipse/bpel/cheatsheet/Activator.java b/plugins/org.eclipse.bpel.cheatsheet/src/org/eclipse/bpel/cheatsheet/Activator.java
index ac707e0..da3eef0 100644
--- a/plugins/org.eclipse.bpel.cheatsheet/src/org/eclipse/bpel/cheatsheet/Activator.java
+++ b/plugins/org.eclipse.bpel.cheatsheet/src/org/eclipse/bpel/cheatsheet/Activator.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.common.model/about.html b/plugins/org.eclipse.bpel.common.model/about.html
index 363bc9d..31a983e 100644
--- a/plugins/org.eclipse.bpel.common.model/about.html
+++ b/plugins/org.eclipse.bpel.common.model/about.html
@@ -13,8 +13,10 @@
 
 <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>.
+Eclipse Public License 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+>https://www.eclipse.org/legal/epl-2.0/
+>
+>SPDX-License-Identifier: EPL-2.0</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.bpel.common.model/build.properties b/plugins/org.eclipse.bpel.common.model/build.properties
index a118022..bfdeb7e 100644
--- a/plugins/org.eclipse.bpel.common.model/build.properties
+++ b/plugins/org.eclipse.bpel.common.model/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2010 JBoss by Red Hat 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 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.model/plugin.properties b/plugins/org.eclipse.bpel.common.model/plugin.properties
index dff420d..a54af88 100644
--- a/plugins/org.eclipse.bpel.common.model/plugin.properties
+++ b/plugins/org.eclipse.bpel.common.model/plugin.properties
@@ -1,9 +1,11 @@
 ###############################################################################

 # Copyright (c) 2005 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 2.0

 # which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0

 #

 # Contributors:

 #     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/BPELResourceSet.java b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/BPELResourceSet.java
index 4f5a317..3d452f6 100644
--- a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/BPELResourceSet.java
+++ b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/BPELResourceSet.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 Oracle 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Oracle Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/Activator.java b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/Activator.java
index cd577ec..6c9aec9 100644
--- a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/Activator.java
+++ b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/Activator.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/Extension.java b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/Extension.java
index 738d5e7..61bb8a2 100644
--- a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/Extension.java
+++ b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/Extension.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/ExtensionMap.java b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/ExtensionMap.java
index 76c6a28..7999016 100644
--- a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/ExtensionMap.java
+++ b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/ExtensionMap.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/ExtensionmodelFactory.java b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/ExtensionmodelFactory.java
index 2ca1fcf..90f570c 100644
--- a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/ExtensionmodelFactory.java
+++ b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/ExtensionmodelFactory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/ExtensionmodelPackage.java b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/ExtensionmodelPackage.java
index 4ab7cb6..6e4ad40 100644
--- a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/ExtensionmodelPackage.java
+++ b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/ExtensionmodelPackage.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/adapters/ExtendedObjectAdapter.java b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/adapters/ExtendedObjectAdapter.java
index 3e0a5f4..bbadbcf 100644
--- a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/adapters/ExtendedObjectAdapter.java
+++ b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/adapters/ExtendedObjectAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/adapters/ExtendedObjectUserAdapter.java b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/adapters/ExtendedObjectUserAdapter.java
index 00f133a..539b5af 100644
--- a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/adapters/ExtendedObjectUserAdapter.java
+++ b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/adapters/ExtendedObjectUserAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/adapters/impl/ExtendedObjectAdapterImpl.java b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/adapters/impl/ExtendedObjectAdapterImpl.java
index f7be6e8..ce52b66 100644
--- a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/adapters/impl/ExtendedObjectAdapterImpl.java
+++ b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/adapters/impl/ExtendedObjectAdapterImpl.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/adapters/impl/ExtendedObjectUserAdapterImpl.java b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/adapters/impl/ExtendedObjectUserAdapterImpl.java
index 15316c1..b6377da 100644
--- a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/adapters/impl/ExtendedObjectUserAdapterImpl.java
+++ b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/adapters/impl/ExtendedObjectUserAdapterImpl.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/adapters/impl/ExtensionAdapterImpl.java b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/adapters/impl/ExtensionAdapterImpl.java
index 41c80c4..b7f4a2d 100644
--- a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/adapters/impl/ExtensionAdapterImpl.java
+++ b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/adapters/impl/ExtensionAdapterImpl.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/adapters/impl/ExtensionMapAdapterImpl.java b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/adapters/impl/ExtensionMapAdapterImpl.java
index 0c72daf..bce3cc9 100644
--- a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/adapters/impl/ExtensionMapAdapterImpl.java
+++ b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/adapters/impl/ExtensionMapAdapterImpl.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/impl/ExtensionImpl.java b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/impl/ExtensionImpl.java
index f40222f..3e805db 100644
--- a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/impl/ExtensionImpl.java
+++ b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/impl/ExtensionImpl.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/impl/ExtensionMapImpl.java b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/impl/ExtensionMapImpl.java
index d5cafd2..a77904b 100644
--- a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/impl/ExtensionMapImpl.java
+++ b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/impl/ExtensionMapImpl.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/impl/ExtensionmodelFactoryImpl.java b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/impl/ExtensionmodelFactoryImpl.java
index 3df7e14..25aff04 100644
--- a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/impl/ExtensionmodelFactoryImpl.java
+++ b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/impl/ExtensionmodelFactoryImpl.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/impl/ExtensionmodelPackageImpl.java b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/impl/ExtensionmodelPackageImpl.java
index 890125a..933ddcb 100644
--- a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/impl/ExtensionmodelPackageImpl.java
+++ b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/impl/ExtensionmodelPackageImpl.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/notify/ExtensionModelNotification.java b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/notify/ExtensionModelNotification.java
index 43b97a4..e54eb7b 100644
--- a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/notify/ExtensionModelNotification.java
+++ b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/notify/ExtensionModelNotification.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/notify/impl/ExtensionModelNotificationImpl.java b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/notify/impl/ExtensionModelNotificationImpl.java
index 833ff15..ae73553 100644
--- a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/notify/impl/ExtensionModelNotificationImpl.java
+++ b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/notify/impl/ExtensionModelNotificationImpl.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/util/ExtensionmodelAdapterFactory.java b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/util/ExtensionmodelAdapterFactory.java
index 51da9f8..cd372c3 100644
--- a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/util/ExtensionmodelAdapterFactory.java
+++ b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/util/ExtensionmodelAdapterFactory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/util/ExtensionmodelSwitch.java b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/util/ExtensionmodelSwitch.java
index 2d00691..241cf5f 100644
--- a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/util/ExtensionmodelSwitch.java
+++ b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/common/extension/model/util/ExtensionmodelSwitch.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/fnmeta/ClasspathFunctionRegistryLoader.java b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/fnmeta/ClasspathFunctionRegistryLoader.java
index b68e1fd..03b47df 100644
--- a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/fnmeta/ClasspathFunctionRegistryLoader.java
+++ b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/fnmeta/ClasspathFunctionRegistryLoader.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 Oracle 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Oracle Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/fnmeta/FunctionLibrary.java b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/fnmeta/FunctionLibrary.java
index 19123a9..dcdf0e0 100644
--- a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/fnmeta/FunctionLibrary.java
+++ b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/fnmeta/FunctionLibrary.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 Oracle 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Oracle Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/fnmeta/FunctionRegistry.java b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/fnmeta/FunctionRegistry.java
index 384aad6..c972b41 100644
--- a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/fnmeta/FunctionRegistry.java
+++ b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/fnmeta/FunctionRegistry.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 Oracle 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Oracle Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/fnmeta/IFunctionRegistryLoader.java b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/fnmeta/IFunctionRegistryLoader.java
index 4554c5a..369116d 100644
--- a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/fnmeta/IFunctionRegistryLoader.java
+++ b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/fnmeta/IFunctionRegistryLoader.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 Oracle 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Oracle Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/fnmeta/model/proxy/ArgumentProxy.java b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/fnmeta/model/proxy/ArgumentProxy.java
index 84e3fe7..78c5ee8 100644
--- a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/fnmeta/model/proxy/ArgumentProxy.java
+++ b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/fnmeta/model/proxy/ArgumentProxy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 Oracle 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Oracle Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/fnmeta/model/proxy/AssistantProxy.java b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/fnmeta/model/proxy/AssistantProxy.java
index e42703f..74d35df 100644
--- a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/fnmeta/model/proxy/AssistantProxy.java
+++ b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/fnmeta/model/proxy/AssistantProxy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 Oracle 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Oracle Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/fnmeta/model/util/FMReader.java b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/fnmeta/model/util/FMReader.java
index faa0e1e..4e3122f 100644
--- a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/fnmeta/model/util/FMReader.java
+++ b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/fnmeta/model/util/FMReader.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 Oracle 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Oracle Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/names/NCNameWordDetector.java b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/names/NCNameWordDetector.java
index 37ed5bf..b3df539 100644
--- a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/names/NCNameWordDetector.java
+++ b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/names/NCNameWordDetector.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 Oracle 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Oracle Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/names/QNameWordDetector.java b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/names/QNameWordDetector.java
index 810ca95..c101fb1 100644
--- a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/names/QNameWordDetector.java
+++ b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/names/QNameWordDetector.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 Oracle 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Oracle Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/names/VariableNameWordDetector.java b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/names/VariableNameWordDetector.java
index 620bc0e..fdd1023 100644
--- a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/names/VariableNameWordDetector.java
+++ b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/names/VariableNameWordDetector.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 Oracle 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Oracle Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/names/XMLNameWordDetector.java b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/names/XMLNameWordDetector.java
index fe37024..3c32a35 100644
--- a/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/names/XMLNameWordDetector.java
+++ b/plugins/org.eclipse.bpel.common.model/src/org/eclipse/bpel/names/XMLNameWordDetector.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 Oracle 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Oracle Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/about.html b/plugins/org.eclipse.bpel.common.ui/about.html
index 363bc9d..31a983e 100644
--- a/plugins/org.eclipse.bpel.common.ui/about.html
+++ b/plugins/org.eclipse.bpel.common.ui/about.html
@@ -13,8 +13,10 @@
 
 <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>.
+Eclipse Public License 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+>https://www.eclipse.org/legal/epl-2.0/
+>
+>SPDX-License-Identifier: EPL-2.0</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.bpel.common.ui/build.properties b/plugins/org.eclipse.bpel.common.ui/build.properties
index 2cc344d..16ff32d 100644
--- a/plugins/org.eclipse.bpel.common.ui/build.properties
+++ b/plugins/org.eclipse.bpel.common.ui/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005 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 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/ColorUtils.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/ColorUtils.java
index 0c65bf0..2fd7687 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/ColorUtils.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/ColorUtils.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/CommonUIPlugin.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/CommonUIPlugin.java
index f3dddcb..a2825c0 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/CommonUIPlugin.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/CommonUIPlugin.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/ICommonUIConstants.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/ICommonUIConstants.java
index c8b29b9..cca351c 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/ICommonUIConstants.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/ICommonUIConstants.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/IUtilsHelpContextIDs.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/IUtilsHelpContextIDs.java
index 40efdc3..75ec276 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/IUtilsHelpContextIDs.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/IUtilsHelpContextIDs.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/ImageUtils.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/ImageUtils.java
index 83b85c4..3c72e0d 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/ImageUtils.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/ImageUtils.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/Messages.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/Messages.java
index bd01365..0dafaa5 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/Messages.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/Messages.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/Policy.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/Policy.java
index d91910c..a61e593 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/Policy.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/Policy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/ResourceMarkerDecorator.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/ResourceMarkerDecorator.java
index 288e99c..e52a9b3 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/ResourceMarkerDecorator.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/ResourceMarkerDecorator.java
@@ -1,9 +1,11 @@
 /*
  * Copyright (c) 2010 JBoss, Inc. 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.bpel.common.ui;
 
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/Utils.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/Utils.java
index 15f3777..b0b7189 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/Utils.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/Utils.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/assist/FieldAssistAdapter.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/assist/FieldAssistAdapter.java
index 8b2ec51..36cd14e 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/assist/FieldAssistAdapter.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/assist/FieldAssistAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 Oracle 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Oracle Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/calendar/CalendarControl.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/calendar/CalendarControl.java
index e8f5800..303ce89 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/calendar/CalendarControl.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/calendar/CalendarControl.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/calendar/CalendarPopup.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/calendar/CalendarPopup.java
index 3dd1b63..fe33a6b 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/calendar/CalendarPopup.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/calendar/CalendarPopup.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/calendar/DatePicker.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/calendar/DatePicker.java
index 73a0082..9ee237a 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/calendar/DatePicker.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/calendar/DatePicker.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/command/EditModelCommandFramework.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/command/EditModelCommandFramework.java
index acfd36b..53f5434 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/command/EditModelCommandFramework.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/command/EditModelCommandFramework.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/command/ICommandFramework.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/command/ICommandFramework.java
index 89760a4..54e2e6e 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/command/ICommandFramework.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/command/ICommandFramework.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/decorator/DecorationLayout.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/decorator/DecorationLayout.java
index 8e3b625..91a5a05 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/decorator/DecorationLayout.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/decorator/DecorationLayout.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/decorator/EditPartMarkerDecorator.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/decorator/EditPartMarkerDecorator.java
index a779a22..2507dc3 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/decorator/EditPartMarkerDecorator.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/decorator/EditPartMarkerDecorator.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/decorator/IMarkerConstants.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/decorator/IMarkerConstants.java
index 5fbe2fa..7710458 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/decorator/IMarkerConstants.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/decorator/IMarkerConstants.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/decorator/LinkEditPartMarkerDecorator.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/decorator/LinkEditPartMarkerDecorator.java
index 553e391..c9773a0 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/decorator/LinkEditPartMarkerDecorator.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/decorator/LinkEditPartMarkerDecorator.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/ButtonIValue.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/ButtonIValue.java
index 6a6887f..4b0bc5f 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/ButtonIValue.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/ButtonIValue.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 Oracle 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Oracle Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/ChangeHelper.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/ChangeHelper.java
index 6c21b13..bb9f742 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/ChangeHelper.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/ChangeHelper.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/DelegateIValue.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/DelegateIValue.java
index 6a1968f..85a6154 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/DelegateIValue.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/DelegateIValue.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 Oracle 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Oracle Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/FocusContext.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/FocusContext.java
index b7bdaff..271a01a 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/FocusContext.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/FocusContext.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 Oracle 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Oracle Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/IDetailsAreaConstants.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/IDetailsAreaConstants.java
index bb39bfc..3b50cc4 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/IDetailsAreaConstants.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/IDetailsAreaConstants.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/IDetailsColors.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/IDetailsColors.java
index 775be1b..8bff8de 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/IDetailsColors.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/IDetailsColors.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/IOngoingChange.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/IOngoingChange.java
index 7d0647a..9866ac0 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/IOngoingChange.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/IOngoingChange.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/IValue.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/IValue.java
index 9797493..c7751e7 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/IValue.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/IValue.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 Oracle 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Oracle Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/RadioButtonIValue.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/RadioButtonIValue.java
index 1b07b99..0643a5b 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/RadioButtonIValue.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/RadioButtonIValue.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 Oracle 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Oracle Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/TextIValue.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/TextIValue.java
index 724905e..68465e7 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/TextIValue.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/TextIValue.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 Oracle 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Oracle Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/ViewerIValue.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/ViewerIValue.java
index 2e6896a..669a627 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/ViewerIValue.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/ViewerIValue.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 Oracle 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Oracle Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/viewers/CComboViewer.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/viewers/CComboViewer.java
index 6407e85..0404a20 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/viewers/CComboViewer.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/viewers/CComboViewer.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/viewers/ComboViewer.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/viewers/ComboViewer.java
index 70ec734..e52b869 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/viewers/ComboViewer.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/viewers/ComboViewer.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/viewers/ComboViewerCellEditor.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/viewers/ComboViewerCellEditor.java
index 8e4031a..838fcbf 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/viewers/ComboViewerCellEditor.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/viewers/ComboViewerCellEditor.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/widgets/NoBorderButton.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/widgets/NoBorderButton.java
index 71b7376..a312387 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/widgets/NoBorderButton.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/widgets/NoBorderButton.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/widgets/StatusLabel2.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/widgets/StatusLabel2.java
index aba5167..85ed4d5 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/widgets/StatusLabel2.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/details/widgets/StatusLabel2.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/AbstractEditModelCommand.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/AbstractEditModelCommand.java
index 30bc307..7f2036d 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/AbstractEditModelCommand.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/AbstractEditModelCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/EditModel.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/EditModel.java
index 1686b38..dc241e7 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/EditModel.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/EditModel.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/EditModelClient.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/EditModelClient.java
index f12da56..ab72193 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/EditModelClient.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/EditModelClient.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/EditModelCommandStack.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/EditModelCommandStack.java
index 4e65f0a..5a62299 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/EditModelCommandStack.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/EditModelCommandStack.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/IEditModelCommand.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/IEditModelCommand.java
index 40545e2..9b7138d 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/IEditModelCommand.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/IEditModelCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/IEditModelListener.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/IEditModelListener.java
index 05b4890..0262443 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/IEditModelListener.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/IEditModelListener.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/IResourceSetProvider.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/IResourceSetProvider.java
index 1b2344e..6a8672a 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/IResourceSetProvider.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/IResourceSetProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 Oracle 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Oracle Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/PlaceHolderCommand.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/PlaceHolderCommand.java
index 8985b74..03b6c3a 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/PlaceHolderCommand.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/PlaceHolderCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/ResourceInfo.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/ResourceInfo.java
index 7bd99a0..7f91a73 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/ResourceInfo.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/ResourceInfo.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/ResourceListener.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/ResourceListener.java
index bfe4aee..3753a30 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/ResourceListener.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/ResourceListener.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/SynchronizationHandler.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/SynchronizationHandler.java
index 9319b39..aed4645 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/SynchronizationHandler.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/SynchronizationHandler.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/SynchronizationManager.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/SynchronizationManager.java
index 7f7667c..e5051a2 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/SynchronizationManager.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/editmodel/SynchronizationManager.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/figures/InsetRelativeHandleLocator.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/figures/InsetRelativeHandleLocator.java
index 6a8b081..6dd4339 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/figures/InsetRelativeHandleLocator.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/figures/InsetRelativeHandleLocator.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/figures/InsetResizeHandle.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/figures/InsetResizeHandle.java
index e66f5af..04aff19 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/figures/InsetResizeHandle.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/figures/InsetResizeHandle.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/flatui/BorderData.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/flatui/BorderData.java
index 8f01824..5bc1b98 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/flatui/BorderData.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/flatui/BorderData.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/flatui/BorderLayout.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/flatui/BorderLayout.java
index bbf037a..92075b4 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/flatui/BorderLayout.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/flatui/BorderLayout.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/flatui/FlatFormAttachment.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/flatui/FlatFormAttachment.java
index ac8d5e3..628c93f 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/flatui/FlatFormAttachment.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/flatui/FlatFormAttachment.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/flatui/FlatFormData.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/flatui/FlatFormData.java
index 47898ac..8b5c775 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/flatui/FlatFormData.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/flatui/FlatFormData.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/flatui/FlatFormLayout.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/flatui/FlatFormLayout.java
index 73a76d3..cb7b829 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/flatui/FlatFormLayout.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/flatui/FlatFormLayout.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/flatui/IBorderConstants.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/flatui/IBorderConstants.java
index c3a413e..3808acf 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/flatui/IBorderConstants.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/flatui/IBorderConstants.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/layouts/AlignedFlowLayout.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/layouts/AlignedFlowLayout.java
index 539c202..c863d6f 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/layouts/AlignedFlowLayout.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/layouts/AlignedFlowLayout.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/layouts/FillParentLayout.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/layouts/FillParentLayout.java
index bf9b2a7..e0ce7b1 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/layouts/FillParentLayout.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/layouts/FillParentLayout.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/markers/IModelMarkerConstants.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/markers/IModelMarkerConstants.java
index 4feecf4..48dcb0f 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/markers/IModelMarkerConstants.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/markers/IModelMarkerConstants.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/markers/IModelMarkerContentProvider.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/markers/IModelMarkerContentProvider.java
index d28621b..a8574bf 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/markers/IModelMarkerContentProvider.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/markers/IModelMarkerContentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/markers/ModelMarkerUtil.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/markers/ModelMarkerUtil.java
index b74ddf4..5c66de6 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/markers/ModelMarkerUtil.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/markers/ModelMarkerUtil.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/messages.properties b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/messages.properties
index 18f2936..f483d23 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/messages.properties
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/messages.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005 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 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/palette/GraphicalEditorWithPalette.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/palette/GraphicalEditorWithPalette.java
index 45613a4..b63408d 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/palette/GraphicalEditorWithPalette.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/palette/GraphicalEditorWithPalette.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/palette/IOrderedPaletteEntry.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/palette/IOrderedPaletteEntry.java
index 605e4ad..101d1d2 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/palette/IOrderedPaletteEntry.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/palette/IOrderedPaletteEntry.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 Oracle 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Oracle Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/palette/IPaletteProvider.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/palette/IPaletteProvider.java
index 56deab0..7375bc2 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/palette/IPaletteProvider.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/palette/IPaletteProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 Oracle 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Oracle Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/palette/OrderedPaletteGroup.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/palette/OrderedPaletteGroup.java
index d140c5b..5b35dca 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/palette/OrderedPaletteGroup.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/palette/OrderedPaletteGroup.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 Oracle 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Oracle Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/palette/PaletteCategory.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/palette/PaletteCategory.java
index 501a25b..b5e340a 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/palette/PaletteCategory.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/palette/PaletteCategory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/AdaptingSelectionProvider.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/AdaptingSelectionProvider.java
index e12a69c..b2c39c9 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/AdaptingSelectionProvider.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/AdaptingSelectionProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/AddChildInTrayAction.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/AddChildInTrayAction.java
index 3493575..151a49c 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/AddChildInTrayAction.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/AddChildInTrayAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/GraphicalEditorWithPaletteAndTray.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/GraphicalEditorWithPaletteAndTray.java
index 156e6b0..1894838 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/GraphicalEditorWithPaletteAndTray.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/GraphicalEditorWithPaletteAndTray.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/MainTrayEditPart.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/MainTrayEditPart.java
index ee0100c..4db8a41 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/MainTrayEditPart.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/MainTrayEditPart.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/MultiViewerSelectionProvider.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/MultiViewerSelectionProvider.java
index 5ec55d0..b5cb8a6 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/MultiViewerSelectionProvider.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/MultiViewerSelectionProvider.java
@@ -1,7 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
+ * made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is
+t https://www.eclipse.org/legal/epl-2.0/
+t
+t SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: IBM Corporation - initial API and implementation
  *******************************************************************************/
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/SelectionBorderFigure.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/SelectionBorderFigure.java
index 6b35632..3317c11 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/SelectionBorderFigure.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/SelectionBorderFigure.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayAccessibleEditPart.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayAccessibleEditPart.java
index 3ad9635..d2b7b32 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayAccessibleEditPart.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayAccessibleEditPart.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayCategoryEditPart.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayCategoryEditPart.java
index 9b13081..5c06051 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayCategoryEditPart.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayCategoryEditPart.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayCategoryEntryEditPart.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayCategoryEntryEditPart.java
index b3abbc5..8c6af4b 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayCategoryEntryEditPart.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayCategoryEntryEditPart.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayCategoryEntryEditPartDirectEditManager.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayCategoryEntryEditPartDirectEditManager.java
index 2510624..a8967a1 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayCategoryEntryEditPartDirectEditManager.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayCategoryEntryEditPartDirectEditManager.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayCategoryEntryFigure.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayCategoryEntryFigure.java
index b76a95e..a2177c2 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayCategoryEntryFigure.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayCategoryEntryFigure.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayComposite.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayComposite.java
index 512738c..e62b7ca 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayComposite.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayComposite.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayContainerEditPart.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayContainerEditPart.java
index 5dc18cd..479999c 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayContainerEditPart.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayContainerEditPart.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayEditPart.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayEditPart.java
index c553e67..ac24d95 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayEditPart.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayEditPart.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayKeyHandler.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayKeyHandler.java
index 0d756d6..8a29ce7 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayKeyHandler.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayKeyHandler.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayMarkerDecorator.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayMarkerDecorator.java
index 14cad2d..75d5f08 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayMarkerDecorator.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayMarkerDecorator.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TraySash.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TraySash.java
index 341fcaf..0856739 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TraySash.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TraySash.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayScrollBar.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayScrollBar.java
index 37bfbf4..ea0e847 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayScrollBar.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayScrollBar.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayScrollPaneLayout.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayScrollPaneLayout.java
index ca0b31b..9e3bdc3 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayScrollPaneLayout.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TrayScrollPaneLayout.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TraySelectionEditPolicy.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TraySelectionEditPolicy.java
index 83f6b95..7af7a3a 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TraySelectionEditPolicy.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TraySelectionEditPolicy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TraySelectionHandle.java b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TraySelectionHandle.java
index 2715ba3..81ee8e3 100644
--- a/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TraySelectionHandle.java
+++ b/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/TraySelectionHandle.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.common.wsdl/about.html b/plugins/org.eclipse.bpel.common.wsdl/about.html
index 363bc9d..31a983e 100644
--- a/plugins/org.eclipse.bpel.common.wsdl/about.html
+++ b/plugins/org.eclipse.bpel.common.wsdl/about.html
@@ -13,8 +13,10 @@
 
 <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>.
+Eclipse Public License 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+>https://www.eclipse.org/legal/epl-2.0/
+>
+>SPDX-License-Identifier: EPL-2.0</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.bpel.common.wsdl/plugin.properties b/plugins/org.eclipse.bpel.common.wsdl/plugin.properties
index 0cc2131..ef52839 100644
--- a/plugins/org.eclipse.bpel.common.wsdl/plugin.properties
+++ b/plugins/org.eclipse.bpel.common.wsdl/plugin.properties
@@ -1,9 +1,11 @@
 ###############################################################################

 # Copyright (c) 2010, 2012 Red Hat, Inc. 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 2.0

 # which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0

 # 

 # Contributors:

 #     JBoss by Red Hat - Initial implementation.

diff --git a/plugins/org.eclipse.bpel.common.wsdl/src/org/eclipse/bpel/common/wsdl/importhelpers/WsdlImportBean.java b/plugins/org.eclipse.bpel.common.wsdl/src/org/eclipse/bpel/common/wsdl/importhelpers/WsdlImportBean.java
index 0f1dba2..6b14a97 100644
--- a/plugins/org.eclipse.bpel.common.wsdl/src/org/eclipse/bpel/common/wsdl/importhelpers/WsdlImportBean.java
+++ b/plugins/org.eclipse.bpel.common.wsdl/src/org/eclipse/bpel/common/wsdl/importhelpers/WsdlImportBean.java
@@ -1,9 +1,11 @@
 /******************************************************************************

  * Copyright (c) 2011, EBM WebSourcing

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     EBM WebSourcing - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.common.wsdl/src/org/eclipse/bpel/common/wsdl/parsers/WsdlParser.java b/plugins/org.eclipse.bpel.common.wsdl/src/org/eclipse/bpel/common/wsdl/parsers/WsdlParser.java
index 6cf0f8d..7becd32 100644
--- a/plugins/org.eclipse.bpel.common.wsdl/src/org/eclipse/bpel/common/wsdl/parsers/WsdlParser.java
+++ b/plugins/org.eclipse.bpel.common.wsdl/src/org/eclipse/bpel/common/wsdl/parsers/WsdlParser.java
@@ -1,9 +1,11 @@
 /******************************************************************************

  * Copyright (c) 2011, EBM WebSourcing

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     EBM WebSourcing - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.common.wsdl/src/org/eclipse/bpel/common/wsdl/parsers/XmlSchemaParser.java b/plugins/org.eclipse.bpel.common.wsdl/src/org/eclipse/bpel/common/wsdl/parsers/XmlSchemaParser.java
index 6df8f93..dfe68aa 100644
--- a/plugins/org.eclipse.bpel.common.wsdl/src/org/eclipse/bpel/common/wsdl/parsers/XmlSchemaParser.java
+++ b/plugins/org.eclipse.bpel.common.wsdl/src/org/eclipse/bpel/common/wsdl/parsers/XmlSchemaParser.java
@@ -1,9 +1,11 @@
 /******************************************************************************

  * Copyright (c) 2011, EBM WebSourcing

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     EBM WebSourcing - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.compare.ui/about.html b/plugins/org.eclipse.bpel.compare.ui/about.html
index 363bc9d..31a983e 100644
--- a/plugins/org.eclipse.bpel.compare.ui/about.html
+++ b/plugins/org.eclipse.bpel.compare.ui/about.html
@@ -13,8 +13,10 @@
 
 <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>.
+Eclipse Public License 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+>https://www.eclipse.org/legal/epl-2.0/
+>
+>SPDX-License-Identifier: EPL-2.0</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.bpel.compare.ui/build.properties b/plugins/org.eclipse.bpel.compare.ui/build.properties
index 2cb6e61..9e5f7c1 100644
--- a/plugins/org.eclipse.bpel.compare.ui/build.properties
+++ b/plugins/org.eclipse.bpel.compare.ui/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################

 # Copyright (c) 2008, 2012 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 2.0

 # which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0

 #

 # Contributors:

 #     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.compare.ui/plugin.properties b/plugins/org.eclipse.bpel.compare.ui/plugin.properties
index 05180c3..3ab05aa 100644
--- a/plugins/org.eclipse.bpel.compare.ui/plugin.properties
+++ b/plugins/org.eclipse.bpel.compare.ui/plugin.properties
@@ -1,9 +1,11 @@
 ###############################################################################

 # Copyright (c) 2010, 2012 Red Hat, Inc. 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 2.0

 # which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0

 # 

 # Contributors:

 #     JBoss by Red Hat - Initial implementation.

diff --git a/plugins/org.eclipse.bpel.compare.ui/src/org/eclipse/bpel/compare/ui/Activator.java b/plugins/org.eclipse.bpel.compare.ui/src/org/eclipse/bpel/compare/ui/Activator.java
index 5d96bb0..219140a 100644
--- a/plugins/org.eclipse.bpel.compare.ui/src/org/eclipse/bpel/compare/ui/Activator.java
+++ b/plugins/org.eclipse.bpel.compare.ui/src/org/eclipse/bpel/compare/ui/Activator.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.compare.ui/src/org/eclipse/bpel/compare/ui/annotation/Annotation.java b/plugins/org.eclipse.bpel.compare.ui/src/org/eclipse/bpel/compare/ui/annotation/Annotation.java
index 116d412..445c317 100644
--- a/plugins/org.eclipse.bpel.compare.ui/src/org/eclipse/bpel/compare/ui/annotation/Annotation.java
+++ b/plugins/org.eclipse.bpel.compare.ui/src/org/eclipse/bpel/compare/ui/annotation/Annotation.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.compare.ui/src/org/eclipse/bpel/compare/ui/annotation/AnnotationSwitch.java b/plugins/org.eclipse.bpel.compare.ui/src/org/eclipse/bpel/compare/ui/annotation/AnnotationSwitch.java
index de5aa18..a77891c 100644
--- a/plugins/org.eclipse.bpel.compare.ui/src/org/eclipse/bpel/compare/ui/annotation/AnnotationSwitch.java
+++ b/plugins/org.eclipse.bpel.compare.ui/src/org/eclipse/bpel/compare/ui/annotation/AnnotationSwitch.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.compare.ui/src/org/eclipse/bpel/compare/ui/annotation/AnnotationsStore.java b/plugins/org.eclipse.bpel.compare.ui/src/org/eclipse/bpel/compare/ui/annotation/AnnotationsStore.java
index 0b2bfe1..8b21a31 100644
--- a/plugins/org.eclipse.bpel.compare.ui/src/org/eclipse/bpel/compare/ui/annotation/AnnotationsStore.java
+++ b/plugins/org.eclipse.bpel.compare.ui/src/org/eclipse/bpel/compare/ui/annotation/AnnotationsStore.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.compare.ui/src/org/eclipse/bpel/compare/ui/gef/bpel/BPELCompareEditPartFactory.java b/plugins/org.eclipse.bpel.compare.ui/src/org/eclipse/bpel/compare/ui/gef/bpel/BPELCompareEditPartFactory.java
index 92eff11..ab7aa72 100644
--- a/plugins/org.eclipse.bpel.compare.ui/src/org/eclipse/bpel/compare/ui/gef/bpel/BPELCompareEditPartFactory.java
+++ b/plugins/org.eclipse.bpel.compare.ui/src/org/eclipse/bpel/compare/ui/gef/bpel/BPELCompareEditPartFactory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.compare.ui/src/org/eclipse/bpel/compare/ui/gef/bpel/BPELCompareEditPolicy.java b/plugins/org.eclipse.bpel.compare.ui/src/org/eclipse/bpel/compare/ui/gef/bpel/BPELCompareEditPolicy.java
index e63ec9a..0eb2568 100644
--- a/plugins/org.eclipse.bpel.compare.ui/src/org/eclipse/bpel/compare/ui/gef/bpel/BPELCompareEditPolicy.java
+++ b/plugins/org.eclipse.bpel.compare.ui/src/org/eclipse/bpel/compare/ui/gef/bpel/BPELCompareEditPolicy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.compare.ui/src/org/eclipse/bpel/compare/ui/gef/bpel/BPELContentMergeViewer.java b/plugins/org.eclipse.bpel.compare.ui/src/org/eclipse/bpel/compare/ui/gef/bpel/BPELContentMergeViewer.java
index bf15d25..bbdfda0 100644
--- a/plugins/org.eclipse.bpel.compare.ui/src/org/eclipse/bpel/compare/ui/gef/bpel/BPELContentMergeViewer.java
+++ b/plugins/org.eclipse.bpel.compare.ui/src/org/eclipse/bpel/compare/ui/gef/bpel/BPELContentMergeViewer.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.compare.ui/src/org/eclipse/bpel/compare/ui/gef/bpel/BPELContentMergeViewerCreator.java b/plugins/org.eclipse.bpel.compare.ui/src/org/eclipse/bpel/compare/ui/gef/bpel/BPELContentMergeViewerCreator.java
index 5d4a67d..dd2e3ab 100644
--- a/plugins/org.eclipse.bpel.compare.ui/src/org/eclipse/bpel/compare/ui/gef/bpel/BPELContentMergeViewerCreator.java
+++ b/plugins/org.eclipse.bpel.compare.ui/src/org/eclipse/bpel/compare/ui/gef/bpel/BPELContentMergeViewerCreator.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2009, 2012 Tobias Jaehnel.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  *   Tobias Jaehnel - Bug#241385

diff --git a/plugins/org.eclipse.bpel.compare.ui/src/org/eclipse/bpel/compare/ui/gef/bpel/BPELMatchEngine.java b/plugins/org.eclipse.bpel.compare.ui/src/org/eclipse/bpel/compare/ui/gef/bpel/BPELMatchEngine.java
index 7b669e7..3bf1782 100644
--- a/plugins/org.eclipse.bpel.compare.ui/src/org/eclipse/bpel/compare/ui/gef/bpel/BPELMatchEngine.java
+++ b/plugins/org.eclipse.bpel.compare.ui/src/org/eclipse/bpel/compare/ui/gef/bpel/BPELMatchEngine.java
@@ -2,9 +2,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012, 2008 Obeo.

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  *     Obeo - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.compare.ui/src/org/eclipse/bpel/compare/ui/gef/mergeviewer/GEFContentMergeViewerResources.properties b/plugins/org.eclipse.bpel.compare.ui/src/org/eclipse/bpel/compare/ui/gef/mergeviewer/GEFContentMergeViewerResources.properties
index 2f3634f..62ad636 100644
--- a/plugins/org.eclipse.bpel.compare.ui/src/org/eclipse/bpel/compare/ui/gef/mergeviewer/GEFContentMergeViewerResources.properties
+++ b/plugins/org.eclipse.bpel.compare.ui/src/org/eclipse/bpel/compare/ui/gef/mergeviewer/GEFContentMergeViewerResources.properties
@@ -1,9 +1,11 @@
 ################################################################################

 # Copyright (c) 2006, 2012 Obeo.

 # 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 2.0

 # which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0

 # 

 # Contributors:

 #     Obeo - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.examples.extensionPoints/about.html b/plugins/org.eclipse.bpel.examples.extensionPoints/about.html
index 363bc9d..31a983e 100644
--- a/plugins/org.eclipse.bpel.examples.extensionPoints/about.html
+++ b/plugins/org.eclipse.bpel.examples.extensionPoints/about.html
@@ -13,8 +13,10 @@
 
 <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>.
+Eclipse Public License 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+>https://www.eclipse.org/legal/epl-2.0/
+>
+>SPDX-License-Identifier: EPL-2.0</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.bpel.examples.extensionPoints/build.properties b/plugins/org.eclipse.bpel.examples.extensionPoints/build.properties
index ee12445..38d9c85 100644
--- a/plugins/org.eclipse.bpel.examples.extensionPoints/build.properties
+++ b/plugins/org.eclipse.bpel.examples.extensionPoints/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################

 # Copyright (c) 2008, 2012 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 2.0

 # which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0

 #

 # Contributors:

 #     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.examples.extensionPoints/plugin.properties b/plugins/org.eclipse.bpel.examples.extensionPoints/plugin.properties
index 0bddbf3..063bbbe 100644
--- a/plugins/org.eclipse.bpel.examples.extensionPoints/plugin.properties
+++ b/plugins/org.eclipse.bpel.examples.extensionPoints/plugin.properties
@@ -1,9 +1,11 @@
 ###############################################################################

 # Copyright (c) 2010, 2012 Red Hat, Inc. 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 2.0

 # which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0

 # 

 # Contributors:

 #     JBoss by Red Hat - Initial implementation.

diff --git a/plugins/org.eclipse.bpel.examples.extensionPoints/src/org/eclipse/bpel/examples/extensionpoints/Activator.java b/plugins/org.eclipse.bpel.examples.extensionPoints/src/org/eclipse/bpel/examples/extensionpoints/Activator.java
index 2e616c3..d33c401 100644
--- a/plugins/org.eclipse.bpel.examples.extensionPoints/src/org/eclipse/bpel/examples/extensionpoints/Activator.java
+++ b/plugins/org.eclipse.bpel.examples.extensionPoints/src/org/eclipse/bpel/examples/extensionpoints/Activator.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.examples.extensionPoints/src/org/eclipse/bpel/examples/extensionpoints/palette/EmptyToolEntry.java b/plugins/org.eclipse.bpel.examples.extensionPoints/src/org/eclipse/bpel/examples/extensionpoints/palette/EmptyToolEntry.java
index f316b08..077269b 100644
--- a/plugins/org.eclipse.bpel.examples.extensionPoints/src/org/eclipse/bpel/examples/extensionpoints/palette/EmptyToolEntry.java
+++ b/plugins/org.eclipse.bpel.examples.extensionPoints/src/org/eclipse/bpel/examples/extensionpoints/palette/EmptyToolEntry.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.examples.extensionPoints/src/org/eclipse/bpel/examples/extensionpoints/palette/ExitToolEntry.java b/plugins/org.eclipse.bpel.examples.extensionPoints/src/org/eclipse/bpel/examples/extensionpoints/palette/ExitToolEntry.java
index c167dc5..f600eaf 100644
--- a/plugins/org.eclipse.bpel.examples.extensionPoints/src/org/eclipse/bpel/examples/extensionpoints/palette/ExitToolEntry.java
+++ b/plugins/org.eclipse.bpel.examples.extensionPoints/src/org/eclipse/bpel/examples/extensionpoints/palette/ExitToolEntry.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.examples.extensionPoints/src/org/eclipse/bpel/examples/handlers/CreateBPELHandler.java b/plugins/org.eclipse.bpel.examples.extensionPoints/src/org/eclipse/bpel/examples/handlers/CreateBPELHandler.java
index 288e71a..4026c2f 100644
--- a/plugins/org.eclipse.bpel.examples.extensionPoints/src/org/eclipse/bpel/examples/handlers/CreateBPELHandler.java
+++ b/plugins/org.eclipse.bpel.examples.extensionPoints/src/org/eclipse/bpel/examples/handlers/CreateBPELHandler.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.help/about.html b/plugins/org.eclipse.bpel.help/about.html
index 363bc9d..31a983e 100644
--- a/plugins/org.eclipse.bpel.help/about.html
+++ b/plugins/org.eclipse.bpel.help/about.html
@@ -13,8 +13,10 @@
 
 <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>.
+Eclipse Public License 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+>https://www.eclipse.org/legal/epl-2.0/
+>
+>SPDX-License-Identifier: EPL-2.0</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.bpel.help/build.properties b/plugins/org.eclipse.bpel.help/build.properties
index ed9f215..99cda4f 100644
--- a/plugins/org.eclipse.bpel.help/build.properties
+++ b/plugins/org.eclipse.bpel.help/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2010 JBoss by Red Hat 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 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.help/html/schema.css b/plugins/org.eclipse.bpel.help/html/schema.css
index 10aee31..be0b9ea 100644
--- a/plugins/org.eclipse.bpel.help/html/schema.css
+++ b/plugins/org.eclipse.bpel.help/html/schema.css
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2003 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  * 

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.help/plugin.properties b/plugins/org.eclipse.bpel.help/plugin.properties
index 52a3d75..e70b061 100644
--- a/plugins/org.eclipse.bpel.help/plugin.properties
+++ b/plugins/org.eclipse.bpel.help/plugin.properties
@@ -1,9 +1,11 @@
 ###############################################################################

 # Copyright (c) 2010, 2012 Red Hat, Inc. 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 2.0

 # which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0

 # 

 # Contributors:

 #     JBoss by Red Hat - Initial implementation.

diff --git a/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/about.html b/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/about.html
index 363bc9d..31a983e 100644
--- a/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/about.html
+++ b/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/about.html
@@ -13,8 +13,10 @@
 
 <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>.
+Eclipse Public License 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+>https://www.eclipse.org/legal/epl-2.0/
+>
+>SPDX-License-Identifier: EPL-2.0</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.bpel.jboss.riftsaw.runtime/build.properties b/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/build.properties
index 05f5ac9..0f3f935 100644
--- a/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/build.properties
+++ b/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################

 # Copyright (c) 2008, 2012 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 2.0

 # which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0

 #

 # Contributors:

 #     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/plugin.properties b/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/plugin.properties
index fccdc18..a149e1f 100644
--- a/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/plugin.properties
+++ b/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/plugin.properties
@@ -1,9 +1,11 @@
 ###############################################################################

 # Copyright (c) 2010, 2012 JBoss by Red Hat 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 2.0

 # which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0

 # 

 # Contributors:

 #     University College London - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/IRiftsawModuleFacetConstants.java b/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/IRiftsawModuleFacetConstants.java
index c627968..c80fe2b 100644
--- a/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/IRiftsawModuleFacetConstants.java
+++ b/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/IRiftsawModuleFacetConstants.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/RiftsawPlugin.java b/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/RiftsawPlugin.java
index 123fa2e..05f1264 100644
--- a/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/RiftsawPlugin.java
+++ b/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/RiftsawPlugin.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 University College London Software Systems Engineering

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  * 	Bruno Wassermann - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/RiftsawPublisher.java b/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/RiftsawPublisher.java
index ec819f4..0a6593f 100644
--- a/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/RiftsawPublisher.java
+++ b/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/RiftsawPublisher.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/RiftsawServerRuntime.java b/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/RiftsawServerRuntime.java
index d14deac..ee20273 100644
--- a/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/RiftsawServerRuntime.java
+++ b/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/RiftsawServerRuntime.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/facets/RiftsawFacetInstallDataModelProvider.java b/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/facets/RiftsawFacetInstallDataModelProvider.java
index 4c8cfbe..71585ad 100644
--- a/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/facets/RiftsawFacetInstallDataModelProvider.java
+++ b/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/facets/RiftsawFacetInstallDataModelProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/module/RiftsawDeployableArtifactUtil.java b/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/module/RiftsawDeployableArtifactUtil.java
index f187b21..a038170 100644
--- a/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/module/RiftsawDeployableArtifactUtil.java
+++ b/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/module/RiftsawDeployableArtifactUtil.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/module/RiftsawModuleDelegate.java b/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/module/RiftsawModuleDelegate.java
index e48f136..478629d 100644
--- a/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/module/RiftsawModuleDelegate.java
+++ b/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/module/RiftsawModuleDelegate.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/module/RiftsawModuleFactoryDelegate.java b/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/module/RiftsawModuleFactoryDelegate.java
index fecbcff..180dbd2 100644
--- a/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/module/RiftsawModuleFactoryDelegate.java
+++ b/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/module/RiftsawModuleFactoryDelegate.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/ui/wizards/Messages.java b/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/ui/wizards/Messages.java
index 14bc85c..34b6ee3 100644
--- a/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/ui/wizards/Messages.java
+++ b/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/ui/wizards/Messages.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 University College London Software Systems Engineering

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  * 	Bruno Wassermann - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/ui/wizards/NewJBTBPELProjectWizard.java b/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/ui/wizards/NewJBTBPELProjectWizard.java
index eeec0e6..1457d71 100644
--- a/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/ui/wizards/NewJBTBPELProjectWizard.java
+++ b/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/ui/wizards/NewJBTBPELProjectWizard.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 University College London Software Systems Engineering

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  * 	Bruno Wassermann - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/ui/wizards/NewJBTBPELProjectWizardPage1.java b/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/ui/wizards/NewJBTBPELProjectWizardPage1.java
index 8bfd01b..756397f 100644
--- a/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/ui/wizards/NewJBTBPELProjectWizardPage1.java
+++ b/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/ui/wizards/NewJBTBPELProjectWizardPage1.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 University College London Software Systems Engineering

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  * 	Bruno Wassermann - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/ui/wizards/messages.properties b/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/ui/wizards/messages.properties
index 19238b6..2b5ecde 100644
--- a/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/ui/wizards/messages.properties
+++ b/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/ui/wizards/messages.properties
@@ -1,9 +1,11 @@
 ###############################################################################

 # Copyright (c) 2008, 2012 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 2.0

 # which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0

 #

 # Contributors:

 #     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.model/about.html b/plugins/org.eclipse.bpel.model/about.html
index 363bc9d..31a983e 100644
--- a/plugins/org.eclipse.bpel.model/about.html
+++ b/plugins/org.eclipse.bpel.model/about.html
@@ -13,8 +13,10 @@
 
 <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>.
+Eclipse Public License 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+>https://www.eclipse.org/legal/epl-2.0/
+>
+>SPDX-License-Identifier: EPL-2.0</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.bpel.model/build.properties b/plugins/org.eclipse.bpel.model/build.properties
index 0be2b76..ede067c 100644
--- a/plugins/org.eclipse.bpel.model/build.properties
+++ b/plugins/org.eclipse.bpel.model/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005 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 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/plugin.properties b/plugins/org.eclipse.bpel.model/plugin.properties
index a7e1036..304eb16 100644
--- a/plugins/org.eclipse.bpel.model/plugin.properties
+++ b/plugins/org.eclipse.bpel.model/plugin.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005 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 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Activity.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Activity.java
index 6560b8b..4ce2bfa 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Activity.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Activity.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Assign.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Assign.java
index bb9850d..7bc24ef 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Assign.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Assign.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/BPELFactory.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/BPELFactory.java
index d2f22d5..f7392e9 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/BPELFactory.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/BPELFactory.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/BPELPackage.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/BPELPackage.java
index 170cc76..a0ffc80 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/BPELPackage.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/BPELPackage.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/BPELPlugin.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/BPELPlugin.java
index 860b0cb..7e8c14e 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/BPELPlugin.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/BPELPlugin.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/BooleanExpression.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/BooleanExpression.java
index cd01d56..3da8dbd 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/BooleanExpression.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/BooleanExpression.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Catch.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Catch.java
index 1bbe7c2..d8d004b 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Catch.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Catch.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/CatchAll.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/CatchAll.java
index 47c9494..c804d8e 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/CatchAll.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/CatchAll.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Compensate.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Compensate.java
index 43a8192..1db9e61 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Compensate.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Compensate.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/CompensationHandler.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/CompensationHandler.java
index 0f51cf2..d8039e0 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/CompensationHandler.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/CompensationHandler.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Condition.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Condition.java
index 85e5e83..bf09abf 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Condition.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Condition.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Copy.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Copy.java
index 030a692..ec36899 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Copy.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Copy.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Correlation.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Correlation.java
index f980e8b..a21a76a 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Correlation.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Correlation.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/CorrelationPattern.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/CorrelationPattern.java
index e40c242..68744c5 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/CorrelationPattern.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/CorrelationPattern.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/CorrelationSet.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/CorrelationSet.java
index fb2e37e..aff5965 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/CorrelationSet.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/CorrelationSet.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/CorrelationSets.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/CorrelationSets.java
index f8cfec1..2b8ef01 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/CorrelationSets.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/CorrelationSets.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Correlations.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Correlations.java
index 61156f4..cf5152a 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Correlations.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Correlations.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Empty.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Empty.java
index bf853e2..ff961a5 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Empty.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Empty.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/EndpointReferenceRole.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/EndpointReferenceRole.java
index 491064d..351f382 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/EndpointReferenceRole.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/EndpointReferenceRole.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/EventHandler.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/EventHandler.java
index 62c293b..d7ba2c6 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/EventHandler.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/EventHandler.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Expression.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Expression.java
index 6145238..7f3f1c5 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Expression.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Expression.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Extension.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Extension.java
index 4915086..cd1e0de 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Extension.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Extension.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/FaultHandler.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/FaultHandler.java
index dfc0425..bb36e8f 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/FaultHandler.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/FaultHandler.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Flow.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Flow.java
index 4f86e3a..8fc3ef1 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Flow.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Flow.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/From.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/From.java
index 04e142d..157f0d1 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/From.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/From.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Import.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Import.java
index 6a461b8..960cfe2 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Import.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Import.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Invoke.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Invoke.java
index 2b3ab66..eca2701 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Invoke.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Invoke.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Link.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Link.java
index c9170bb..2cd4321 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Link.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Link.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Links.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Links.java
index c7a09bd..01a51c4 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Links.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Links.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/OnAlarm.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/OnAlarm.java
index 206d2d5..0ccb794 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/OnAlarm.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/OnAlarm.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/OnEvent.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/OnEvent.java
index 3bc3222..44379b4 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/OnEvent.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/OnEvent.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/OnMessage.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/OnMessage.java
index 7691a19..29d1437 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/OnMessage.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/OnMessage.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/PartnerActivity.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/PartnerActivity.java
index 2ed142a..3d04f43 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/PartnerActivity.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/PartnerActivity.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/PartnerLink.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/PartnerLink.java
index b98a68a..60ce13f 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/PartnerLink.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/PartnerLink.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/PartnerLinks.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/PartnerLinks.java
index 160b7ad..294c784 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/PartnerLinks.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/PartnerLinks.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Pick.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Pick.java
index b08ccc4..db2852b 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Pick.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Pick.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Process.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Process.java
index daaba75..f64be23 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Process.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Process.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Query.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Query.java
index bebbd22..aafca1c 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Query.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Query.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Receive.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Receive.java
index b2efb31..782a5be 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Receive.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Receive.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Reply.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Reply.java
index de0fbc4..be615f9 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Reply.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Reply.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Rethrow.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Rethrow.java
index 505dccc..c2f9bd4 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Rethrow.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Rethrow.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Scope.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Scope.java
index c0e4969..62ebc60 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Scope.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Scope.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Sequence.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Sequence.java
index eeb86ba..8aa5ae1 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Sequence.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Sequence.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/ServiceRef.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/ServiceRef.java
index 9595ec5..7986977 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/ServiceRef.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/ServiceRef.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Source.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Source.java
index 2f5e018..4795218 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Source.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Source.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Sources.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Sources.java
index 4491b98..10a9950 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Sources.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Sources.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Target.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Target.java
index 37aaeb4..146794d 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Target.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Target.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Targets.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Targets.java
index cc99331..33bfc89 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Targets.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Targets.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Throw.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Throw.java
index 90a7b50..066a760 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Throw.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Throw.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/To.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/To.java
index 52b0358..1938113 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/To.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/To.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/UnknownExtensibilityAttribute.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/UnknownExtensibilityAttribute.java
index 712f2f1..844fe83 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/UnknownExtensibilityAttribute.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/UnknownExtensibilityAttribute.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Variable.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Variable.java
index 9da0c76..e1416fa 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Variable.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Variable.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Variables.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Variables.java
index 7cca3e5..eb2b8a7 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Variables.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Variables.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Wait.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Wait.java
index de158e0..fa05904 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Wait.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/Wait.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/While.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/While.java
index 9176023..234e8a4 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/While.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/While.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/adapters/AbstractAdapter.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/adapters/AbstractAdapter.java
index 07c8e19..ff71f16 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/adapters/AbstractAdapter.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/adapters/AbstractAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/adapters/AbstractStatefulAdapter.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/adapters/AbstractStatefulAdapter.java
index 62edfe4..fea8170 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/adapters/AbstractStatefulAdapter.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/adapters/AbstractStatefulAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 Oracle 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Oracle Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/adapters/AdapterProvider.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/adapters/AdapterProvider.java
index b1c28a9..8eeba83 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/adapters/AdapterProvider.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/adapters/AdapterProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 Oracle 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Oracle Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/adapters/AdapterRegistry.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/adapters/AdapterRegistry.java
index e76c30e..8ecce4f 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/adapters/AdapterRegistry.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/adapters/AdapterRegistry.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 Oracle 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Oracle Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/adapters/BasicBPELAdapterFactory.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/adapters/BasicBPELAdapterFactory.java
index 654bfd5..593738e 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/adapters/BasicBPELAdapterFactory.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/adapters/BasicBPELAdapterFactory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 Oracle 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Oracle Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/adapters/BasicEObjectaAdapter.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/adapters/BasicEObjectaAdapter.java
index a05e50a..3c0902c 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/adapters/BasicEObjectaAdapter.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/adapters/BasicEObjectaAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 Oracle 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Oracle Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/adapters/IProperty.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/adapters/IProperty.java
index 421258d..444d6a8 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/adapters/IProperty.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/adapters/IProperty.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 Oracle 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Oracle Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/adapters/IStatefullAdapter.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/adapters/IStatefullAdapter.java
index 767a8de..8af57e7 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/adapters/IStatefullAdapter.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/adapters/IStatefullAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 Oracle 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Oracle Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/extensions/BPELActivityDeserializer.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/extensions/BPELActivityDeserializer.java
index f867343..a6826d1 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/extensions/BPELActivityDeserializer.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/extensions/BPELActivityDeserializer.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/extensions/BPELActivitySerializer.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/extensions/BPELActivitySerializer.java
index e1d688e..4b4e3ea 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/extensions/BPELActivitySerializer.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/extensions/BPELActivitySerializer.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/extensions/BPELExtensionDeserializer.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/extensions/BPELExtensionDeserializer.java
index a0fa062..c82425a 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/extensions/BPELExtensionDeserializer.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/extensions/BPELExtensionDeserializer.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/extensions/BPELExtensionRegistry.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/extensions/BPELExtensionRegistry.java
index 48d920f..2b40b4c 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/extensions/BPELExtensionRegistry.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/extensions/BPELExtensionRegistry.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/extensions/BPELExtensionSerializer.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/extensions/BPELExtensionSerializer.java
index ad17cd6..eb0df0a 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/extensions/BPELExtensionSerializer.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/extensions/BPELExtensionSerializer.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/extensions/BPELUnknownExtensionDeserializer.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/extensions/BPELUnknownExtensionDeserializer.java
index 24d3a3d..e169826 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/extensions/BPELUnknownExtensionDeserializer.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/extensions/BPELUnknownExtensionDeserializer.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/extensions/BPELUnknownExtensionSerializer.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/extensions/BPELUnknownExtensionSerializer.java
index 774871f..8e04abb 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/extensions/BPELUnknownExtensionSerializer.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/extensions/BPELUnknownExtensionSerializer.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/extensions/ServiceReferenceDeserializer.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/extensions/ServiceReferenceDeserializer.java
index 313a318..e42920e 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/extensions/ServiceReferenceDeserializer.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/extensions/ServiceReferenceDeserializer.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/extensions/ServiceReferenceSerializer.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/extensions/ServiceReferenceSerializer.java
index bb39c7a..be25658 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/extensions/ServiceReferenceSerializer.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/extensions/ServiceReferenceSerializer.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ActivityImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ActivityImpl.java
index b06d056..059e630 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ActivityImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ActivityImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/AssignImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/AssignImpl.java
index c6f761a..e062d03 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/AssignImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/AssignImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/BPELExtensibilityElementImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/BPELExtensibilityElementImpl.java
index 9ec2ca9..403aa1c 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/BPELExtensibilityElementImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/BPELExtensibilityElementImpl.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2007 Intel Corporation.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *    Dennis Ushakov, Intel - Initial API and Implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/BPELFactoryImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/BPELFactoryImpl.java
index cf0ef58..4f8d321 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/BPELFactoryImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/BPELFactoryImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/BPELPackageImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/BPELPackageImpl.java
index 0dd4c29..5d10c3a 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/BPELPackageImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/BPELPackageImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/BooleanExpressionImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/BooleanExpressionImpl.java
index 61e9cc2..c5ece52 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/BooleanExpressionImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/BooleanExpressionImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CatchAllImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CatchAllImpl.java
index 3b48d64..f8e5a57 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CatchAllImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CatchAllImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CatchImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CatchImpl.java
index 6dd7ac6..c6e3794 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CatchImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CatchImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CompensateImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CompensateImpl.java
index 7f14b6a..7f399ef 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CompensateImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CompensateImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CompensationHandlerImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CompensationHandlerImpl.java
index c01a865..9d29be2 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CompensationHandlerImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CompensationHandlerImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ConditionImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ConditionImpl.java
index 17e7ee7..0677bb7 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ConditionImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ConditionImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CopyImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CopyImpl.java
index f643de0..6a20434 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CopyImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CopyImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CorrelationImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CorrelationImpl.java
index 0f1767e..4d89d63 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CorrelationImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CorrelationImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CorrelationSetImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CorrelationSetImpl.java
index dac3db9..877ae0a 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CorrelationSetImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CorrelationSetImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CorrelationSetsImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CorrelationSetsImpl.java
index 92ae053..03a2ec5 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CorrelationSetsImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CorrelationSetsImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CorrelationsImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CorrelationsImpl.java
index 762a7ac..28fb158 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CorrelationsImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/CorrelationsImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/EmptyImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/EmptyImpl.java
index bfad4b2..096b098 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/EmptyImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/EmptyImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/EventHandlerImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/EventHandlerImpl.java
index ddf13e6..8d9cd0a 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/EventHandlerImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/EventHandlerImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ExpressionImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ExpressionImpl.java
index cd3ee39..642ca85 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ExpressionImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ExpressionImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ExtensionImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ExtensionImpl.java
index 8f567ca..a3136b7 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ExtensionImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ExtensionImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/FaultHandlerImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/FaultHandlerImpl.java
index 7defb18..2290a31 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/FaultHandlerImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/FaultHandlerImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/FlowImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/FlowImpl.java
index 417b379..4300743 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/FlowImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/FlowImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/FromImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/FromImpl.java
index 75e97e3..bb82508 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/FromImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/FromImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ImportImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ImportImpl.java
index dbc1764..2cd06a1 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ImportImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ImportImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/InvokeImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/InvokeImpl.java
index 25d2b2d..0327ea0 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/InvokeImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/InvokeImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/LinkImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/LinkImpl.java
index 55f4ace..12eee9d 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/LinkImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/LinkImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/LinksImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/LinksImpl.java
index e373961..992d4d5 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/LinksImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/LinksImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/OnAlarmImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/OnAlarmImpl.java
index bab854d..4bfb335 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/OnAlarmImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/OnAlarmImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/OnEventImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/OnEventImpl.java
index e536bc5..4239098 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/OnEventImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/OnEventImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/OnMessageImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/OnMessageImpl.java
index 7ef7688..6fae623 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/OnMessageImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/OnMessageImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/PartnerActivityImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/PartnerActivityImpl.java
index 075dab4..927369b 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/PartnerActivityImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/PartnerActivityImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/PartnerLinkImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/PartnerLinkImpl.java
index 183604e..3e49c2a 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/PartnerLinkImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/PartnerLinkImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/PartnerLinksImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/PartnerLinksImpl.java
index 1f4410c..5b6ef09 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/PartnerLinksImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/PartnerLinksImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/PickImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/PickImpl.java
index 7eeb919..905099e 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/PickImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/PickImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ProcessImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ProcessImpl.java
index 17c7931..01f4c2e 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ProcessImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ProcessImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/QueryImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/QueryImpl.java
index ad4435b..7bdd726 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/QueryImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/QueryImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ReceiveImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ReceiveImpl.java
index f57ecd4..be3fa61 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ReceiveImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ReceiveImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ReplyImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ReplyImpl.java
index 121fb10..8e68e26 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ReplyImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ReplyImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/RethrowImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/RethrowImpl.java
index 0618d62..f63babb 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/RethrowImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/RethrowImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ScopeImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ScopeImpl.java
index c2b3241..82d0113 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ScopeImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ScopeImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/SequenceImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/SequenceImpl.java
index 9264bb2..d44cd09 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/SequenceImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/SequenceImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ServiceRefImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ServiceRefImpl.java
index 3662d83..617604b 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ServiceRefImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ServiceRefImpl.java
@@ -2,9 +2,11 @@
  * <copyright>

  * Copyright (c) 2005 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/SourceImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/SourceImpl.java
index 2cb9544..9195961 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/SourceImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/SourceImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/SourcesImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/SourcesImpl.java
index 3aeaf29..ca20f47 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/SourcesImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/SourcesImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/TargetImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/TargetImpl.java
index da7fadc..ba95ee0 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/TargetImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/TargetImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/TargetsImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/TargetsImpl.java
index 969d6f9..cde653a 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/TargetsImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/TargetsImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ThrowImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ThrowImpl.java
index 7e7303d..6607fa8 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ThrowImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ThrowImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ToImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ToImpl.java
index 67387d2..c60686d 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ToImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ToImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/UnknownExtensibilityAttributeImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/UnknownExtensibilityAttributeImpl.java
index 7d2c831..c20224f 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/UnknownExtensibilityAttributeImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/UnknownExtensibilityAttributeImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/VariableImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/VariableImpl.java
index 7568e2b..2f4e96d 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/VariableImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/VariableImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/VariablesImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/VariablesImpl.java
index 4070674..895ba97 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/VariablesImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/VariablesImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/WaitImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/WaitImpl.java
index 51f5fee..0df59fa 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/WaitImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/WaitImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/WhileImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/WhileImpl.java
index d8b106b..714b6ba 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/WhileImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/WhileImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/MessagepropertiesFactory.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/MessagepropertiesFactory.java
index dfdb6d8..2183ffd 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/MessagepropertiesFactory.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/MessagepropertiesFactory.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/MessagepropertiesPackage.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/MessagepropertiesPackage.java
index 4090403..24ebe44 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/MessagepropertiesPackage.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/MessagepropertiesPackage.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/Property.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/Property.java
index 9a278db..fe0b444 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/Property.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/Property.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/PropertyAlias.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/PropertyAlias.java
index 4af8c25..c2e43f8 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/PropertyAlias.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/PropertyAlias.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/Query.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/Query.java
index 82bac95..81571ae 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/Query.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/Query.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/impl/MessagepropertiesFactoryImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/impl/MessagepropertiesFactoryImpl.java
index 21717e1..e4ffb6f 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/impl/MessagepropertiesFactoryImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/impl/MessagepropertiesFactoryImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/impl/MessagepropertiesPackageImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/impl/MessagepropertiesPackageImpl.java
index 64d657a..1167735 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/impl/MessagepropertiesPackageImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/impl/MessagepropertiesPackageImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/impl/PropertyAliasImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/impl/PropertyAliasImpl.java
index 3b6366f..97852ab 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/impl/PropertyAliasImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/impl/PropertyAliasImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/impl/PropertyImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/impl/PropertyImpl.java
index 76ce234..9b182fb 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/impl/PropertyImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/impl/PropertyImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/impl/QueryImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/impl/QueryImpl.java
index d75795e..b57fc4d 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/impl/QueryImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/impl/QueryImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/util/MessagepropertiesAdapterFactory.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/util/MessagepropertiesAdapterFactory.java
index 98e86a3..5928f36 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/util/MessagepropertiesAdapterFactory.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/util/MessagepropertiesAdapterFactory.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/util/MessagepropertiesConstants.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/util/MessagepropertiesConstants.java
index 94954bd..fea65f2 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/util/MessagepropertiesConstants.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/util/MessagepropertiesConstants.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/util/MessagepropertiesExtensibilityElementFactory.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/util/MessagepropertiesExtensibilityElementFactory.java
index dd067d8..c1af97a 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/util/MessagepropertiesExtensibilityElementFactory.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/messageproperties/util/MessagepropertiesExtensibilityElementFactory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/PartnerLinkType.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/PartnerLinkType.java
index 9f92b66..4fccfd9 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/PartnerLinkType.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/PartnerLinkType.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/PartnerlinktypeFactory.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/PartnerlinktypeFactory.java
index 339c69b..35d0829 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/PartnerlinktypeFactory.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/PartnerlinktypeFactory.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/PartnerlinktypePackage.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/PartnerlinktypePackage.java
index df38eda..646795f 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/PartnerlinktypePackage.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/PartnerlinktypePackage.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/Role.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/Role.java
index 0b186bb..f543b0f 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/Role.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/Role.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/RolePortType.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/RolePortType.java
index 4dc7746..731e803 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/RolePortType.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/RolePortType.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/impl/PartnerLinkTypeImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/impl/PartnerLinkTypeImpl.java
index e81b251..9c9db06 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/impl/PartnerLinkTypeImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/impl/PartnerLinkTypeImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/impl/PartnerlinktypeFactoryImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/impl/PartnerlinktypeFactoryImpl.java
index 949825e..fa41d0a 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/impl/PartnerlinktypeFactoryImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/impl/PartnerlinktypeFactoryImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/impl/PartnerlinktypePackageImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/impl/PartnerlinktypePackageImpl.java
index a041b30..e0bdf33 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/impl/PartnerlinktypePackageImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/impl/PartnerlinktypePackageImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/impl/RoleImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/impl/RoleImpl.java
index 4307543..d9df154 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/impl/RoleImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/impl/RoleImpl.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/util/PartnerlinktypeAdapterFactory.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/util/PartnerlinktypeAdapterFactory.java
index 806352a..43ddf58 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/util/PartnerlinktypeAdapterFactory.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/util/PartnerlinktypeAdapterFactory.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/util/PartnerlinktypeConstants.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/util/PartnerlinktypeConstants.java
index c0c8feb..1ad8193 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/util/PartnerlinktypeConstants.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/util/PartnerlinktypeConstants.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/util/PartnerlinktypeExtensibilityElementFactory.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/util/PartnerlinktypeExtensibilityElementFactory.java
index 2b6808d..2fe1482 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/util/PartnerlinktypeExtensibilityElementFactory.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/partnerlinktype/util/PartnerlinktypeExtensibilityElementFactory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/CorrelationSetProxy.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/CorrelationSetProxy.java
index 6b64abf..b32aa68 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/CorrelationSetProxy.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/CorrelationSetProxy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/IBPELServicesProxy.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/IBPELServicesProxy.java
index 1b0e413..2452d44 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/IBPELServicesProxy.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/IBPELServicesProxy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/LinkProxy.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/LinkProxy.java
index 91cf4b2..9e5a5f5 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/LinkProxy.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/LinkProxy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/MessageExchangeProxy.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/MessageExchangeProxy.java
index 990894c..120d5eb 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/MessageExchangeProxy.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/MessageExchangeProxy.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2008 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/MessageProxy.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/MessageProxy.java
index 867d043..a9334ab 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/MessageProxy.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/MessageProxy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/OperationProxy.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/OperationProxy.java
index 7bf91e8..6ef9b20 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/OperationProxy.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/OperationProxy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/PartProxy.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/PartProxy.java
index 1e744d3..c0d1cae 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/PartProxy.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/PartProxy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/PartnerLinkProxy.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/PartnerLinkProxy.java
index 20cedfd..baa18f0 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/PartnerLinkProxy.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/PartnerLinkProxy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/PartnerLinkTypeProxy.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/PartnerLinkTypeProxy.java
index f8de092..23060ef 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/PartnerLinkTypeProxy.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/PartnerLinkTypeProxy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/PortTypeProxy.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/PortTypeProxy.java
index c71dae0..f184559 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/PortTypeProxy.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/PortTypeProxy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/PropertyProxy.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/PropertyProxy.java
index 48999f6..644054e 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/PropertyProxy.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/PropertyProxy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/RoleProxy.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/RoleProxy.java
index 354eca8..08ec2b5 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/RoleProxy.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/RoleProxy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/ScopeProxy.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/ScopeProxy.java
index b7dcdbd..72b40be 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/ScopeProxy.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/ScopeProxy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/VariableProxy.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/VariableProxy.java
index 3bcd2ee..ff9b561 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/VariableProxy.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/VariableProxy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/XSDElementDeclarationProxy.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/XSDElementDeclarationProxy.java
index 4b3fcd4..32820a9 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/XSDElementDeclarationProxy.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/XSDElementDeclarationProxy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/XSDTypeDefinitionProxy.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/XSDTypeDefinitionProxy.java
index bbf5fc0..4f819d1 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/XSDTypeDefinitionProxy.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/proxy/XSDTypeDefinitionProxy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/reordering/IExtensibilityElementListHandler.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/reordering/IExtensibilityElementListHandler.java
index 2ab0223..a1074da 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/reordering/IExtensibilityElementListHandler.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/reordering/IExtensibilityElementListHandler.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/reordering/extensions/ExtensionFactory.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/reordering/extensions/ExtensionFactory.java
index 23c185d..6db57c5 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/reordering/extensions/ExtensionFactory.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/reordering/extensions/ExtensionFactory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELLinkResolver.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELLinkResolver.java
index cd2c9ca..6d17bff 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELLinkResolver.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELLinkResolver.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELReader.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELReader.java
index 7a23429..0e09a20 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELReader.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELReader.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELResource.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELResource.java
index 9ab4992..ea2cfa9 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELResource.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELResource.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELResourceFactoryImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELResourceFactoryImpl.java
index b14bda4..166ebae 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELResourceFactoryImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELResourceFactoryImpl.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELResourceImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELResourceImpl.java
index 1faf4ab..ee8f861 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELResourceImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELResourceImpl.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELResourceSetImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELResourceSetImpl.java
index 041fd1f..680b2b5 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELResourceSetImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELResourceSetImpl.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 Oracle 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Oracle Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELValidatingResourceFactoryImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELValidatingResourceFactoryImpl.java
index ee34efb..e5d00e0 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELValidatingResourceFactoryImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELValidatingResourceFactoryImpl.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELVariableResolver.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELVariableResolver.java
index 4d590d4..d10dca9 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELVariableResolver.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELVariableResolver.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELWriter.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELWriter.java
index f918f78..451f848 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELWriter.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELWriter.java
@@ -1,8 +1,10 @@
 /*******************************************************************************

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/LineCapturingDOMParser.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/LineCapturingDOMParser.java
index 8e0c649..6b6f3cf 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/LineCapturingDOMParser.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/LineCapturingDOMParser.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 Oracle 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Oracle Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/LinkResolver.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/LinkResolver.java
index 390405f..9b7b00e 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/LinkResolver.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/LinkResolver.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/ResourceSetProvider.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/ResourceSetProvider.java
index 328aac8..0d3875d 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/ResourceSetProvider.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/ResourceSetProvider.java
@@ -1,9 +1,11 @@
 ///*******************************************************************************
 // * Copyright (c) 2006 Oracle 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 2.0
 // * which accompanies this distribution, and is available at
-// * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
 // *
 // * Contributors:
 // *     Oracle Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/SAXParseDiagnostic.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/SAXParseDiagnostic.java
index 733903f..396cef8 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/SAXParseDiagnostic.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/SAXParseDiagnostic.java
@@ -1,9 +1,11 @@
 /*
  * Copyright (c) 2010 JBoss, Inc. 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.bpel.model.resource;
 
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/VariableResolver.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/VariableResolver.java
index 02235b0..2bfbdf3 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/VariableResolver.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/VariableResolver.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/terms/BPELTerms.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/terms/BPELTerms.java
index 7ce2acd..6ef6816 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/terms/BPELTerms.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/terms/BPELTerms.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/terms/spec_terms.properties b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/terms/spec_terms.properties
index e68a604..0627818 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/terms/spec_terms.properties
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/terms/spec_terms.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005 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 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/BPELAdapterFactory.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/BPELAdapterFactory.java
index 30c9849..2b3ba4a 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/BPELAdapterFactory.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/BPELAdapterFactory.java
@@ -2,9 +2,11 @@
  * <copyright>
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/BPELConstants.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/BPELConstants.java
index 0998092..7dc9859 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/BPELConstants.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/BPELConstants.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/BPELProxyURI.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/BPELProxyURI.java
index a223760..c4b80de 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/BPELProxyURI.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/BPELProxyURI.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/BPELServicesUtility.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/BPELServicesUtility.java
index cdce3f0..579535a 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/BPELServicesUtility.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/BPELServicesUtility.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/BPELUtils.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/BPELUtils.java
index a0a9f5a..2710522 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/BPELUtils.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/BPELUtils.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ElementFactory.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ElementFactory.java
index 330ff13..75efedf 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ElementFactory.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ElementFactory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2007 Intel Corporation.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *    Dennis Ushakov, Intel - Initial API and Implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ElementPlacer.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ElementPlacer.java
index 509e298..0d575a6 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ElementPlacer.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ElementPlacer.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2007 Intel Corporation.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *    Dennis Ushakov, Intel - Initial API and Implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ImportResolver.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ImportResolver.java
index b5378ca..306ffbc 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ImportResolver.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ImportResolver.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ImportResolverRegistry.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ImportResolverRegistry.java
index 3ed69c9..0c07c94 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ImportResolverRegistry.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ImportResolverRegistry.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ReconciliationHelper.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ReconciliationHelper.java
index 07ede07..b0142cd 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ReconciliationHelper.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ReconciliationHelper.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2007 Intel Corporation.
  * 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *    Dennis Ushakov, Intel - Initial API and Implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/WSDLImportResolver.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/WSDLImportResolver.java
index 21520f7..bfab79f 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/WSDLImportResolver.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/WSDLImportResolver.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/WSDLUtil.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/WSDLUtil.java
index 8161fe2..2d1496a 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/WSDLUtil.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/WSDLUtil.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/XSD2XMLGenerator.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/XSD2XMLGenerator.java
index 89b31ef..76bcbf4 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/XSD2XMLGenerator.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/XSD2XMLGenerator.java
@@ -1,9 +1,11 @@
 /*
  * Copyright (c) 2010 JBoss, Inc. 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.bpel.model.util;
 
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/XSDComparer.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/XSDComparer.java
index eeb99b7..f9a1a2d 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/XSDComparer.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/XSDComparer.java
@@ -1,9 +1,11 @@
 /*
  * Copyright (c) 2010 JBoss, Inc. 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.bpel.model.util;
 
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/XSDImportResolver.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/XSDImportResolver.java
index 85f676b..8004b64 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/XSDImportResolver.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/XSDImportResolver.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/XSDUtil.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/XSDUtil.java
index d982d95..40767cd 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/XSDUtil.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/XSDUtil.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 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 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.runtimes/about.html b/plugins/org.eclipse.bpel.runtimes/about.html
index 363bc9d..31a983e 100644
--- a/plugins/org.eclipse.bpel.runtimes/about.html
+++ b/plugins/org.eclipse.bpel.runtimes/about.html
@@ -13,8 +13,10 @@
 
 <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>.
+Eclipse Public License 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+>https://www.eclipse.org/legal/epl-2.0/
+>
+>SPDX-License-Identifier: EPL-2.0</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.bpel.runtimes/build.properties b/plugins/org.eclipse.bpel.runtimes/build.properties
index e7b1843..de28fe0 100644
--- a/plugins/org.eclipse.bpel.runtimes/build.properties
+++ b/plugins/org.eclipse.bpel.runtimes/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################

 # Copyright (c) 2008, 2012 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 2.0

 # which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0

 #

 # Contributors:

 #     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.runtimes/plugin.properties b/plugins/org.eclipse.bpel.runtimes/plugin.properties
index 95ca1eb..1cb9d6a 100644
--- a/plugins/org.eclipse.bpel.runtimes/plugin.properties
+++ b/plugins/org.eclipse.bpel.runtimes/plugin.properties
@@ -1,9 +1,11 @@
 ###############################################################################

 # Copyright (c) 2006, 2012 University College London.

 # 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 2.0

 # which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0

 #

 ###############################################################################

 pluginName = Eclipse BPEL Designer Runtimes

diff --git a/plugins/org.eclipse.bpel.runtimes/plugin.xml b/plugins/org.eclipse.bpel.runtimes/plugin.xml
index b5db7a2..0cbb378 100644
--- a/plugins/org.eclipse.bpel.runtimes/plugin.xml
+++ b/plugins/org.eclipse.bpel.runtimes/plugin.xml
@@ -6,9 +6,11 @@
 <!--																		 -->

 <!-- Copyright (c) 2006 University College London.							 -->

 <!-- 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 2.0	 -->

 <!-- which accompanies this distribution, and is available at				 -->

-<!-- http://www.eclipse.org/legal/epl-v10.html								 -->

+- https://www.eclipse.org/legal/epl-2.0/
+-
+- SPDX-License-Identifier: EPL-2.0								 -->

 <!--																		 -->

 <!--=========================================================================-->

 

diff --git a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/IBPELModuleFacetConstants.java b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/IBPELModuleFacetConstants.java
index 897803d..84e84fa 100644
--- a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/IBPELModuleFacetConstants.java
+++ b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/IBPELModuleFacetConstants.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 University College London Software Systems Engineering

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  * 	Bruno Wassermann - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/IBPELRuntimeDelegate.java b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/IBPELRuntimeDelegate.java
index 2ee42cf..5621672 100644
--- a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/IBPELRuntimeDelegate.java
+++ b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/IBPELRuntimeDelegate.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/IRuntimesUIConstants.java b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/IRuntimesUIConstants.java
index de5eb17..ef1e59c 100644
--- a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/IRuntimesUIConstants.java
+++ b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/IRuntimesUIConstants.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 University College London Software Systems Engineering

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  * 	Bruno Wassermann - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/RuntimesPlugin.java b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/RuntimesPlugin.java
index b68ea47..b400a4f 100644
--- a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/RuntimesPlugin.java
+++ b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/RuntimesPlugin.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 University College London Software Systems Engineering

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  * 	Bruno Wassermann - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/facets/BPELCoreFacetInstallDelegate.java b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/facets/BPELCoreFacetInstallDelegate.java
index 5131f30..3005c6e 100644
--- a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/facets/BPELCoreFacetInstallDelegate.java
+++ b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/facets/BPELCoreFacetInstallDelegate.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 University College London Software Systems Engineering

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  * 	Bruno Wassermann - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/facets/BPELCoreFacetUninstallDelegate.java b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/facets/BPELCoreFacetUninstallDelegate.java
index 43417b5..8f83652 100644
--- a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/facets/BPELCoreFacetUninstallDelegate.java
+++ b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/facets/BPELCoreFacetUninstallDelegate.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/facets/BPELFacetInstallDataModelProvider.java b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/facets/BPELFacetInstallDataModelProvider.java
index e9da5e9..e35146c 100644
--- a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/facets/BPELFacetInstallDataModelProvider.java
+++ b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/facets/BPELFacetInstallDataModelProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/facets/BPELVirtualComponent.java b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/facets/BPELVirtualComponent.java
index 145a43e..8746979 100644
--- a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/facets/BPELVirtualComponent.java
+++ b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/facets/BPELVirtualComponent.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/module/BPELDeployable.java b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/module/BPELDeployable.java
index 3c900e5..e267cca 100644
--- a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/module/BPELDeployable.java
+++ b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/module/BPELDeployable.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2008, 2012 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  *     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/module/BPELDeployableArtifactAdapterFactory.java b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/module/BPELDeployableArtifactAdapterFactory.java
index 598ce3e..3e653c0 100644
--- a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/module/BPELDeployableArtifactAdapterFactory.java
+++ b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/module/BPELDeployableArtifactAdapterFactory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 University College London Software Systems Engineering

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  * 	Bruno Wassermann - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/module/BPELDeployableArtifactUtil.java b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/module/BPELDeployableArtifactUtil.java
index 7171841..bbe75b4 100644
--- a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/module/BPELDeployableArtifactUtil.java
+++ b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/module/BPELDeployableArtifactUtil.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 University College London Software Systems Engineering

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  * 	Bruno Wassermann - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/module/BPELModuleArtifact.java b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/module/BPELModuleArtifact.java
index 84dbeb1..a45ab16 100644
--- a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/module/BPELModuleArtifact.java
+++ b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/module/BPELModuleArtifact.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 University College London Software Systems Engineering

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  * 	Bruno Wassermann - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/module/BPELModuleDelegate.java b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/module/BPELModuleDelegate.java
index f600db3..d1f8255 100644
--- a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/module/BPELModuleDelegate.java
+++ b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/module/BPELModuleDelegate.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 University College London Software Systems Engineering

  * 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 2.0

  * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0

  *

  * Contributors:

  * 	Bruno Wassermann - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/module/BPELModuleFactoryDelegat