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/BPELModuleFactoryDelegate.java b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/module/BPELModuleFactoryDelegate.java
index 7416a69..b40c6dc 100644
--- a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/module/BPELModuleFactoryDelegate.java
+++ b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/module/BPELModuleFactoryDelegate.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2003, 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/FlatComponentDeployable.java b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/module/FlatComponentDeployable.java
index 3550551..433ee4a 100644
--- a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/module/FlatComponentDeployable.java
+++ b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/module/FlatComponentDeployable.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

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

  *

  *  THIS CLASS IS AN EXACT CLONE OF 

  *  org.eclipse.wst.web.internal.deployables.FlatComponentDeployable

diff --git a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/module/Messages.java b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/module/Messages.java
index 0aed955..b8136c2 100644
--- a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/module/Messages.java
+++ b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/module/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.runtimes/src/org/eclipse/bpel/runtimes/module/messages.properties b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/module/messages.properties
index 1c82442..c08e84c 100644
--- a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/module/messages.properties
+++ b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/module/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.runtimes/src/org/eclipse/bpel/runtimes/publishers/GenericBPELPublisher.java b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/publishers/GenericBPELPublisher.java
index 97aceba..9391f85 100644
--- a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/publishers/GenericBPELPublisher.java
+++ b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/publishers/GenericBPELPublisher.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/ui/wizards/BPELFacetInstallPage.java b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/ui/wizards/BPELFacetInstallPage.java
index 63b7256..b2ddb0d 100644
--- a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/ui/wizards/BPELFacetInstallPage.java
+++ b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/ui/wizards/BPELFacetInstallPage.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/ui/wizards/Messages.java b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/ui/wizards/Messages.java
index 378dd37..8914721 100644
--- a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/ui/wizards/Messages.java
+++ b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/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.runtimes/src/org/eclipse/bpel/runtimes/ui/wizards/NewBPELProjectWizard.java b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/ui/wizards/NewBPELProjectWizard.java
index d1b4088..fc9920c 100644
--- a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/ui/wizards/NewBPELProjectWizard.java
+++ b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/ui/wizards/NewBPELProjectWizard.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/ui/wizards/NewBPELProjectWizardPage1.java b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/ui/wizards/NewBPELProjectWizardPage1.java
index 121f08c..d114a10 100644
--- a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/ui/wizards/NewBPELProjectWizardPage1.java
+++ b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/ui/wizards/NewBPELProjectWizardPage1.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/ui/wizards/messages.properties b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/ui/wizards/messages.properties
index 494d553..fc56d84 100644
--- a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/ui/wizards/messages.properties
+++ b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/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.runtimes/src/org/eclipse/bpel/runtimes/utils/BPELModelUtils.java b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/utils/BPELModelUtils.java
index bdb5cb6..5a2c646 100644
--- a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/utils/BPELModelUtils.java
+++ b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/utils/BPELModelUtils.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.ui/about.html b/plugins/org.eclipse.bpel.ui/about.html
index 363bc9d..31a983e 100644
--- a/plugins/org.eclipse.bpel.ui/about.html
+++ b/plugins/org.eclipse.bpel.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.ui/build.properties b/plugins/org.eclipse.bpel.ui/build.properties
index 0659d36..222b8cb 100644
--- a/plugins/org.eclipse.bpel.ui/build.properties
+++ b/plugins/org.eclipse.bpel.ui/build.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:

 #     IBM Corporation - initial API and implementation

diff --git a/plugins/org.eclipse.bpel.ui/html/dropPopup/template.properties b/plugins/org.eclipse.bpel.ui/html/dropPopup/template.properties
index d0267be..9ddb35f 100644
--- a/plugins/org.eclipse.bpel.ui/html/dropPopup/template.properties
+++ b/plugins/org.eclipse.bpel.ui/html/dropPopup/template.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.ui/monkey/currentSelection.js b/plugins/org.eclipse.bpel.ui/monkey/currentSelection.js
index 20dcf2f..2ef700d 100644
--- a/plugins/org.eclipse.bpel.ui/monkey/currentSelection.js
+++ b/plugins/org.eclipse.bpel.ui/monkey/currentSelection.js
@@ -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.ui/monkey/xpath.js b/plugins/org.eclipse.bpel.ui/monkey/xpath.js
index e5fedc9..058b007 100644
--- a/plugins/org.eclipse.bpel.ui/monkey/xpath.js
+++ b/plugins/org.eclipse.bpel.ui/monkey/xpath.js
@@ -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.ui/plugin.properties b/plugins/org.eclipse.bpel.ui/plugin.properties
index b400302..8d7d99a 100644
--- a/plugins/org.eclipse.bpel.ui/plugin.properties
+++ b/plugins/org.eclipse.bpel.ui/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:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.bpel.ui/src/bpelexpression.properties b/plugins/org.eclipse.bpel.ui/src/bpelexpression.properties
index 03088d3..99ca459 100644
--- a/plugins/org.eclipse.bpel.ui/src/bpelexpression.properties
+++ b/plugins/org.eclipse.bpel.ui/src/bpelexpression.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.ui/src/org/eclipse/bpel/ui/BPELAdaptingSelectionProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELAdaptingSelectionProvider.java
index 5b1a546..1f9b757 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELAdaptingSelectionProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELAdaptingSelectionProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/BPELContentDescriber.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELContentDescriber.java
index 68599eb..8c9c75f 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELContentDescriber.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELContentDescriber.java
@@ -2,8 +2,10 @@
  * Copyright (c) 2010, 2012 Red Hat, Inc. 

  * Distributed under license by Red Hat, Inc. All rights reserved. 

  * This program is 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 

+ * Eclipse Public License 2.0 which accompanies this distribution, 

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

  * 

  * Contributors: 

  * Red Hat, Inc. - initial API and implementation 

diff --git a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELEditDomain.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELEditDomain.java
index e869bc6..0914b70 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELEditDomain.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELEditDomain.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/BPELEditor.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELEditor.java
index 253479e..9a49ee0 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELEditor.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELEditor.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/BPELGraphicalKeyHandler.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELGraphicalKeyHandler.java
index 50e88ce..2d900e0 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELGraphicalKeyHandler.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELGraphicalKeyHandler.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/BPELLinkCreationFactory.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELLinkCreationFactory.java
index 7503809..ad17d61 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELLinkCreationFactory.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELLinkCreationFactory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/BPELModelAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELModelAdapter.java
index dc44698..b5cb997 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELModelAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELModelAdapter.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.ui/src/org/eclipse/bpel/ui/BPELModelReconcileAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELModelReconcileAdapter.java
index 752110e..de35b15 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELModelReconcileAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELModelReconcileAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

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

diff --git a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELMultiPageEditorActionBarContributor.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELMultiPageEditorActionBarContributor.java
index c10267c..bad6474 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELMultiPageEditorActionBarContributor.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELMultiPageEditorActionBarContributor.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

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

  *    Oleg Danilov, Intel - Initial API and Implementation

diff --git a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELMultipageEditorPart.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELMultipageEditorPart.java
index 38173f6..755110f 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELMultipageEditorPart.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELMultipageEditorPart.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2012 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:
  *    Vitaly Tishkov, Intel - Initial API and Implementation
diff --git a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELResourceChangeListener.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELResourceChangeListener.java
index 18644db..a8bfd26 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELResourceChangeListener.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELResourceChangeListener.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/BPELTabbedPropertySheetPage.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELTabbedPropertySheetPage.java
index f97416d..4e9c139 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELTabbedPropertySheetPage.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELTabbedPropertySheetPage.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/BPELUIPlugin.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELUIPlugin.java
index 5c3672f..8c8f517 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELUIPlugin.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELUIPlugin.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/GraphicalBPELRootEditPart.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/GraphicalBPELRootEditPart.java
index 7086f68..e091511 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/GraphicalBPELRootEditPart.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/GraphicalBPELRootEditPart.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/IBPELUIConstants.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/IBPELUIConstants.java
index cbe7b2f..cf9d1d4 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/IBPELUIConstants.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/IBPELUIConstants.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/IFileChangeListener.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/IFileChangeListener.java
index 8177a93..f203374 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/IFileChangeListener.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/IFileChangeListener.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/IHelpContextIds.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/IHelpContextIds.java
index b4e633c..5132699 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/IHelpContextIds.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/IHelpContextIds.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/IHoverHelper.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/IHoverHelper.java
index 34124b3..c2d2014 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/IHoverHelper.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/IHoverHelper.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/IHoverHelperSupport.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/IHoverHelperSupport.java
index d5efbd7..f1db62d 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/IHoverHelperSupport.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/IHoverHelperSupport.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/LinkNotificationAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/LinkNotificationAdapter.java
index ee70b9a..4e9c411 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/LinkNotificationAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/LinkNotificationAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/Messages.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Messages.java
index dc6379a..cfc2940 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Messages.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Messages.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/ModelListenerAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/ModelListenerAdapter.java
index 8dfac82..f1750d8 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/ModelListenerAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/ModelListenerAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/Policy.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Policy.java
index 5138f25..5329997 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Policy.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Policy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/ProcessContextMenuProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/ProcessContextMenuProvider.java
index acb3dfc..f95404f 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/ProcessContextMenuProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/ProcessContextMenuProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/ScrollingBPELGraphicalViewer.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/ScrollingBPELGraphicalViewer.java
index 449e928..7cce7fa 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/ScrollingBPELGraphicalViewer.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/ScrollingBPELGraphicalViewer.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/Templates.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Templates.java
index a02e3c5..ee4f265 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Templates.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Templates.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2006, 2012 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

diff --git a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/WeakMultiViewerSelectionProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/WeakMultiViewerSelectionProvider.java
index bddc47e..daa52be 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/WeakMultiViewerSelectionProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/WeakMultiViewerSelectionProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/AbstractDeclarationAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/AbstractDeclarationAction.java
index df44f88..56a9d1a 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/AbstractDeclarationAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/AbstractDeclarationAction.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.ui/src/org/eclipse/bpel/ui/actions/AppendNewAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/AppendNewAction.java
index 4764722..3077bad 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/AppendNewAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/AppendNewAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/AutoArrangeFlowsAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/AutoArrangeFlowsAction.java
index 993587e..bebc16d 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/AutoArrangeFlowsAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/AutoArrangeFlowsAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/BPELAddChildInTrayAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/BPELAddChildInTrayAction.java
index b938ad8..1073daa 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/BPELAddChildInTrayAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/BPELAddChildInTrayAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/BPELCopyAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/BPELCopyAction.java
index e8632c4..57f83b3 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/BPELCopyAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/BPELCopyAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/BPELCutAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/BPELCutAction.java
index 23f3f74..fdd9fe8 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/BPELCutAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/BPELCutAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/BPELDeleteAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/BPELDeleteAction.java
index c86e5dc..74d465f 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/BPELDeleteAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/BPELDeleteAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/BPELDuplicateAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/BPELDuplicateAction.java
index 5587ff9..15c9989 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/BPELDuplicateAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/BPELDuplicateAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/BPELPasteAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/BPELPasteAction.java
index 4e40a79..a59a739 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/BPELPasteAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/BPELPasteAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/BPELPrintAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/BPELPrintAction.java
index 010cf4d..f5c43c8 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/BPELPrintAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/BPELPrintAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/ChangeTypeAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/ChangeTypeAction.java
index 6a4a3e7..2058bd9 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/ChangeTypeAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/ChangeTypeAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/CreateCorrelationSetAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/CreateCorrelationSetAction.java
index 3cc1df2..5778779 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/CreateCorrelationSetAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/CreateCorrelationSetAction.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.ui/src/org/eclipse/bpel/ui/actions/CreateMessageExchangeAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/CreateMessageExchangeAction.java
index eebd5dc..f31311d 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/CreateMessageExchangeAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/CreateMessageExchangeAction.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.ui/src/org/eclipse/bpel/ui/actions/CreatePartnerLinkAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/CreatePartnerLinkAction.java
index 71f478a..be7b986 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/CreatePartnerLinkAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/CreatePartnerLinkAction.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.ui/src/org/eclipse/bpel/ui/actions/CreateVariableAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/CreateVariableAction.java
index 1ffb7b5..9d08d94 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/CreateVariableAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/CreateVariableAction.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.ui/src/org/eclipse/bpel/ui/actions/EditAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/EditAction.java
index baff1e6..a2337ff 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/EditAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/EditAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/actions/EditPartContextAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/EditPartContextAction.java
index 8b1ab34..02f7685 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/EditPartContextAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/EditPartContextAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/InsertNewAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/InsertNewAction.java
index 72ca493..bff7266 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/InsertNewAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/InsertNewAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/MakePartner2WayAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/MakePartner2WayAction.java
index 6bf22c0..e98ff63 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/MakePartner2WayAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/MakePartner2WayAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/RenameAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/RenameAction.java
index 27eecbf..d964c3f 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/RenameAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/RenameAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/RevertAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/RevertAction.java
index 12dced6..1c2f910 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/RevertAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/RevertAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/RevertRetargetAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/RevertRetargetAction.java
index 4dd6079..cdbd96d 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/RevertRetargetAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/RevertRetargetAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/SaveImageAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/SaveImageAction.java
index e22bdc7..4d1282c 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/SaveImageAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/SaveImageAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2007, 2012 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:

  *    Oleg Danilov, Intel - Initial API and Implementation

diff --git a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/ShowPaletteInPaletteViewAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/ShowPaletteInPaletteViewAction.java
index 24aa51e..2b4c9dc 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/ShowPaletteInPaletteViewAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/ShowPaletteInPaletteViewAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/ShowPropertiesViewAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/ShowPropertiesViewAction.java
index b7f1205..e9890fd 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/ShowPropertiesViewAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/ShowPropertiesViewAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/ShowViewAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/ShowViewAction.java
index be5420c..c3883ec 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/ShowViewAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/ShowViewAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/ToggleAutoFlowLayout.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/ToggleAutoFlowLayout.java
index 4ea8785..0984cd7 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/ToggleAutoFlowLayout.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/ToggleAutoFlowLayout.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/ToggleLayoutOrientationAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/ToggleLayoutOrientationAction.java
index cbcf791..cfe90d3 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/ToggleLayoutOrientationAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/ToggleLayoutOrientationAction.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.ui/src/org/eclipse/bpel/ui/actions/ToggleShowCompensationHandler.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/ToggleShowCompensationHandler.java
index e6cf0b6..99ca375 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/ToggleShowCompensationHandler.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/ToggleShowCompensationHandler.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/ToggleShowEventHandler.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/ToggleShowEventHandler.java
index 4e11f73..07a8dca 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/ToggleShowEventHandler.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/ToggleShowEventHandler.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/ToggleShowFaultHandler.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/ToggleShowFaultHandler.java
index 135731d..ea46105 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/ToggleShowFaultHandler.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/ToggleShowFaultHandler.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/ToggleShowTerminationHandler.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/ToggleShowTerminationHandler.java
index aa12631..d4c12aa 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/ToggleShowTerminationHandler.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/ToggleShowTerminationHandler.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/editpart/AbstractAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/AbstractAction.java
index e6058ea..10c2fa3 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/AbstractAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/AbstractAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateCatchAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateCatchAction.java
index f35abce..fab2652 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateCatchAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateCatchAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateCatchAllAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateCatchAllAction.java
index c59d675..1b8211f 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateCatchAllAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateCatchAllAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateCompensationHandlerAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateCompensationHandlerAction.java
index f24332d..c0ec854 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateCompensationHandlerAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateCompensationHandlerAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateElseAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateElseAction.java
index 154f41d..e3f70af 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateElseAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateElseAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateElseIfAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateElseIfAction.java
index 1927f93..fe02f8b 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateElseIfAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateElseIfAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateEventHandlerAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateEventHandlerAction.java
index 33381f9..926abe1 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateEventHandlerAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateEventHandlerAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateFaultHandlerAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateFaultHandlerAction.java
index 843950f..9c2e6fe 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateFaultHandlerAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateFaultHandlerAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateFlowLinkAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateFlowLinkAction.java
index d930859..0928062 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateFlowLinkAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateFlowLinkAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateOnAlarmAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateOnAlarmAction.java
index 505c771..6c269aa 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateOnAlarmAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateOnAlarmAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateOnEventAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateOnEventAction.java
index 306f642..f302fec 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateOnEventAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateOnEventAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateOnMessageAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateOnMessageAction.java
index faddcf9..b485fb9 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateOnMessageAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateOnMessageAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateProcessEventHandlerAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateProcessEventHandlerAction.java
index f986768..d682fae 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateProcessEventHandlerAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateProcessEventHandlerAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateProcessFaultHandlerAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateProcessFaultHandlerAction.java
index c0c050c..77fca9a 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateProcessFaultHandlerAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateProcessFaultHandlerAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateTerminationHandlerAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateTerminationHandlerAction.java
index 250ab6e..c66a085 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateTerminationHandlerAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/CreateTerminationHandlerAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/editpart/IEditPartAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/IEditPartAction.java
index 78cf633..cb850d3 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/IEditPartAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/IEditPartAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/editpart/SetCompensateLinkAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/SetCompensateLinkAction.java
index fd37062..39d27b3 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/SetCompensateLinkAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/SetCompensateLinkAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/editpart/SetPartnerLinkAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/SetPartnerLinkAction.java
index b248438..89ac2c0 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/SetPartnerLinkAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/SetPartnerLinkAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/actions/editpart/SetVariableAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/SetVariableAction.java
index 55a11f7..7f9cdb6 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/SetVariableAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/actions/editpart/SetVariableAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/ActivityAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ActivityAdapter.java
index 6ec1a7f..b4b9938 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ActivityAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ActivityAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/AdapterFactory.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/AdapterFactory.java
index d59ad94..bf6e9df 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/AdapterFactory.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/AdapterFactory.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.ui/src/org/eclipse/bpel/ui/adapters/AdapterNotification.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/AdapterNotification.java
index b7a8410..8fef601 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/AdapterNotification.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/AdapterNotification.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/adapters/AnnotationHelper.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/AnnotationHelper.java
index 8e8c02d..fbd5ed7 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/AnnotationHelper.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/AnnotationHelper.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2012 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:
  *    Oleg Danilov, Intel - Initial API and Implementation
diff --git a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/AssignAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/AssignAdapter.java
index 31eacb0..68b4380 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/AssignAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/AssignAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/BPELUIAdapterFactory.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/BPELUIAdapterFactory.java
index c21f265..c3102fe 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/BPELUIAdapterFactory.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/BPELUIAdapterFactory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/BPELUIExtensionAdapterFactory.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/BPELUIExtensionAdapterFactory.java
index 8efe2cd..35fc442 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/BPELUIExtensionAdapterFactory.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/BPELUIExtensionAdapterFactory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/BPELUIMessagePropertiesAdapterFactory.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/BPELUIMessagePropertiesAdapterFactory.java
index cd0ccec..e92d670 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/BPELUIMessagePropertiesAdapterFactory.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/BPELUIMessagePropertiesAdapterFactory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/BPELUIPartnerLinkTypeAdapterFactory.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/BPELUIPartnerLinkTypeAdapterFactory.java
index a3f7756..c85b70a 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/BPELUIPartnerLinkTypeAdapterFactory.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/BPELUIPartnerLinkTypeAdapterFactory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/BPELUIWSDLAdapterFactory.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/BPELUIWSDLAdapterFactory.java
index 72e2953..7db1aea 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/BPELUIWSDLAdapterFactory.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/BPELUIWSDLAdapterFactory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/BPELUIWSILAdapterFactory.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/BPELUIWSILAdapterFactory.java
index 41d54d3..461debf 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/BPELUIWSILAdapterFactory.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/BPELUIWSILAdapterFactory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/BPELUIXSDAdapterFactory.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/BPELUIXSDAdapterFactory.java
index 7731a54..47c391e 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/BPELUIXSDAdapterFactory.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/BPELUIXSDAdapterFactory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/CatchAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/CatchAdapter.java
index dca3a4a..53662f3 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/CatchAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/CatchAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/CatchAllAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/CatchAllAdapter.java
index fae2f1c..e708cdc 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/CatchAllAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/CatchAllAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/CompensateAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/CompensateAdapter.java
index 7128a4d..8ad4433 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/CompensateAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/CompensateAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/CompensateScopeAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/CompensateScopeAdapter.java
index 2009518..4f46b3b 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/CompensateScopeAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/CompensateScopeAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/CompensationHandlerAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/CompensationHandlerAdapter.java
index 8469fe0..5f6a6e1 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/CompensationHandlerAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/CompensationHandlerAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/ContainerActivityAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ContainerActivityAdapter.java
index 793a668..d6d3534 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ContainerActivityAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ContainerActivityAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/ContainerAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ContainerAdapter.java
index 6db7185..35d36ba 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ContainerAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ContainerAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/CopyAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/CopyAdapter.java
index 7c9a203..94e08da 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/CopyAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/CopyAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/CorrelationSetAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/CorrelationSetAdapter.java
index e2c5172..9829462 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/CorrelationSetAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/CorrelationSetAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/CorrelationSetsAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/CorrelationSetsAdapter.java
index 6a06028..821b79b 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/CorrelationSetsAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/CorrelationSetsAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/CustomActivityAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/CustomActivityAdapter.java
index 00beba9..8a5dc73 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/CustomActivityAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/CustomActivityAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/DefinitionAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/DefinitionAdapter.java
index 5af725b..2020adf 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/DefinitionAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/DefinitionAdapter.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.ui.adapters;

 

diff --git a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ElseAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ElseAdapter.java
index f798a33..b135349 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ElseAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ElseAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/ElseIfAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ElseIfAdapter.java
index 01c9a75..5f0b2f2 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ElseIfAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ElseIfAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/EmptyAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/EmptyAdapter.java
index 92c4102..2a5f1fc 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/EmptyAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/EmptyAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/EndNodeAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/EndNodeAdapter.java
index 3a8dd8e..06911e2 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/EndNodeAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/EndNodeAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/EventHandlerAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/EventHandlerAdapter.java
index 696ee9c..7d59934 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/EventHandlerAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/EventHandlerAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/ExitAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ExitAdapter.java
index 3af0a97..be077f3 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ExitAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ExitAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/ExpressionAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ExpressionAdapter.java
index a9ac92d..f96a4bc 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ExpressionAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ExpressionAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/adapters/ExtensionActivityAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ExtensionActivityAdapter.java
index ba3d527..e2f0f0d 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ExtensionActivityAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ExtensionActivityAdapter.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.ui.adapters;

 

diff --git a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/FaultAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/FaultAdapter.java
index 38e273d..8631061 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/FaultAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/FaultAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/FaultHandlerAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/FaultHandlerAdapter.java
index 19804de..6c329b5 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/FaultHandlerAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/FaultHandlerAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/FlowAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/FlowAdapter.java
index 35af9e5..bb92b19 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/FlowAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/FlowAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/ForEachAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ForEachAdapter.java
index 51bae68..27b0696 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ForEachAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ForEachAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/FromAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/FromAdapter.java
index 0688cc7..2307ef4 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/FromAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/FromAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/adapters/IAnnotatedElement.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/IAnnotatedElement.java
index fbba741..755c5ae 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/IAnnotatedElement.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/IAnnotatedElement.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2007, 2012 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:

  *    Oleg Danilov, Intel - Initial API and Implementation

diff --git a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ICompensationHandlerHolder.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ICompensationHandlerHolder.java
index d56664c..7b6d9a8 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ICompensationHandlerHolder.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ICompensationHandlerHolder.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/IContainer.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/IContainer.java
index 6d46b72..6189b09 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/IContainer.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/IContainer.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/IEditPartActionContributor.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/IEditPartActionContributor.java
index edd4260..daa4e5e 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/IEditPartActionContributor.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/IEditPartActionContributor.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/IEventHandlerHolder.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/IEventHandlerHolder.java
index 7eac310..6abb98e 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/IEventHandlerHolder.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/IEventHandlerHolder.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/IExtensionFactory.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/IExtensionFactory.java
index e5168c8..b8b1962 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/IExtensionFactory.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/IExtensionFactory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/IFaultHandlerHolder.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/IFaultHandlerHolder.java
index 726355a..c1aa7e9 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/IFaultHandlerHolder.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/IFaultHandlerHolder.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/ILabeledElement.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ILabeledElement.java
index f650c9b..8a66b2f 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ILabeledElement.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ILabeledElement.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/IMarkerHolder.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/IMarkerHolder.java
index d432283..5c76e70 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/IMarkerHolder.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/IMarkerHolder.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/INamedElement.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/INamedElement.java
index 7ea1beb..812de40 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/INamedElement.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/INamedElement.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/IOutlineEditPartFactory.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/IOutlineEditPartFactory.java
index 7c7807e..dc65f75 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/IOutlineEditPartFactory.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/IOutlineEditPartFactory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/ITerminationHandlerHolder.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ITerminationHandlerHolder.java
index 56d11a7..7e794b2 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ITerminationHandlerHolder.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ITerminationHandlerHolder.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/ITrayEditPartFactory.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ITrayEditPartFactory.java
index 788b698..4b263ad 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ITrayEditPartFactory.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ITrayEditPartFactory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/IVirtualCopyRuleSide.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/IVirtualCopyRuleSide.java
index 7a658b6..4d48a83 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/IVirtualCopyRuleSide.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/IVirtualCopyRuleSide.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/adapters/IfAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/IfAdapter.java
index 8878497..f66d41a 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/IfAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/IfAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/InputMessageAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/InputMessageAdapter.java
index ea00b77..201a1aa 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/InputMessageAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/InputMessageAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/InvokeAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/InvokeAdapter.java
index 5274775..a873985 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/InvokeAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/InvokeAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/JavaThrowableAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/JavaThrowableAdapter.java
index c95993f..b62df3f 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/JavaThrowableAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/JavaThrowableAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/LinkAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/LinkAdapter.java
index ac2299f..294d618 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/LinkAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/LinkAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/MarkerAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/MarkerAdapter.java
index 2f0ee6a..f537cf8 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/MarkerAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/MarkerAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/MarkerDelegateAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/MarkerDelegateAdapter.java
index 457544a..bbefbe1 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/MarkerDelegateAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/MarkerDelegateAdapter.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.ui.adapters;

 

diff --git a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/MarkerHolderAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/MarkerHolderAdapter.java
index 480776a..d01df0b 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/MarkerHolderAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/MarkerHolderAdapter.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.ui.adapters;

 

diff --git a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/MessageAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/MessageAdapter.java
index 5d84591..66192f1 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/MessageAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/MessageAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/MessageExchangeAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/MessageExchangeAdapter.java
index 8293599..99f471c 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/MessageExchangeAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/MessageExchangeAdapter.java
@@ -2,9 +2,11 @@
  * <copyright>
  * 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.ui/src/org/eclipse/bpel/ui/adapters/MessageExchangesAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/MessageExchangesAdapter.java
index d8ae999..2858304 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/MessageExchangesAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/MessageExchangesAdapter.java
@@ -2,9 +2,11 @@
  * <copyright>

  * 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.ui/src/org/eclipse/bpel/ui/adapters/Messages.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/Messages.java
index b0f3c7e..c06e10c 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/Messages.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/Messages.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2012 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:
  *    Oleg Danilov, Intel - Initial API and Implementation
diff --git a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/OnAlarmAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/OnAlarmAdapter.java
index 2f43c65..8a56437 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/OnAlarmAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/OnAlarmAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/OnEventAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/OnEventAdapter.java
index 8b655ff..b497d0a 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/OnEventAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/OnEventAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/OnMessageAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/OnMessageAdapter.java
index 4d76aa9..8527a14 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/OnMessageAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/OnMessageAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/OpaqueActivityAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/OpaqueActivityAdapter.java
index 962ff5b..becc0fe 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/OpaqueActivityAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/OpaqueActivityAdapter.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.ui/src/org/eclipse/bpel/ui/adapters/OperationAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/OperationAdapter.java
index 7bcf993..b298cf0 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/OperationAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/OperationAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/OutputMessageAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/OutputMessageAdapter.java
index 78481b3..f68676b 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/OutputMessageAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/OutputMessageAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/PartAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/PartAdapter.java
index f29d37c..4aff4e7 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/PartAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/PartAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/PartnerLinkAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/PartnerLinkAdapter.java
index bc9f4c8..8f613f3 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/PartnerLinkAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/PartnerLinkAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/PartnerLinkTypeAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/PartnerLinkTypeAdapter.java
index 28cb107..21fc6f9 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/PartnerLinkTypeAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/PartnerLinkTypeAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/PartnerLinksAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/PartnerLinksAdapter.java
index 777d1d7..c8248d9 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/PartnerLinksAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/PartnerLinksAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/PickAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/PickAdapter.java
index 75ea13b..94542bc 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/PickAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/PickAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/PortTypeAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/PortTypeAdapter.java
index f133606..25748be 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/PortTypeAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/PortTypeAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/ProcessAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ProcessAdapter.java
index e12c04f..82d63f3 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ProcessAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ProcessAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/PropertyAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/PropertyAdapter.java
index 01273af..a8f7d11 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/PropertyAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/PropertyAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/PropertyAliasAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/PropertyAliasAdapter.java
index 0efe3e4..8da6c05 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/PropertyAliasAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/PropertyAliasAdapter.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.ui.adapters;

 

diff --git a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ReceiveAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ReceiveAdapter.java
index 90d2594..95ef6cd 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ReceiveAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ReceiveAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/ReferencePartnerLinksAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ReferencePartnerLinksAdapter.java
index e7ebaf7..d9f7cff 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ReferencePartnerLinksAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ReferencePartnerLinksAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/RepeatUntilAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/RepeatUntilAdapter.java
index a4df386..3036e66 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/RepeatUntilAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/RepeatUntilAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/ReplyAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ReplyAdapter.java
index 54fba61..3f0a798 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ReplyAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ReplyAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/RethrowAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/RethrowAdapter.java
index 43f3f72..44bf906 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/RethrowAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/RethrowAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/RoleAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/RoleAdapter.java
index 869f8fb..c24c4d5 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/RoleAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/RoleAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/RolePortTypeAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/RolePortTypeAdapter.java
index bc2ee02..b994722 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/RolePortTypeAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/RolePortTypeAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/ScopeAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ScopeAdapter.java
index e8209f6..399484e 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ScopeAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ScopeAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/SequenceAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/SequenceAdapter.java
index 88aeb2b..6fc8d8c 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/SequenceAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/SequenceAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/StartNodeAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/StartNodeAdapter.java
index 5505f06..5cbcb56 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/StartNodeAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/StartNodeAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/TerminationHandlerAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/TerminationHandlerAdapter.java
index 3ec1c00..cf8b7c6 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/TerminationHandlerAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/TerminationHandlerAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/ThrowAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ThrowAdapter.java
index 4987979..1876f80 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ThrowAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ThrowAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/ToAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ToAdapter.java
index b184d43..47ad5a4 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ToAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ToAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/adapters/ValidateAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ValidateAdapter.java
index e326ef2..54737b1 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ValidateAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/ValidateAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/VariableAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/VariableAdapter.java
index 4f9d3df..9e1d66a 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/VariableAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/VariableAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/VariablesAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/VariablesAdapter.java
index 13b8621..4730a72 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/VariablesAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/VariablesAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/WSILInspectionAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/WSILInspectionAdapter.java
index b386566..14039e1 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/WSILInspectionAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/WSILInspectionAdapter.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.ui/src/org/eclipse/bpel/ui/adapters/WSILLinkAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/WSILLinkAdapter.java
index bd748ba..031f8f8 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/WSILLinkAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/WSILLinkAdapter.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.ui/src/org/eclipse/bpel/ui/adapters/WSILServiceAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/WSILServiceAdapter.java
index cc40750..f2b0e40 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/WSILServiceAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/WSILServiceAdapter.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.ui/src/org/eclipse/bpel/ui/adapters/WaitAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/WaitAdapter.java
index b97a620..0dbe55f 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/WaitAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/WaitAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/WhileAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/WhileAdapter.java
index cd4b5b0..ee72507 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/WhileAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/WhileAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/XSDAbstractAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/XSDAbstractAdapter.java
index 7603548..d688381 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/XSDAbstractAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/XSDAbstractAdapter.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.ui/src/org/eclipse/bpel/ui/adapters/XSDAttributeDeclarationAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/XSDAttributeDeclarationAdapter.java
index f54bde1..22aef45 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/XSDAttributeDeclarationAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/XSDAttributeDeclarationAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/XSDComplexTypeDefinitionAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/XSDComplexTypeDefinitionAdapter.java
index cd0ad91..7b0f271 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/XSDComplexTypeDefinitionAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/XSDComplexTypeDefinitionAdapter.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.ui/src/org/eclipse/bpel/ui/adapters/XSDElementDeclarationAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/XSDElementDeclarationAdapter.java
index 81833b6..95cb44a 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/XSDElementDeclarationAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/XSDElementDeclarationAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/XSDSchemaAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/XSDSchemaAdapter.java
index 83312a7..4f43053 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/XSDSchemaAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/XSDSchemaAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/XSDSimpleTypeDefinitionAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/XSDSimpleTypeDefinitionAdapter.java
index 5939e73..55d5054 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/XSDSimpleTypeDefinitionAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/XSDSimpleTypeDefinitionAdapter.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.ui/src/org/eclipse/bpel/ui/adapters/XSDTypeDefinitionAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/XSDTypeDefinitionAdapter.java
index 7ec1e08..2276a57 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/XSDTypeDefinitionAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/XSDTypeDefinitionAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/delegates/AbstractContainer.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/delegates/AbstractContainer.java
index 7708a21..c4587be 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/delegates/AbstractContainer.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/delegates/AbstractContainer.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/delegates/ActivityContainer.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/delegates/ActivityContainer.java
index 61baab7..5a77bb9 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/delegates/ActivityContainer.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/delegates/ActivityContainer.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/delegates/IndirectContainer.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/delegates/IndirectContainer.java
index cbe1139..9b27e2f 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/delegates/IndirectContainer.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/delegates/IndirectContainer.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/delegates/MultiContainer.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/delegates/MultiContainer.java
index 424f19a..84dfb0c 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/delegates/MultiContainer.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/delegates/MultiContainer.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/delegates/OptionalIndirectContainer.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/delegates/OptionalIndirectContainer.java
index 8899a6d..7c92194 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/delegates/OptionalIndirectContainer.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/delegates/OptionalIndirectContainer.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/delegates/ReferenceContainer.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/delegates/ReferenceContainer.java
index 49e0700..243b9a1 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/delegates/ReferenceContainer.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/delegates/ReferenceContainer.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/adapters/messages.properties b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/messages.properties
index 799d48b..bf36d07 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/messages.properties
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/adapters/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
@@ -11,9 +13,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:
 #    Oleg Danilov, Intel - Initial API and Implementation
diff --git a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/bpelactions/AbstractBPELAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/bpelactions/AbstractBPELAction.java
index 98657b8..fb2a618 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/bpelactions/AbstractBPELAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/bpelactions/AbstractBPELAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/bpelactions/AssignAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/bpelactions/AssignAction.java
index c7cd4be..2db8644 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/bpelactions/AssignAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/bpelactions/AssignAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/bpelactions/InvokeAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/bpelactions/InvokeAction.java
index c2fcc85..b45e3f3 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/bpelactions/InvokeAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/bpelactions/InvokeAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/bpelactions/ReceiveAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/bpelactions/ReceiveAction.java
index 9369839..34558e4 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/bpelactions/ReceiveAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/bpelactions/ReceiveAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/bpelactions/ReplyAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/bpelactions/ReplyAction.java
index 2dfc3cd..7b5fe8a 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/bpelactions/ReplyAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/bpelactions/ReplyAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/bpelactions/SimpleAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/bpelactions/SimpleAction.java
index 32bd94f..91ac8cb 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/bpelactions/SimpleAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/bpelactions/SimpleAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/AddCopyCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddCopyCommand.java
index 4452298..0bdc3c1 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddCopyCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddCopyCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/AddCorrelationCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddCorrelationCommand.java
index 8c55152..8afd5c7 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddCorrelationCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddCorrelationCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/AddFromPartCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddFromPartCommand.java
index 328ea7a..b50cbae 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddFromPartCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddFromPartCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2007, 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.ui/src/org/eclipse/bpel/ui/commands/AddImportCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddImportCommand.java
index 5b989b2..0d94cae 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddImportCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddImportCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/AddLinkCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddLinkCommand.java
index 42ae3e2..dad8945 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddLinkCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddLinkCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/AddMessageExchangeCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddMessageExchangeCommand.java
index 30c0acc..9db9f0c 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddMessageExchangeCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddMessageExchangeCommand.java
@@ -2,9 +2,11 @@
  * <copyright>

  * 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.ui/src/org/eclipse/bpel/ui/commands/AddPartnerLinkCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddPartnerLinkCommand.java
index 3eee138..4267baf 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddPartnerLinkCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddPartnerLinkCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/AddPropertyCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddPropertyCommand.java
index 329ce7f..0ea62c0 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddPropertyCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddPropertyCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/AddRoleCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddRoleCommand.java
index 2ab1e2f..95ca722 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddRoleCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddRoleCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/AddToListCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddToListCommand.java
index 7e18273..777db64 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddToListCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddToListCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/AddToPartCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddToPartCommand.java
index eef3cee..c00214a 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddToPartCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddToPartCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2007, 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.ui/src/org/eclipse/bpel/ui/commands/AddVariableCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddVariableCommand.java
index 2570cbe..95058cf 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddVariableCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddVariableCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/AddVariableToValidateCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddVariableToValidateCommand.java
index 2a4e6f4..7c68363 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddVariableToValidateCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddVariableToValidateCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 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.ui/src/org/eclipse/bpel/ui/commands/AddWSDLImportCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddWSDLImportCommand.java
index 4adc7e1..f64a67f 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddWSDLImportCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/AddWSDLImportCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/BPELCopyCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/BPELCopyCommand.java
index 1317e90..e7239ae 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/BPELCopyCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/BPELCopyCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/BPELPasteCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/BPELPasteCommand.java
index d742517..f6b834c 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/BPELPasteCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/BPELPasteCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/CompoundCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/CompoundCommand.java
index 8d2eab2..0729262 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/CompoundCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/CompoundCommand.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.ui/src/org/eclipse/bpel/ui/commands/CreatePartnerLinkTypeCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/CreatePartnerLinkTypeCommand.java
index 7ccc201..92498d4 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/CreatePartnerLinkTypeCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/CreatePartnerLinkTypeCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/CreatePropertyAliasCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/CreatePropertyAliasCommand.java
index 5afdbb5..f185dd9 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/CreatePropertyAliasCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/CreatePropertyAliasCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/CreatePropertyCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/CreatePropertyCommand.java
index 64ce21a..e97429c 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/CreatePropertyCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/CreatePropertyCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/CreateWSDLExtensibilityElementCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/CreateWSDLExtensibilityElementCommand.java
index dcb1aeb..b27774e 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/CreateWSDLExtensibilityElementCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/CreateWSDLExtensibilityElementCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/DeleteChildCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/DeleteChildCommand.java
index 8aaac7c..916e75a 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/DeleteChildCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/DeleteChildCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/DeleteLinkCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/DeleteLinkCommand.java
index 45899b7..eaa34dc 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/DeleteLinkCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/DeleteLinkCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/DeleteNonContainmentRefsCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/DeleteNonContainmentRefsCommand.java
index 6baba6c..aa32b97 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/DeleteNonContainmentRefsCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/DeleteNonContainmentRefsCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/DeletePartnerLinkTypeCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/DeletePartnerLinkTypeCommand.java
index ef673d5..66669b3 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/DeletePartnerLinkTypeCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/DeletePartnerLinkTypeCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/DeletePropertyAliasCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/DeletePropertyAliasCommand.java
index fe4f354..4fa6d04 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/DeletePropertyAliasCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/DeletePropertyAliasCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/DeletePropertyCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/DeletePropertyCommand.java
index 5ffb4f7..5351a53 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/DeletePropertyCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/DeletePropertyCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/DeleteWSDLExtensibilityElementCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/DeleteWSDLExtensibilityElementCommand.java
index 396aacb..b479de6 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/DeleteWSDLExtensibilityElementCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/DeleteWSDLExtensibilityElementCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/InsertCopyCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/InsertCopyCommand.java
index 6bcb27f..90499b7 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/InsertCopyCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/InsertCopyCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

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

  *    Oleg Danilov, Intel - Initial API and Implementation

diff --git a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/InsertInContainerCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/InsertInContainerCommand.java
index a6c4e60..05c04e8 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/InsertInContainerCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/InsertInContainerCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/InsertToListCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/InsertToListCommand.java
index cb1e9fd..f6f0a27 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/InsertToListCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/InsertToListCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

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

  *    Oleg Danilov, Intel - Initial API and Implementation

diff --git a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/MoveTargetCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/MoveTargetCommand.java
index 14702e5..2ddddcf 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/MoveTargetCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/MoveTargetCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/OrphanChildCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/OrphanChildCommand.java
index 59eb45d..f4fa213 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/OrphanChildCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/OrphanChildCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/RemoveCopyCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/RemoveCopyCommand.java
index e97d80b..3f3d864 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/RemoveCopyCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/RemoveCopyCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/RemoveCorrelationCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/RemoveCorrelationCommand.java
index 2cdc1d0..9fa1782 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/RemoveCorrelationCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/RemoveCorrelationCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/RemoveFromListCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/RemoveFromListCommand.java
index 17c96ef..592548e 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/RemoveFromListCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/RemoveFromListCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/RemoveImportCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/RemoveImportCommand.java
index 159bbbd..4bab988 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/RemoveImportCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/RemoveImportCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/commands/RemovePropertyCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/RemovePropertyCommand.java
index 11740ad..d55ddec 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/RemovePropertyCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/RemovePropertyCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/RemoveRoleCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/RemoveRoleCommand.java
index fc21925..e5e5ab2 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/RemoveRoleCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/RemoveRoleCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/RemoveValidateVariableCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/RemoveValidateVariableCommand.java
index 31c390d..a28cb67 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/RemoveValidateVariableCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/RemoveValidateVariableCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 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.ui/src/org/eclipse/bpel/ui/commands/ReorderInContainerCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/ReorderInContainerCommand.java
index 7a7bedc..329e714 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/ReorderInContainerCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/ReorderInContainerCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/ReplaceInContainerCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/ReplaceInContainerCommand.java
index 56ece97..dc9928a 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/ReplaceInContainerCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/ReplaceInContainerCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/ReplaceInListCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/ReplaceInListCommand.java
index 3fee6cf..f9816bf 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/ReplaceInListCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/ReplaceInListCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/ReplacePropertyCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/ReplacePropertyCommand.java
index ead86da..76fd5d9 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/ReplacePropertyCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/ReplacePropertyCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/RestoreSelectionCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/RestoreSelectionCommand.java
index 09c3f26..a4f8a09 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/RestoreSelectionCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/RestoreSelectionCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/RestoreViewerSelectionCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/RestoreViewerSelectionCommand.java
index de98c72..f7dd6b9 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/RestoreViewerSelectionCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/RestoreViewerSelectionCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/RevalidateLinksCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/RevalidateLinksCommand.java
index 6ba1d7e..7e70a01 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/RevalidateLinksCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/RevalidateLinksCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/SetCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetCommand.java
index 379e6b4..8b6b9ac 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/SetCompensateCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetCompensateCommand.java
index 35c044f..24beb94 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetCompensateCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetCompensateCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/SetConstraintCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetConstraintCommand.java
index 4f25c52..51e2e27 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetConstraintCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetConstraintCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/SetCorrelationInitiateCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetCorrelationInitiateCommand.java
index 8dad69e..35103b6 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetCorrelationInitiateCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetCorrelationInitiateCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/SetCorrelationSetRefCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetCorrelationSetRefCommand.java
index b918f60..4a00196 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetCorrelationSetRefCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetCorrelationSetRefCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/SetCountSuccessfulBranchesOnlyCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetCountSuccessfulBranchesOnlyCommand.java
index 68e1bc9..d0cd327 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetCountSuccessfulBranchesOnlyCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetCountSuccessfulBranchesOnlyCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/SetExtensibilityElementCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetExtensibilityElementCommand.java
index 3ba97e8..16fd464 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetExtensibilityElementCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetExtensibilityElementCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/SetExtensionCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetExtensionCommand.java
index a10f4f8..048e84d 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetExtensionCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetExtensionCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/SetFaultNameCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetFaultNameCommand.java
index 286d640..8750874 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetFaultNameCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetFaultNameCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/SetFaultNamespaceCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetFaultNamespaceCommand.java
index 0e0755e..21210c4 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetFaultNamespaceCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetFaultNamespaceCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/SetForEachIsParallelCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetForEachIsParallelCommand.java
index f81bd82..8c65550 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetForEachIsParallelCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetForEachIsParallelCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/SetIsolatedCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetIsolatedCommand.java
index 92c4bed..3d9d7aa 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetIsolatedCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetIsolatedCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/SetMessageExchangeCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetMessageExchangeCommand.java
index 618ebbf..4068efa 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetMessageExchangeCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetMessageExchangeCommand.java
@@ -2,9 +2,11 @@
  * <copyright>

  * 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.ui/src/org/eclipse/bpel/ui/commands/SetNameAndDirectEditCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetNameAndDirectEditCommand.java
index d2430b8..11ffcc7 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetNameAndDirectEditCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetNameAndDirectEditCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/SetNameCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetNameCommand.java
index 79a2009..bddc1fe 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetNameCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetNameCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/SetNamespaceMappingCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetNamespaceMappingCommand.java
index ba90aa5..47aac6c 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetNamespaceMappingCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetNamespaceMappingCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/SetOnEventVariableTypeCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetOnEventVariableTypeCommand.java
index f7859a3..78e62aa 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetOnEventVariableTypeCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetOnEventVariableTypeCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/SetOperationCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetOperationCommand.java
index b0a2214..7f9d922 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetOperationCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetOperationCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/SetPartnerLinkCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetPartnerLinkCommand.java
index 879b29e..d9c24c8 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetPartnerLinkCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetPartnerLinkCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/SetPartnerLinkTypeCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetPartnerLinkTypeCommand.java
index 675d1c4..90d065d 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetPartnerLinkTypeCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetPartnerLinkTypeCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/SetPortTypeCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetPortTypeCommand.java
index 0ed9e3d..94041d0 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetPortTypeCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetPortTypeCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/SetPropertyAliasPartCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetPropertyAliasPartCommand.java
index de566e6..0ec017a 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetPropertyAliasPartCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetPropertyAliasPartCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/SetPropertyTypeCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetPropertyTypeCommand.java
index 3939cb4..1e68d1c 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetPropertyTypeCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetPropertyTypeCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/SetRoleCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetRoleCommand.java
index b96c9de..2cf429c 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetRoleCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetRoleCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/SetSelectionCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetSelectionCommand.java
index 19fddca..4caf601 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetSelectionCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetSelectionCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/commands/SetSpecCompliantProcessCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetSpecCompliantProcessCommand.java
index 9198006..dc4a6c3 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetSpecCompliantProcessCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetSpecCompliantProcessCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/SetSuppressJoinFailureCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetSuppressJoinFailureCommand.java
index 9dd1e35..03d3f67 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetSuppressJoinFailureCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetSuppressJoinFailureCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/SetUniqueNameCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetUniqueNameCommand.java
index 1149370..02d5943 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetUniqueNameCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetUniqueNameCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/SetVariableCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetVariableCommand.java
index 35e221d..a2cfad6 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetVariableCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetVariableCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/SetVariableKindCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetVariableKindCommand.java
index d8de6f3..629943f 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetVariableKindCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetVariableKindCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/SetVariableTypeCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetVariableTypeCommand.java
index a981907..d8f75bb 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetVariableTypeCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetVariableTypeCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/SetWSDLFaultCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetWSDLFaultCommand.java
index e50a357..ca37382 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetWSDLFaultCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetWSDLFaultCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/SwapCopyCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SwapCopyCommand.java
index 8d1c897..a9cfbc8 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SwapCopyCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SwapCopyCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

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

  *    Oleg Danilov, Intel - Initial API and Implementation

diff --git a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SwapInListCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SwapInListCommand.java
index 257f95b..5d84769 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SwapInListCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SwapInListCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

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

  *    Oleg Danilov, Intel - Initial API and Implementation

diff --git a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/util/AutoUndoCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/util/AutoUndoCommand.java
index be4a46e..24942d5 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/util/AutoUndoCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/util/AutoUndoCommand.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/util/IAutoUndoRecorder.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/util/IAutoUndoRecorder.java
index e2ed528..b3888af 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/util/IAutoUndoRecorder.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/util/IAutoUndoRecorder.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/util/IUndoHandler.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/util/IUndoHandler.java
index f99bbda..7b51581 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/util/IUndoHandler.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/util/IUndoHandler.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/util/ModelAutoUndoRecorder.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/util/ModelAutoUndoRecorder.java
index dff0fd2..d111bd4 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/util/ModelAutoUndoRecorder.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/util/ModelAutoUndoRecorder.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/commands/util/UpdateModelCommand.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/util/UpdateModelCommand.java
index 37eb42c..f70e090 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/util/UpdateModelCommand.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/util/UpdateModelCommand.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.ui/src/org/eclipse/bpel/ui/contentassist/ExpressionContentAssistProcessor.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/contentassist/ExpressionContentAssistProcessor.java
index b9c4313..6a57354 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/contentassist/ExpressionContentAssistProcessor.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/contentassist/ExpressionContentAssistProcessor.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/contentassist/ExpressionSourceViewerConfiguration.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/contentassist/ExpressionSourceViewerConfiguration.java
index 2a6b199..c82ec87 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/contentassist/ExpressionSourceViewerConfiguration.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/contentassist/ExpressionSourceViewerConfiguration.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/contentassist/FunctionTemplatesContentAssistProcessor.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/contentassist/FunctionTemplatesContentAssistProcessor.java
index 8f74b95..0471b71 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/contentassist/FunctionTemplatesContentAssistProcessor.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/contentassist/FunctionTemplatesContentAssistProcessor.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/contentassist/Messages.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/contentassist/Messages.java
index 2a4cdac..594ed98 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/contentassist/Messages.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/contentassist/Messages.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.ui/src/org/eclipse/bpel/ui/contentassist/XPathTemplateCompletionProcessor.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/contentassist/XPathTemplateCompletionProcessor.java
index 2f773c5..1ac00d7 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/contentassist/XPathTemplateCompletionProcessor.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/contentassist/XPathTemplateCompletionProcessor.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/contentassist/messages.properties b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/contentassist/messages.properties
index 7d6899c..a44b979 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/contentassist/messages.properties
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/contentassist/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.ui/src/org/eclipse/bpel/ui/details/providers/AbstractContentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/AbstractContentProvider.java
index 1cac65e..2e1d1bb 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/AbstractContentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/AbstractContentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/AbstractResourceContentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/AbstractResourceContentProvider.java
index 08323a4..e96d245 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/AbstractResourceContentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/AbstractResourceContentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

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

  *     Oracle Corporation

diff --git a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/AddNullFilter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/AddNullFilter.java
index 611174d..1c1c569 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/AddNullFilter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/AddNullFilter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/AddSelectedObjectFilter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/AddSelectedObjectFilter.java
index 61bf5e8..9bc4d0a 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/AddSelectedObjectFilter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/AddSelectedObjectFilter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/CachedTreeContentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/CachedTreeContentProvider.java
index 9122194..6adc5d9 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/CachedTreeContentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/CachedTreeContentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/ColumnTableProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/ColumnTableProvider.java
index 832b9f3..b40321d 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/ColumnTableProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/ColumnTableProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/CompensableActivityContentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/CompensableActivityContentProvider.java
index cb36294..da1cc10 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/CompensableActivityContentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/CompensableActivityContentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/CompositeContentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/CompositeContentProvider.java
index dbb0aba..e6e7fd9 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/CompositeContentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/CompositeContentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/details/providers/CorrelationContentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/CorrelationContentProvider.java
index e7aeac4..4a6e48f 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/CorrelationContentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/CorrelationContentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/CorrelationSetContentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/CorrelationSetContentProvider.java
index 630630a..1662e0b 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/CorrelationSetContentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/CorrelationSetContentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/DetailsLabelProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/DetailsLabelProvider.java
index bd495bf..5bff8e6 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/DetailsLabelProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/DetailsLabelProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/FaultContentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/FaultContentProvider.java
index 28f4a82..b482c4b 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/FaultContentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/FaultContentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/GatedContentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/GatedContentProvider.java
index 8c6dddb..3695683 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/GatedContentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/GatedContentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/details/providers/ImportContentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/ImportContentProvider.java
index 5eb554a..f62c284 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/ImportContentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/ImportContentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/LanguageContentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/LanguageContentProvider.java
index 900077f..3bc444f 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/LanguageContentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/LanguageContentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/details/providers/LinkContentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/LinkContentProvider.java
index 6d5f5d4..cc1523d45e 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/LinkContentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/LinkContentProvider.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.ui/src/org/eclipse/bpel/ui/details/providers/LocalVariableContentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/LocalVariableContentProvider.java
index 220a9a0..f220a63 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/LocalVariableContentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/LocalVariableContentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/MessageExchangeContentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/MessageExchangeContentProvider.java
index f0d39e7..186d0c5 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/MessageExchangeContentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/MessageExchangeContentProvider.java
@@ -2,9 +2,11 @@
  * <copyright>

  * 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.ui/src/org/eclipse/bpel/ui/details/providers/MessageTypeContentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/MessageTypeContentProvider.java
index 8a4cd76..ac12df3 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/MessageTypeContentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/MessageTypeContentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/ModelLabelProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/ModelLabelProvider.java
index f714593..173d8f5 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/ModelLabelProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/ModelLabelProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/ModelTreeContentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/ModelTreeContentProvider.java
index e9dcaf3..ac756ea 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/ModelTreeContentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/ModelTreeContentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/ModelTreeLabelProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/ModelTreeLabelProvider.java
index ce4a9bc..19bba38 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/ModelTreeLabelProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/ModelTreeLabelProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/ModelViewerSorter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/ModelViewerSorter.java
index c9d0bad..82d7779 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/ModelViewerSorter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/ModelViewerSorter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/NullHandlingLabelProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/NullHandlingLabelProvider.java
index 66b3e21..e85fe5b 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/NullHandlingLabelProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/NullHandlingLabelProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/OperationContentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/OperationContentProvider.java
index a37b681..e9ac5d0 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/OperationContentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/OperationContentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/OperationsTreeContentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/OperationsTreeContentProvider.java
index c9fc79f..c935260 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/OperationsTreeContentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/OperationsTreeContentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/PartContentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PartContentProvider.java
index 6594925..993fcb4 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PartContentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PartContentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/PartLabelProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PartLabelProvider.java
index 54d5ea3..2b82195 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PartLabelProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PartLabelProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/PartTreeContentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PartTreeContentProvider.java
index 2466fa6..37f7829 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PartTreeContentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PartTreeContentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/PartnerLinkContentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PartnerLinkContentProvider.java
index a1e5bc0..a184086 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PartnerLinkContentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PartnerLinkContentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/PartnerLinkTreeContentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PartnerLinkTreeContentProvider.java
index e775713..e50980b 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PartnerLinkTreeContentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PartnerLinkTreeContentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/PartnerLinkTypeContentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PartnerLinkTypeContentProvider.java
index f3f7486..e599c63 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PartnerLinkTypeContentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PartnerLinkTypeContentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/PartnerLinkTypeTreeContentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PartnerLinkTypeTreeContentProvider.java
index cc4382b..d7e80bf 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PartnerLinkTypeTreeContentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PartnerLinkTypeTreeContentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/PartnerRoleFilter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PartnerRoleFilter.java
index 6f144a8..41c5e9f 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PartnerRoleFilter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PartnerRoleFilter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/PortContentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PortContentProvider.java
index 157b77b..d6f3865 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PortContentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PortContentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/PortTypeContentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PortTypeContentProvider.java
index a0ab69a..0695500 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PortTypeContentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PortTypeContentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/PortTypeTreeContentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PortTypeTreeContentProvider.java
index 1cb4be0..ed74100 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PortTypeTreeContentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PortTypeTreeContentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/PropertyAliasContentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PropertyAliasContentProvider.java
index e5f2ec9..be47f39 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PropertyAliasContentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PropertyAliasContentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/PropertyAliasFilter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PropertyAliasFilter.java
index 192169e..0ea22a6 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PropertyAliasFilter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PropertyAliasFilter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/PropertyContentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PropertyContentProvider.java
index 0a73d61..62ecd82 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PropertyContentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/PropertyContentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/RoleContentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/RoleContentProvider.java
index 162d720..1a0dc3c 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/RoleContentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/RoleContentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/SeparatorContentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/SeparatorContentProvider.java
index 15237d8..f93ad07 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/SeparatorContentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/SeparatorContentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/details/providers/ServiceContentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/ServiceContentProvider.java
index c28974b..0169aa6 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/ServiceContentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/ServiceContentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/TableProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/TableProvider.java
index 6bb3687..01f6c16 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/TableProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/TableProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/UnusedPropertyFilter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/UnusedPropertyFilter.java
index f9fc426..f74899c 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/UnusedPropertyFilter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/UnusedPropertyFilter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/VariableContentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/VariableContentProvider.java
index 5a3c493..3390f88 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/VariableContentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/VariableContentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/VariableFilter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/VariableFilter.java
index b810315..5f926c2 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/VariableFilter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/VariableFilter.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.ui/src/org/eclipse/bpel/ui/details/providers/VariableTreeContentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/VariableTreeContentProvider.java
index a8c8c7f..b9ec5ea 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/VariableTreeContentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/VariableTreeContentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/VariableTypeTreeContentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/VariableTypeTreeContentProvider.java
index fc71854..af65d09 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/VariableTypeTreeContentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/VariableTypeTreeContentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/WSDLDefinitionFromResourceContentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/WSDLDefinitionFromResourceContentProvider.java
index a3d9105..86b7733 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/WSDLDefinitionFromResourceContentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/WSDLDefinitionFromResourceContentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

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

  *     Oracle Corporation

diff --git a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/WSDLFaultContentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/WSDLFaultContentProvider.java
index 92fae76..e56e53d 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/WSDLFaultContentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/WSDLFaultContentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/providers/WSILContentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/WSILContentProvider.java
index 0d85492..501d184 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/WSILContentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/WSILContentProvider.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.ui/src/org/eclipse/bpel/ui/details/providers/XSDSchemaContentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/XSDSchemaContentProvider.java
index 2da7e1c..c507184 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/XSDSchemaContentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/XSDSchemaContentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/details/providers/XSDSchemaFromResourceContentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/XSDSchemaFromResourceContentProvider.java
index 867b82f..690602b 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/XSDSchemaFromResourceContentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/XSDSchemaFromResourceContentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

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

  *     Oracle Corporation

diff --git a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/XSDTypeOrElementContentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/XSDTypeOrElementContentProvider.java
index 9f5b73b..463d1db 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/XSDTypeOrElementContentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/providers/XSDTypeOrElementContentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/tree/BPELVariableTreeNode.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/BPELVariableTreeNode.java
index 3ba0c74..2b996e5 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/BPELVariableTreeNode.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/BPELVariableTreeNode.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/tree/ITreeNode.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/ITreeNode.java
index e1e8f65..93f4059 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/ITreeNode.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/ITreeNode.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/tree/MessageTypeTreeNode.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/MessageTypeTreeNode.java
index a115bbc..d9e7d60 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/MessageTypeTreeNode.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/MessageTypeTreeNode.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/tree/OperationTreeNode.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/OperationTreeNode.java
index 8a51e40..8a81b93 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/OperationTreeNode.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/OperationTreeNode.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/tree/PartTreeNode.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/PartTreeNode.java
index a3f3fef..4533c71 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/PartTreeNode.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/PartTreeNode.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/tree/PartnerLinkTreeNode.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/PartnerLinkTreeNode.java
index 3c45d5d..c0fa502 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/PartnerLinkTreeNode.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/PartnerLinkTreeNode.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/tree/PartnerLinkTypeTreeNode.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/PartnerLinkTypeTreeNode.java
index 0509adb..e18f1d6 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/PartnerLinkTypeTreeNode.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/PartnerLinkTypeTreeNode.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/tree/PortTypeTreeNode.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/PortTypeTreeNode.java
index bd62d5c..f6b8373 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/PortTypeTreeNode.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/PortTypeTreeNode.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/tree/PropertyTreeNode.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/PropertyTreeNode.java
index ded1384..60245fd 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/PropertyTreeNode.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/PropertyTreeNode.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/tree/RoleTreeNode.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/RoleTreeNode.java
index 4782e09..f3910ca 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/RoleTreeNode.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/RoleTreeNode.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/details/tree/TreeNode.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/TreeNode.java
index cb64c31..f65726a 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/TreeNode.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/TreeNode.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/tree/XSDAttributeDeclarationTreeNode.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/XSDAttributeDeclarationTreeNode.java
index 8e37b39..520f0ff 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/XSDAttributeDeclarationTreeNode.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/XSDAttributeDeclarationTreeNode.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/tree/XSDElementDeclarationTreeNode.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/XSDElementDeclarationTreeNode.java
index c7bbe5d..dc9ae24 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/XSDElementDeclarationTreeNode.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/XSDElementDeclarationTreeNode.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/tree/XSDSchemaTreeNode.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/XSDSchemaTreeNode.java
index ecd3041..13255b0 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/XSDSchemaTreeNode.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/XSDSchemaTreeNode.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/tree/XSDTreeNode.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/XSDTreeNode.java
index be7f2e1..76d933e 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/XSDTreeNode.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/XSDTreeNode.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/details/tree/XSDTypeDefinitionTreeNode.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/XSDTypeDefinitionTreeNode.java
index 63eb9e5..74c0ad2 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/XSDTypeDefinitionTreeNode.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/details/tree/XSDTypeDefinitionTreeNode.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/dialogs/BrowseSelectorDialog.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/BrowseSelectorDialog.java
index 2687d00..1474452 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/BrowseSelectorDialog.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/BrowseSelectorDialog.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/dialogs/EditMessagePropertyDialog.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/EditMessagePropertyDialog.java
index a6c9417..076ca89 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/EditMessagePropertyDialog.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/EditMessagePropertyDialog.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/dialogs/EditPropertyAliasDialog.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/EditPropertyAliasDialog.java
index 8c05451..1aa0b57 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/EditPropertyAliasDialog.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/EditPropertyAliasDialog.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/dialogs/ElementTreePreviewSelectionDialog.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/ElementTreePreviewSelectionDialog.java
index 58d97b2..c862209 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/ElementTreePreviewSelectionDialog.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/ElementTreePreviewSelectionDialog.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/dialogs/ListAndViewDialog.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/ListAndViewDialog.java
index 8a4a2b3..c5982f3 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/ListAndViewDialog.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/ListAndViewDialog.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/dialogs/NamespaceMappingDialog.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/NamespaceMappingDialog.java
index f4fe230..5dba488 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/NamespaceMappingDialog.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/NamespaceMappingDialog.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/dialogs/PartnerLinkRoleSelectorDialog.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/PartnerLinkRoleSelectorDialog.java
index 9bd8fce..45848e4 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/PartnerLinkRoleSelectorDialog.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/PartnerLinkRoleSelectorDialog.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.ui/src/org/eclipse/bpel/ui/dialogs/PartnerLinkSelectorDialog.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/PartnerLinkSelectorDialog.java
index 92abb3b..ffdc0fb 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/PartnerLinkSelectorDialog.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/PartnerLinkSelectorDialog.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/dialogs/PartnerLinkTypeSelectorDialog.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/PartnerLinkTypeSelectorDialog.java
index 1d247a3..7ff844d 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/PartnerLinkTypeSelectorDialog.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/PartnerLinkTypeSelectorDialog.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/dialogs/PropertySelectorDialog.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/PropertySelectorDialog.java
index 60490af..8207462 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/PropertySelectorDialog.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/PropertySelectorDialog.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/dialogs/SaveImageDialog.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/SaveImageDialog.java
index af5277b..15588c4 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/SaveImageDialog.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/SaveImageDialog.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.ui/src/org/eclipse/bpel/ui/dialogs/SchemaImportDialog.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/SchemaImportDialog.java
index d0626b1..fdfc850 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/SchemaImportDialog.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/SchemaImportDialog.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/dialogs/SelectionAndCreationDialog.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/SelectionAndCreationDialog.java
index 600ff0d..4e22559 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/SelectionAndCreationDialog.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/SelectionAndCreationDialog.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/dialogs/TypeSelectorDialog.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/TypeSelectorDialog.java
index ae488ee..0723dab 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/TypeSelectorDialog.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/TypeSelectorDialog.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/dialogs/VariableSelectorDialog.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/VariableSelectorDialog.java
index aea8db7..dfbe137 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/VariableSelectorDialog.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/VariableSelectorDialog.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/dnd/BPELTemplateTransferDropTargetListener.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dnd/BPELTemplateTransferDropTargetListener.java
index 3e2afa2..e774439 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dnd/BPELTemplateTransferDropTargetListener.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dnd/BPELTemplateTransferDropTargetListener.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/dnd/BPELTextTransferDropTargetListener.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dnd/BPELTextTransferDropTargetListener.java
index f443679..a85b5cb 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dnd/BPELTextTransferDropTargetListener.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dnd/BPELTextTransferDropTargetListener.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/dnd/DropPopup.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dnd/DropPopup.java
index d42147c..22cb9f4 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dnd/DropPopup.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dnd/DropPopup.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/dnd/FileDropTargetListener.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dnd/FileDropTargetListener.java
index 6f847b7..f190b75 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dnd/FileDropTargetListener.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dnd/FileDropTargetListener.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/dnd/Messages.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dnd/Messages.java
index 3207caf..c398a0d 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dnd/Messages.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dnd/Messages.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/dnd/TextDropTargetListener.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dnd/TextDropTargetListener.java
index b83cca9..b0932ff 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dnd/TextDropTargetListener.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dnd/TextDropTargetListener.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/dnd/messages.properties b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dnd/messages.properties
index ffc24fd..2125053 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dnd/messages.properties
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dnd/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.ui/src/org/eclipse/bpel/ui/editors/StringComboBoxCellEditor.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/StringComboBoxCellEditor.java
index 73bc940..4f175b7 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/StringComboBoxCellEditor.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/StringComboBoxCellEditor.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editors/TextDocumentProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/TextDocumentProvider.java
index 590bdd4..365395f 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/TextDocumentProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/TextDocumentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editors/TextEditor.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/TextEditor.java
index 43425f0..5bc3b20 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/TextEditor.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/TextEditor.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editors/TextEditorInput.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/TextEditorInput.java
index c107d88..b6ad317 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/TextEditorInput.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/TextEditorInput.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editors/xpath/ColorManager.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/ColorManager.java
index 0b213ac..362c3df 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/ColorManager.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/ColorManager.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/editors/xpath/ConstructedEditorMessages.properties b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/ConstructedEditorMessages.properties
index fedda1e..6710014 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/ConstructedEditorMessages.properties
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/ConstructedEditorMessages.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.ui/src/org/eclipse/bpel/ui/editors/xpath/IXPathEditorActionConstants.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/IXPathEditorActionConstants.java
index b191e24..23308b2 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/IXPathEditorActionConstants.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/IXPathEditorActionConstants.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/editors/xpath/IXPathEditorActionDefinitionIds.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/IXPathEditorActionDefinitionIds.java
index a0fc74b..ab776c7 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/IXPathEditorActionDefinitionIds.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/IXPathEditorActionDefinitionIds.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/editors/xpath/VariablePickerAction.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/VariablePickerAction.java
index b5dbb08..9900b43 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/VariablePickerAction.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/VariablePickerAction.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/editors/xpath/XPathCharPairMatcher.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/XPathCharPairMatcher.java
index fda1e27..09510d7 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/XPathCharPairMatcher.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/XPathCharPairMatcher.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/editors/xpath/XPathCodeReader.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/XPathCodeReader.java
index b1bd551..5ed830e 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/XPathCodeReader.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/XPathCodeReader.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/editors/xpath/XPathEditorMessages.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/XPathEditorMessages.java
index f5e1a71..1189128 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/XPathEditorMessages.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/XPathEditorMessages.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/editors/xpath/XPathSourceDoubleClickStrategy.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/XPathSourceDoubleClickStrategy.java
index cee5609..badc4e2 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/XPathSourceDoubleClickStrategy.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/XPathSourceDoubleClickStrategy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/editors/xpath/XPathSourceScanner.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/XPathSourceScanner.java
index 670f2f9..6f68a42 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/XPathSourceScanner.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/XPathSourceScanner.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/editors/xpath/XPathSourceViewerConfiguration.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/XPathSourceViewerConfiguration.java
index d382884..0ae01dc 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/XPathSourceViewerConfiguration.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/XPathSourceViewerConfiguration.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/editors/xpath/XPathTextEditor.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/XPathTextEditor.java
index 93428d2..e04a96d 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/XPathTextEditor.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/XPathTextEditor.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/editors/xpath/XPathWhitespaceDetector.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/XPathWhitespaceDetector.java
index fd598cf..57d937a 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/XPathWhitespaceDetector.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/XPathWhitespaceDetector.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/editors/xpath/XPathWordDetector.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/XPathWordDetector.java
index f664922..42446a6 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/XPathWordDetector.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/XPathWordDetector.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/editors/xpath/rules/AxisRule.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/rules/AxisRule.java
index feba061..9ac023f 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/rules/AxisRule.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/rules/AxisRule.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/editors/xpath/rules/FloatRule.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/rules/FloatRule.java
index b4f0a12..a9eb753 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/rules/FloatRule.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/rules/FloatRule.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/editors/xpath/rules/FunctionRule.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/rules/FunctionRule.java
index 3c8be24..29f12e1 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/rules/FunctionRule.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/rules/FunctionRule.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/editors/xpath/rules/ITokenContext.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/rules/ITokenContext.java
index 95db1a0..003474b 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/rules/ITokenContext.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/rules/ITokenContext.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/editors/xpath/rules/SingleCharRule.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/rules/SingleCharRule.java
index 6e452e0..b483453 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/rules/SingleCharRule.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/rules/SingleCharRule.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.ui/src/org/eclipse/bpel/ui/editors/xpath/rules/SingleOperatorRule.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/rules/SingleOperatorRule.java
index 9eae958..5fba83f 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/rules/SingleOperatorRule.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/rules/SingleOperatorRule.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.ui/src/org/eclipse/bpel/ui/editors/xpath/rules/StringRule.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/rules/StringRule.java
index a891062..6917df0 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/rules/StringRule.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/rules/StringRule.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.ui/src/org/eclipse/bpel/ui/editors/xpath/rules/WordRule.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/rules/WordRule.java
index ea1b4e2..e095976 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/rules/WordRule.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/rules/WordRule.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2000, 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.ui/src/org/eclipse/bpel/ui/editors/xpath/templates/XPathEditorTemplateAccess.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/templates/XPathEditorTemplateAccess.java
index f345865..2542573 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/templates/XPathEditorTemplateAccess.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editors/xpath/templates/XPathEditorTemplateAccess.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.ui/src/org/eclipse/bpel/ui/editparts/ActivityEditPart.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/ActivityEditPart.java
index f687883..164c45b 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/ActivityEditPart.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/ActivityEditPart.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/BPELEditPart.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/BPELEditPart.java
index 506212e..316d950 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/BPELEditPart.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/BPELEditPart.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/BPELTrayAccessibleEditPart.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/BPELTrayAccessibleEditPart.java
index 5f44cad..4ec04d2 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/BPELTrayAccessibleEditPart.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/BPELTrayAccessibleEditPart.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/BPELTrayCategoryEditPart.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/BPELTrayCategoryEditPart.java
index a967406..3ac7f4d 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/BPELTrayCategoryEditPart.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/BPELTrayCategoryEditPart.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.ui/src/org/eclipse/bpel/ui/editparts/BPELTrayCategoryEntryEditPart.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/BPELTrayCategoryEntryEditPart.java
index 2428a68..9e8d007 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/BPELTrayCategoryEntryEditPart.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/BPELTrayCategoryEntryEditPart.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.ui/src/org/eclipse/bpel/ui/editparts/CollapsableEditPart.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/CollapsableEditPart.java
index b7f0c2e..5e8cc2a 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/CollapsableEditPart.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/CollapsableEditPart.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/CompositeActivityEditPart.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/CompositeActivityEditPart.java
index fbbd5f6..be11bcc 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/CompositeActivityEditPart.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/CompositeActivityEditPart.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/CorrelationSetEditPart.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/CorrelationSetEditPart.java
index aab002d..62a7ba2 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/CorrelationSetEditPart.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/CorrelationSetEditPart.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/CorrelationSetsEditPart.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/CorrelationSetsEditPart.java
index d74aef7..885e304 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/CorrelationSetsEditPart.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/CorrelationSetsEditPart.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/ElseIfEditPart.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/ElseIfEditPart.java
index 2700378..d36b5a8 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/ElseIfEditPart.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/ElseIfEditPart.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/EndNodeEditPart.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/EndNodeEditPart.java
index 1e4744d..6af78ce 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/EndNodeEditPart.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/EndNodeEditPart.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/FaultHandlerEditPart.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/FaultHandlerEditPart.java
index 7057053..e08edbb 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/FaultHandlerEditPart.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/FaultHandlerEditPart.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/FlowEditPart.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/FlowEditPart.java
index fe6ee5b..2cf788f 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/FlowEditPart.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/FlowEditPart.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/IfEditPart.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/IfEditPart.java
index 9c7a4cc..7674787 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/IfEditPart.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/IfEditPart.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/InvokeEditPart.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/InvokeEditPart.java
index c8466a6..4236bf6 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/InvokeEditPart.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/InvokeEditPart.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/LeafEditPart.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/LeafEditPart.java
index 2d7170c..daac4df 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/LeafEditPart.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/LeafEditPart.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/LinkEditPart.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/LinkEditPart.java
index d23b9b5..05deb0a 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/LinkEditPart.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/LinkEditPart.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/MessageExchangeEditPart.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/MessageExchangeEditPart.java
index 73b5c35..79bc4a6 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/MessageExchangeEditPart.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/MessageExchangeEditPart.java
@@ -2,9 +2,11 @@
  * <copyright>

  * 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.ui/src/org/eclipse/bpel/ui/editparts/MessageExchangesEditPart.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/MessageExchangesEditPart.java
index 20dbcbc..db2210c 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/MessageExchangesEditPart.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/MessageExchangesEditPart.java
@@ -2,9 +2,11 @@
  * <copyright>

  * 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.ui/src/org/eclipse/bpel/ui/editparts/OutlineTreeEditPart.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/OutlineTreeEditPart.java
index 6d9b676..52badd7 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/OutlineTreeEditPart.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/OutlineTreeEditPart.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/PartnerLinkEditPart.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/PartnerLinkEditPart.java
index f47abe9..336a9f6 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/PartnerLinkEditPart.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/PartnerLinkEditPart.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/PartnerLinksEditPart.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/PartnerLinksEditPart.java
index 58bdfd8..519a4f6 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/PartnerLinksEditPart.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/PartnerLinksEditPart.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/PickEditPart.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/PickEditPart.java
index 864f12d..14194fa 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/PickEditPart.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/PickEditPart.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/ProcessEditPart.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/ProcessEditPart.java
index b0bff71..5e2dbc4 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/ProcessEditPart.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/ProcessEditPart.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/ProcessOutlineEditPart.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/ProcessOutlineEditPart.java
index 22d320b..d5682b7 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/ProcessOutlineEditPart.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/ProcessOutlineEditPart.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/ProcessTrayEditPart.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/ProcessTrayEditPart.java
index e1736b1..3564908 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/ProcessTrayEditPart.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/ProcessTrayEditPart.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/ReferencePartnerLinksEditPart.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/ReferencePartnerLinksEditPart.java
index 66261b5..6f3391d 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/ReferencePartnerLinksEditPart.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/ReferencePartnerLinksEditPart.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/ScopeEditPart.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/ScopeEditPart.java
index 8cc23d9..424c9bb 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/ScopeEditPart.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/ScopeEditPart.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/SequenceEditPart.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/SequenceEditPart.java
index b021057..12f7c11 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/SequenceEditPart.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/SequenceEditPart.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/StartNodeEditPart.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/StartNodeEditPart.java
index 3691ef4..25ef883 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/StartNodeEditPart.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/StartNodeEditPart.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/VariableEditPart.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/VariableEditPart.java
index 4c3e054..df9993b 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/VariableEditPart.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/VariableEditPart.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/VariablesEditPart.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/VariablesEditPart.java
index 2b4c340..987ee7b 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/VariablesEditPart.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/VariablesEditPart.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/borders/CollapsableBorder.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/borders/CollapsableBorder.java
index e4211c1..2571b75 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/borders/CollapsableBorder.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/borders/CollapsableBorder.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/borders/ContainerBorder.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/borders/ContainerBorder.java
index b18000c..d85f11f 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/borders/ContainerBorder.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/borders/ContainerBorder.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/borders/DrawerBorder.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/borders/DrawerBorder.java
index b8417d5..e249e40 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/borders/DrawerBorder.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/borders/DrawerBorder.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/borders/ElseElseIfBorder.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/borders/ElseElseIfBorder.java
index 1a8aedb..e502193 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/borders/ElseElseIfBorder.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/borders/ElseElseIfBorder.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/borders/FlowBorder.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/borders/FlowBorder.java
index 2d039e6..fb21c74 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/borders/FlowBorder.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/borders/FlowBorder.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/borders/GradientBorder.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/borders/GradientBorder.java
index 8713320..73c0934 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/borders/GradientBorder.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/borders/GradientBorder.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/borders/LeafBorder.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/borders/LeafBorder.java
index f9de14e..6ef2132 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/borders/LeafBorder.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/borders/LeafBorder.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/borders/PickBorder.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/borders/PickBorder.java
index a822771..09a36c7 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/borders/PickBorder.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/borders/PickBorder.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.ui/src/org/eclipse/bpel/ui/editparts/borders/RoundRectangleBorder.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/borders/RoundRectangleBorder.java
index 2332d2b..8359178 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/borders/RoundRectangleBorder.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/borders/RoundRectangleBorder.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/borders/RoundRectangleBorderWithDecoration.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/borders/RoundRectangleBorderWithDecoration.java
index df33c93..40900b6 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/borders/RoundRectangleBorderWithDecoration.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/borders/RoundRectangleBorderWithDecoration.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/borders/ScopeBorder.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/borders/ScopeBorder.java
index 9a8fc98..9e940a6 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/borders/ScopeBorder.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/borders/ScopeBorder.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/figures/CollapsableContainerFigure.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/figures/CollapsableContainerFigure.java
index 4cb39ca..640e580 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/figures/CollapsableContainerFigure.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/figures/CollapsableContainerFigure.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/figures/CollapsablePickContainerFigure.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/figures/CollapsablePickContainerFigure.java
index 1f7e4f3..eb4aecb 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/figures/CollapsablePickContainerFigure.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/figures/CollapsablePickContainerFigure.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.ui/src/org/eclipse/bpel/ui/editparts/figures/CollapsableScopeContainerFigure.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/figures/CollapsableScopeContainerFigure.java
index c6cc92e..b5934c6 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/figures/CollapsableScopeContainerFigure.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/figures/CollapsableScopeContainerFigure.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/figures/GradientFigure.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/figures/GradientFigure.java
index 7744a1e..57e4bda 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/figures/GradientFigure.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/figures/GradientFigure.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/policies/BPELComponentEditPolicy.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/BPELComponentEditPolicy.java
index 2b54c26..74e7d15 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/BPELComponentEditPolicy.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/BPELComponentEditPolicy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/policies/BPELContainerEditPolicy.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/BPELContainerEditPolicy.java
index 3c1e155..0d82543 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/BPELContainerEditPolicy.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/BPELContainerEditPolicy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/policies/BPELDirectEditPolicy.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/BPELDirectEditPolicy.java
index 1c7d9e2..72269cf 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/BPELDirectEditPolicy.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/BPELDirectEditPolicy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/policies/BPELGraphicalEditPolicy.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/BPELGraphicalEditPolicy.java
index cfaee10..2120754 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/BPELGraphicalEditPolicy.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/BPELGraphicalEditPolicy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/policies/BPELOrderedLayoutEditPolicy.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/BPELOrderedLayoutEditPolicy.java
index c6b976a..70a3789 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/BPELOrderedLayoutEditPolicy.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/BPELOrderedLayoutEditPolicy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/policies/BPELSelectionEditPolicy.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/BPELSelectionEditPolicy.java
index e1ae8ec..e39b746 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/BPELSelectionEditPolicy.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/BPELSelectionEditPolicy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/policies/BPELXYLayoutEditPolicy.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/BPELXYLayoutEditPolicy.java
index 3116348..a37a5e0 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/BPELXYLayoutEditPolicy.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/BPELXYLayoutEditPolicy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/policies/ContainerHighlightEditPolicy.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/ContainerHighlightEditPolicy.java
index 0217a4b..0c72319 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/ContainerHighlightEditPolicy.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/ContainerHighlightEditPolicy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/policies/ElseHighlightEditPolicy.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/ElseHighlightEditPolicy.java
index c105299..23ba1d6 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/ElseHighlightEditPolicy.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/ElseHighlightEditPolicy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/policies/FlowHighlightEditPolicy.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/FlowHighlightEditPolicy.java
index 97587d3..313a8e8 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/FlowHighlightEditPolicy.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/FlowHighlightEditPolicy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/policies/FlowResizeEditPolicy.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/FlowResizeEditPolicy.java
index 4c70379..df3c7cc 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/FlowResizeEditPolicy.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/FlowResizeEditPolicy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/policies/FlowXYLayoutEditPolicy.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/FlowXYLayoutEditPolicy.java
index 6fdf953..324f34f 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/FlowXYLayoutEditPolicy.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/FlowXYLayoutEditPolicy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/policies/LinkConnectionEditPolicy.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/LinkConnectionEditPolicy.java
index 3e9008c..368e1e2 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/LinkConnectionEditPolicy.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/LinkConnectionEditPolicy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/policies/OutlineTreeEditPolicy.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/OutlineTreeEditPolicy.java
index e1efab0..74af2bf 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/OutlineTreeEditPolicy.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/OutlineTreeEditPolicy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/policies/TrayContainerEditPolicy.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/TrayContainerEditPolicy.java
index 85ac63b..6cfa8af 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/TrayContainerEditPolicy.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/policies/TrayContainerEditPolicy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/util/BPELDecorationLayout.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/util/BPELDecorationLayout.java
index 5826943..55bf121 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/util/BPELDecorationLayout.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/util/BPELDecorationLayout.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/util/BPELEditPartFactory.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/util/BPELEditPartFactory.java
index 176877a..71b1fae 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/util/BPELEditPartFactory.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/util/BPELEditPartFactory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/util/BPELTrayEditPartFactory.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/util/BPELTrayEditPartFactory.java
index 9f2354c..aa93c09 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/util/BPELTrayEditPartFactory.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/util/BPELTrayEditPartFactory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/util/GraphAnimation.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/util/GraphAnimation.java
index d036588..7bdec29 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/util/GraphAnimation.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/util/GraphAnimation.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/util/NoShiftButton.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/util/NoShiftButton.java
index 2f5eda3..7227bba 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/util/NoShiftButton.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/util/NoShiftButton.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/util/OutlineTreePartFactory.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/util/OutlineTreePartFactory.java
index 361faae..c1adbc8 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/util/OutlineTreePartFactory.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/util/OutlineTreePartFactory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/util/OverlayCompositeImageDescriptor.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/util/OverlayCompositeImageDescriptor.java
index 7bb5916..f8e54a7 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/util/OverlayCompositeImageDescriptor.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/util/OverlayCompositeImageDescriptor.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/editparts/util/ReferencedAddRequest.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/util/ReferencedAddRequest.java
index 6030782..1ad83ac 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/util/ReferencedAddRequest.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/util/ReferencedAddRequest.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/expressions/Functions.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/expressions/Functions.java
index e0e147e..31ec99f 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/expressions/Functions.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/expressions/Functions.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/expressions/IEditorConstants.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/expressions/IEditorConstants.java
index 35944e9..af742a6 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/expressions/IEditorConstants.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/expressions/IEditorConstants.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/expressions/XPathExpressionUtil.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/expressions/XPathExpressionUtil.java
index 60a2917..8ef4b06 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/expressions/XPathExpressionUtil.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/expressions/XPathExpressionUtil.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/extensions/ActionCategoryDescriptor.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/extensions/ActionCategoryDescriptor.java
index 58485de..e0b4997 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/extensions/ActionCategoryDescriptor.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/extensions/ActionCategoryDescriptor.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/extensions/ActionDescriptor.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/extensions/ActionDescriptor.java
index d0a448a..ef41e7a 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/extensions/ActionDescriptor.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/extensions/ActionDescriptor.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/extensions/BPELUIRegistry.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/extensions/BPELUIRegistry.java
index 6673669..4414333 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/extensions/BPELUIRegistry.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/extensions/BPELUIRegistry.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/extensions/HoverHelperDescriptor.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/extensions/HoverHelperDescriptor.java
index 8a3c9e8..80b0903 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/extensions/HoverHelperDescriptor.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/extensions/HoverHelperDescriptor.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/extensions/IModelListener.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/extensions/IModelListener.java
index c2ee6e4..ce5f244 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/extensions/IModelListener.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/extensions/IModelListener.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/extensions/ListenerDescriptor.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/extensions/ListenerDescriptor.java
index 9bd2b76..7c0109f 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/extensions/ListenerDescriptor.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/extensions/ListenerDescriptor.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/extensions/UIObjectFactoryDescriptor.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/extensions/UIObjectFactoryDescriptor.java
index 17744d8..b231d50 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/extensions/UIObjectFactoryDescriptor.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/extensions/UIObjectFactoryDescriptor.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.ui/src/org/eclipse/bpel/ui/factories/AbstractUIObjectFactory.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/factories/AbstractUIObjectFactory.java
index 0dce3ef..c262356 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/factories/AbstractUIObjectFactory.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/factories/AbstractUIObjectFactory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/factories/ActionUIObjectFactory.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/factories/ActionUIObjectFactory.java
index dbca2f8..2cd9e75 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/factories/ActionUIObjectFactory.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/factories/ActionUIObjectFactory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/factories/BPELUIObjectFactory.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/factories/BPELUIObjectFactory.java
index d58c909..5f51229 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/factories/BPELUIObjectFactory.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/factories/BPELUIObjectFactory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/factories/IExtensionUIObjectFactory.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/factories/IExtensionUIObjectFactory.java
index e29b811..f21664e 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/factories/IExtensionUIObjectFactory.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/factories/IExtensionUIObjectFactory.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.ui/src/org/eclipse/bpel/ui/factories/UIObjectFactoryProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/factories/UIObjectFactoryProvider.java
index 8a36f95..8438c7c 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/factories/UIObjectFactoryProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/factories/UIObjectFactoryProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/figures/AbstractHandlerLinker.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/figures/AbstractHandlerLinker.java
index bdad587..3c79ef4 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/figures/AbstractHandlerLinker.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/figures/AbstractHandlerLinker.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.ui/src/org/eclipse/bpel/ui/figures/BPELPolylineConnection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/figures/BPELPolylineConnection.java
index ae5ebab..2e25c8b 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/figures/BPELPolylineConnection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/figures/BPELPolylineConnection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/figures/CenteredConnectionAnchor.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/figures/CenteredConnectionAnchor.java
index db017e7..5c7c6de 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/figures/CenteredConnectionAnchor.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/figures/CenteredConnectionAnchor.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/figures/ConnectionCoordHistory.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/figures/ConnectionCoordHistory.java
index df1f517..a6ea2c9 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/figures/ConnectionCoordHistory.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/figures/ConnectionCoordHistory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/figures/ElseResizeHandle.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/figures/ElseResizeHandle.java
index 70826fa..24735ad 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/figures/ElseResizeHandle.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/figures/ElseResizeHandle.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/figures/FixedConnectionAnchor.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/figures/FixedConnectionAnchor.java
index 9200234..187504a 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/figures/FixedConnectionAnchor.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/figures/FixedConnectionAnchor.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/figures/HandlerLinkerAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/figures/HandlerLinkerAdapter.java
index c88ad49..8d20a3c 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/figures/HandlerLinkerAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/figures/HandlerLinkerAdapter.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.ui/src/org/eclipse/bpel/ui/figures/ILayoutAware.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/figures/ILayoutAware.java
index 12761cd..40c3490 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/figures/ILayoutAware.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/figures/ILayoutAware.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.ui/src/org/eclipse/bpel/ui/figures/InvokeHandlerLinker.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/figures/InvokeHandlerLinker.java
index 2f6ef62..c0862e6 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/figures/InvokeHandlerLinker.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/figures/InvokeHandlerLinker.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.ui/src/org/eclipse/bpel/ui/figures/ManhattanConnectionRouterEx.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/figures/ManhattanConnectionRouterEx.java
index f83780d..474fd98 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/figures/ManhattanConnectionRouterEx.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/figures/ManhattanConnectionRouterEx.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.ui/src/org/eclipse/bpel/ui/figures/ProcessHandlerLinker.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/figures/ProcessHandlerLinker.java
index 09ce765..db9485f 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/figures/ProcessHandlerLinker.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/figures/ProcessHandlerLinker.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.ui/src/org/eclipse/bpel/ui/figures/ScopeHandlerLinker.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/figures/ScopeHandlerLinker.java
index db68fb0..151d38e 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/figures/ScopeHandlerLinker.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/figures/ScopeHandlerLinker.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.ui/src/org/eclipse/bpel/ui/hovers/DefaultHoverHelper.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/hovers/DefaultHoverHelper.java
index a654b04..7c5b40c 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/hovers/DefaultHoverHelper.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/hovers/DefaultHoverHelper.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2007, 2012 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:

  *    Oleg Danilov, Intel - Initial API and Implementation

diff --git a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/hovers/SimpleHoverHelper.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/hovers/SimpleHoverHelper.java
index 786a774..613599c 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/hovers/SimpleHoverHelper.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/hovers/SimpleHoverHelper.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/messages.properties b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/messages.properties
index 71eed2b..b25ea17 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/messages.properties
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/messages.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/palette/BPELSelectionTool.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/palette/BPELSelectionTool.java
index fd3a7fc..2bb68b7 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/palette/BPELSelectionTool.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/palette/BPELSelectionTool.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/palette/BPELSelectionToolEntry.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/palette/BPELSelectionToolEntry.java
index 5ea4249..8bcf283 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/palette/BPELSelectionToolEntry.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/palette/BPELSelectionToolEntry.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/palette/PaletteFactory.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/palette/PaletteFactory.java
index 6b0fb67..4830d90 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/palette/PaletteFactory.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/palette/PaletteFactory.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.ui/src/org/eclipse/bpel/ui/perspectives/BPELPerspectiveFactory.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/perspectives/BPELPerspectiveFactory.java
index a07b58e..ae7345e 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/perspectives/BPELPerspectiveFactory.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/perspectives/BPELPerspectiveFactory.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.ui.perspectives;

 

diff --git a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/BPELHomePreferencePage.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/BPELHomePreferencePage.java
index f857706..3a2fc71 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/BPELHomePreferencePage.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/BPELHomePreferencePage.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.ui/src/org/eclipse/bpel/ui/preferences/BPELPreferencePage.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/BPELPreferencePage.java
index e314490..9e606d6 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/BPELPreferencePage.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/BPELPreferencePage.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/preferences/PreferenceConstants.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/PreferenceConstants.java
index 7ea471c..0c76579 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/PreferenceConstants.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/PreferenceConstants.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/preferences/WSILPreferencePage.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/WSILPreferencePage.java
index 0c7a7a4..12b816f 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/WSILPreferencePage.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/WSILPreferencePage.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/preferences/XPathTemplatePreferencePage.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/XPathTemplatePreferencePage.java
index f735816..4ca6bf8 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/XPathTemplatePreferencePage.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/XPathTemplatePreferencePage.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.ui/src/org/eclipse/bpel/ui/properties/AbstractExpressionAssignCategory.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/AbstractExpressionAssignCategory.java
index d5c4e28..489a6c0 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/AbstractExpressionAssignCategory.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/AbstractExpressionAssignCategory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/AbstractStyledTextExpressionSection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/AbstractStyledTextExpressionSection.java
index 6d48d09..c3ffa62 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/AbstractStyledTextExpressionSection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/AbstractStyledTextExpressionSection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/ActionImplementationSection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ActionImplementationSection.java
index 422b6b8..c753641 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ActionImplementationSection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ActionImplementationSection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/AssignCategoryBase.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/AssignCategoryBase.java
index f07a72a..4b9be0e 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/AssignCategoryBase.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/AssignCategoryBase.java
Binary files differ
diff --git a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/AssignImplSection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/AssignImplSection.java
index 9fee3bc..81ea570 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/AssignImplSection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/AssignImplSection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/BPELPropertySection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/BPELPropertySection.java
index 9033604..0a7f13f 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/BPELPropertySection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/BPELPropertySection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/CaseConditionSection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/CaseConditionSection.java
index 43316ca..7de5ad8 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/CaseConditionSection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/CaseConditionSection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/CatchAllSection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/CatchAllSection.java
index b2c169d..0a5ed98 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/CatchAllSection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/CatchAllSection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/CategorySection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/CategorySection.java
index 2a149f4..3e724b4 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/CategorySection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/CategorySection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/properties/ChangeTracker.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ChangeTracker.java
index 45966c1..583cf58 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ChangeTracker.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ChangeTracker.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/CompensateScopeSection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/CompensateScopeSection.java
index 0efb32d..4a4b0db 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/CompensateScopeSection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/CompensateScopeSection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/CorrSetImplSection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/CorrSetImplSection.java
index 2986664..b094ef0 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/CorrSetImplSection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/CorrSetImplSection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/CorrelationSection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/CorrelationSection.java
index 65a6e12..2ddba67 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/CorrelationSection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/CorrelationSection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/CreateInstanceSection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/CreateInstanceSection.java
index 32820a1..42235a8 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/CreateInstanceSection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/CreateInstanceSection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/DateTimeSelector.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/DateTimeSelector.java
index 2e91a8a..a25cb6b 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/DateTimeSelector.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/DateTimeSelector.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/DialogVariableTypeSelector.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/DialogVariableTypeSelector.java
index b477325..b5cadef 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/DialogVariableTypeSelector.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/DialogVariableTypeSelector.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/DocumentationSection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/DocumentationSection.java
index ee0540e..3f849f2 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/DocumentationSection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/DocumentationSection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/DurationSelector.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/DurationSelector.java
index 659dc54..bfb4f3f 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/DurationSelector.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/DurationSelector.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/EditController.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/EditController.java
index ef2ecef..3e43875 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/EditController.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/EditController.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/ElseConditionSection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ElseConditionSection.java
index 54f9e97..fd39ed8 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ElseConditionSection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ElseConditionSection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/EndpointReferenceAssignCategory.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/EndpointReferenceAssignCategory.java
index 460f7e8..29b8373 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/EndpointReferenceAssignCategory.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/EndpointReferenceAssignCategory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/ExitOnStandardFaultSection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ExitOnStandardFaultSection.java
index b667513..6a8efa7 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ExitOnStandardFaultSection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ExitOnStandardFaultSection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/ExpressionAssignCategory.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ExpressionAssignCategory.java
index b1b3a4d..700d526 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ExpressionAssignCategory.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ExpressionAssignCategory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/ExpressionSection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ExpressionSection.java
index cbd5f3e..5e49979 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ExpressionSection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ExpressionSection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/FaultCatchNameSection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/FaultCatchNameSection.java
index 9464d42..8c0eb26 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/FaultCatchNameSection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/FaultCatchNameSection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/FaultThrowNameSection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/FaultThrowNameSection.java
index dd8ccfc..d932c75 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/FaultThrowNameSection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/FaultThrowNameSection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/ForEachCompletionSection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ForEachCompletionSection.java
index de6a186..7f0abd1 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ForEachCompletionSection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ForEachCompletionSection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/ForEachCounterValuesSection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ForEachCounterValuesSection.java
index 45c2a57..e8f34b2 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ForEachCounterValuesSection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ForEachCounterValuesSection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/ForEachFinalCounterValueSection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ForEachFinalCounterValueSection.java
index e2ae67b..c717e97 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ForEachFinalCounterValueSection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ForEachFinalCounterValueSection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/ForEachSection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ForEachSection.java
index 708cf79..df374c4 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ForEachSection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ForEachSection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/ForEachStartCounterValueSection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ForEachStartCounterValueSection.java
index 87056c7..21a1b61 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ForEachStartCounterValueSection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ForEachStartCounterValueSection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/ForEachSuccessfulBranchesOnlySection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ForEachSuccessfulBranchesOnlySection.java
index c9fced8..cad13ec 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ForEachSuccessfulBranchesOnlySection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ForEachSuccessfulBranchesOnlySection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/IAssignCategory.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/IAssignCategory.java
index a37402e..1737bd5 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/IAssignCategory.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/IAssignCategory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/ImportsSection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ImportsSection.java
index fb74f95..1bb7794 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ImportsSection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ImportsSection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/InvokeImplSection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/InvokeImplSection.java
index aa4d504..a34ec99 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/InvokeImplSection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/InvokeImplSection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/InvokeVariableSection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/InvokeVariableSection.java
index 443cd1b..e2c7133 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/InvokeVariableSection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/InvokeVariableSection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2007, 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.ui/src/org/eclipse/bpel/ui/properties/JoinConditionSection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/JoinConditionSection.java
index 665de0b..b3a88e5 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/JoinConditionSection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/JoinConditionSection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/JoinFailureSection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/JoinFailureSection.java
index 2f14b14..1f9becc 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/JoinFailureSection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/JoinFailureSection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/LiteralAssignCategory.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/LiteralAssignCategory.java
index 722df3d..90c30ce 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/LiteralAssignCategory.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/LiteralAssignCategory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/MessageExchangeSection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/MessageExchangeSection.java
index 71491c2..6127be9 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/MessageExchangeSection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/MessageExchangeSection.java
@@ -2,9 +2,11 @@
  * <copyright>

  * 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.ui/src/org/eclipse/bpel/ui/properties/NameSection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/NameSection.java
index a27ba01..fdef6b3 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/NameSection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/NameSection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/NamespacePrefixElement.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/NamespacePrefixElement.java
index d6a2d7a..8bcfd6c 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/NamespacePrefixElement.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/NamespacePrefixElement.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.ui.properties;

 

diff --git a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/NamespacePrefixesProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/NamespacePrefixesProvider.java
index 043bcf3..71b6ff6 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/NamespacePrefixesProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/NamespacePrefixesProvider.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.ui.properties;

 

diff --git a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/NamespacePrefixesSection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/NamespacePrefixesSection.java
index aacd11f..b1f83d6 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/NamespacePrefixesSection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/NamespacePrefixesSection.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.ui.properties;

 

diff --git a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/NamespaceSection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/NamespaceSection.java
index 6fc97a4..2f09e38 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/NamespaceSection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/NamespaceSection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/NullAssignCategory.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/NullAssignCategory.java
index d543ece..5ec3e6b 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/NullAssignCategory.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/NullAssignCategory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/OpaqueAssignCategory.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/OpaqueAssignCategory.java
index 730d498..3a372c3 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/OpaqueAssignCategory.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/OpaqueAssignCategory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/PartnerLinkImplSection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/PartnerLinkImplSection.java
index 5d6cb4d..72115ea 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/PartnerLinkImplSection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/PartnerLinkImplSection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/PartnerRoleAssignCategory.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/PartnerRoleAssignCategory.java
index f139bf8..0ac9ef0 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/PartnerRoleAssignCategory.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/PartnerRoleAssignCategory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/PropertiesLabelProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/PropertiesLabelProvider.java
index 20c9acc..2cc7d34 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/PropertiesLabelProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/PropertiesLabelProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/RepeatingAlarmConditionSection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/RepeatingAlarmConditionSection.java
index 109946d..7489b75 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/RepeatingAlarmConditionSection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/RepeatingAlarmConditionSection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/ScopeImplSection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ScopeImplSection.java
index b5336e4..ee89385 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ScopeImplSection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ScopeImplSection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/TransitionConditionSection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/TransitionConditionSection.java
index b93e96a..c3ffea6 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/TransitionConditionSection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/TransitionConditionSection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/TwoSectionsHostSection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/TwoSectionsHostSection.java
index 17065f2..16933eb 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/TwoSectionsHostSection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/TwoSectionsHostSection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/TypeMapper.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/TypeMapper.java
index baa4aaa..0379e4c 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/TypeMapper.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/TypeMapper.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/ValidateSection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ValidateSection.java
index ec497d6..8df30c1 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ValidateSection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ValidateSection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 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.ui/src/org/eclipse/bpel/ui/properties/ValidateVariablesSection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ValidateVariablesSection.java
index 716415c..a8b66ea 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ValidateVariablesSection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ValidateVariablesSection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 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.ui/src/org/eclipse/bpel/ui/properties/VariableInitializationSection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableInitializationSection.java
index 5975bf6..bd2e226 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableInitializationSection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableInitializationSection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/VariablePartAssignCategory.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariablePartAssignCategory.java
index c1b13a2..5065224 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariablePartAssignCategory.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariablePartAssignCategory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/VariablePropertyAssignCategory.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariablePropertyAssignCategory.java
index e267e4e..d892b71 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariablePropertyAssignCategory.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariablePropertyAssignCategory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/VariableTypeSection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableTypeSection.java
index d160082..52444e2 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableTypeSection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableTypeSection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/VariableTypeSelector.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableTypeSelector.java
index e6f9251..e1a161f 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableTypeSelector.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableTypeSelector.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/WaitConditionSection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/WaitConditionSection.java
index 6896758..a84376f 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/WaitConditionSection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/WaitConditionSection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/properties/WhileConditionSection.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/WhileConditionSection.java
index 8117359..2e34bae 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/WhileConditionSection.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/WhileConditionSection.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/proposal/providers/AbstractContentProposal.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/proposal/providers/AbstractContentProposal.java
index 662a419..f7fe8e9 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/proposal/providers/AbstractContentProposal.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/proposal/providers/AbstractContentProposal.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/proposal/providers/CommandProposal.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/proposal/providers/CommandProposal.java
index ecf4609..8363d57 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/proposal/providers/CommandProposal.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/proposal/providers/CommandProposal.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/proposal/providers/ModelContentProposalProvider.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/proposal/providers/ModelContentProposalProvider.java
index e9cd105..cce0b20 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/proposal/providers/ModelContentProposalProvider.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/proposal/providers/ModelContentProposalProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/proposal/providers/RunnableProposal.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/proposal/providers/RunnableProposal.java
index 0b1247a..dfd3cf1 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/proposal/providers/RunnableProposal.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/proposal/providers/RunnableProposal.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/proposal/providers/Separator.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/proposal/providers/Separator.java
index b812baf..d2ce707 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/proposal/providers/Separator.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/proposal/providers/Separator.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/uiextensionmodel/ActivityExtension.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/ActivityExtension.java
index e40255c..284dcf7 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/ActivityExtension.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/ActivityExtension.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/uiextensionmodel/CaseExtension.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/CaseExtension.java
index f1ebfce..63ed93e 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/CaseExtension.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/CaseExtension.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/uiextensionmodel/CopyExtension.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/CopyExtension.java
index 2f5ead0..eccdbaf 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/CopyExtension.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/CopyExtension.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/uiextensionmodel/EndNode.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/EndNode.java
index b906dc6..de7d740 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/EndNode.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/EndNode.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/uiextensionmodel/LinkExtension.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/LinkExtension.java
index 852b048..da0f65a 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/LinkExtension.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/LinkExtension.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/uiextensionmodel/OnAlarmExtension.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/OnAlarmExtension.java
index 3469351..c86a7ab 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/OnAlarmExtension.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/OnAlarmExtension.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/uiextensionmodel/OnEventExtension.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/OnEventExtension.java
index fdcc046..afe42d8 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/OnEventExtension.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/OnEventExtension.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/uiextensionmodel/OnMessageExtension.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/OnMessageExtension.java
index e452926..6262527 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/OnMessageExtension.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/OnMessageExtension.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/uiextensionmodel/PartnerLinkExtension.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/PartnerLinkExtension.java
index 572922a..9c84b54 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/PartnerLinkExtension.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/PartnerLinkExtension.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/uiextensionmodel/ProcessExtension.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/ProcessExtension.java
index 04b7201..5e97bee 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/ProcessExtension.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/ProcessExtension.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/uiextensionmodel/ReferencePartnerLinks.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/ReferencePartnerLinks.java
index 51c7054..c5b3b55 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/ReferencePartnerLinks.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/ReferencePartnerLinks.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/uiextensionmodel/StartNode.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/StartNode.java
index da00580..0831123 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/StartNode.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/StartNode.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/uiextensionmodel/UIExtensionModelPlugin.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/UIExtensionModelPlugin.java
index 0e1f798..755065d 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/UIExtensionModelPlugin.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/UIExtensionModelPlugin.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/uiextensionmodel/UiextensionmodelFactory.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/UiextensionmodelFactory.java
index e763405..5c9729f 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/UiextensionmodelFactory.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/UiextensionmodelFactory.java
@@ -2,9 +2,11 @@
  * <copyright>

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/uiextensionmodel/UiextensionmodelPackage.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/UiextensionmodelPackage.java
index 6d79d93..73ce309 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/UiextensionmodelPackage.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/UiextensionmodelPackage.java
@@ -2,9 +2,11 @@
  * <copyright>

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/uiextensionmodel/VariableExtension.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/VariableExtension.java
index 61eea2a..c825ff1 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/VariableExtension.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/VariableExtension.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/ActivityExtensionImpl.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/ActivityExtensionImpl.java
index afa488e..f672740 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/ActivityExtensionImpl.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/ActivityExtensionImpl.java
@@ -2,9 +2,11 @@
  * <copyright>

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/CaseExtensionImpl.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/CaseExtensionImpl.java
index 93521cf..2e1eea1 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/CaseExtensionImpl.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/CaseExtensionImpl.java
@@ -2,9 +2,11 @@
  * <copyright>

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/CopyExtensionImpl.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/CopyExtensionImpl.java
index 9394e05..cf1c951 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/CopyExtensionImpl.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/CopyExtensionImpl.java
@@ -2,9 +2,11 @@
  * <copyright>

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/EndNodeImpl.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/EndNodeImpl.java
index b302024..d1a11b4 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/EndNodeImpl.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/EndNodeImpl.java
@@ -2,9 +2,11 @@
  * <copyright>

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/LinkExtensionImpl.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/LinkExtensionImpl.java
index e9517cb..9da24ac 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/LinkExtensionImpl.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/LinkExtensionImpl.java
@@ -2,9 +2,11 @@
  * <copyright>

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/OnAlarmExtensionImpl.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/OnAlarmExtensionImpl.java
index dffe0ad..bceb59d 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/OnAlarmExtensionImpl.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/OnAlarmExtensionImpl.java
@@ -2,9 +2,11 @@
  * <copyright>

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/OnEventExtensionImpl.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/OnEventExtensionImpl.java
index e55e8e9..8bb90ad 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/OnEventExtensionImpl.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/OnEventExtensionImpl.java
@@ -2,9 +2,11 @@
  * <copyright>

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/OnMessageExtensionImpl.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/OnMessageExtensionImpl.java
index ce81ddb..a3e8ad3 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/OnMessageExtensionImpl.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/OnMessageExtensionImpl.java
@@ -2,9 +2,11 @@
  * <copyright>

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/PartnerLinkExtensionImpl.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/PartnerLinkExtensionImpl.java
index e18ecea..ee06319 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/PartnerLinkExtensionImpl.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/PartnerLinkExtensionImpl.java
@@ -2,9 +2,11 @@
  * <copyright>

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/ProcessExtensionImpl.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/ProcessExtensionImpl.java
index e80e9a0..5549e07 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/ProcessExtensionImpl.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/ProcessExtensionImpl.java
@@ -2,9 +2,11 @@
  * <copyright>

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/ReferencePartnerLinksImpl.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/ReferencePartnerLinksImpl.java
index a249a3b..56a0f45 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/ReferencePartnerLinksImpl.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/ReferencePartnerLinksImpl.java
@@ -2,9 +2,11 @@
  * <copyright>

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/StartNodeImpl.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/StartNodeImpl.java
index 8754e74..3c507eb 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/StartNodeImpl.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/StartNodeImpl.java
@@ -2,9 +2,11 @@
  * <copyright>

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/UiextensionmodelFactoryImpl.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/UiextensionmodelFactoryImpl.java
index 083ead6..9313be9 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/UiextensionmodelFactoryImpl.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/UiextensionmodelFactoryImpl.java
@@ -2,9 +2,11 @@
  * <copyright>

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/UiextensionmodelPackageImpl.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/UiextensionmodelPackageImpl.java
index ea02b28..7dbf465 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/UiextensionmodelPackageImpl.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/UiextensionmodelPackageImpl.java
@@ -2,9 +2,11 @@
  * <copyright>

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/VariableExtensionImpl.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/VariableExtensionImpl.java
index 0eacc16..6bb5ac2 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/VariableExtensionImpl.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/impl/VariableExtensionImpl.java
@@ -2,9 +2,11 @@
  * <copyright>

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/uiextensionmodel/util/UiextensionmodelAdapterFactory.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/util/UiextensionmodelAdapterFactory.java
index d4ceb78..4853a65 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/util/UiextensionmodelAdapterFactory.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/util/UiextensionmodelAdapterFactory.java
@@ -2,9 +2,11 @@
  * <copyright>

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/uiextensionmodel/util/UiextensionmodelSwitch.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/util/UiextensionmodelSwitch.java
index f5e678d..9371ca4 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/util/UiextensionmodelSwitch.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/uiextensionmodel/util/UiextensionmodelSwitch.java
@@ -2,9 +2,11 @@
  * <copyright>

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/util/AbstractSharedCommandStackListener.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/AbstractSharedCommandStackListener.java
index 926b137..260ecc3 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/AbstractSharedCommandStackListener.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/AbstractSharedCommandStackListener.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/util/BPELCellEditorLocator.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELCellEditorLocator.java
index e7303c7..4813056 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELCellEditorLocator.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELCellEditorLocator.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/util/BPELConnectionCreationTool.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELConnectionCreationTool.java
index 8ebb6d3..570c473 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELConnectionCreationTool.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELConnectionCreationTool.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/util/BPELCreationTool.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELCreationTool.java
index cfe3f34..e3c2207 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELCreationTool.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELCreationTool.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/util/BPELCreationToolEntry.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELCreationToolEntry.java
index 266a668..cb32c05 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELCreationToolEntry.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELCreationToolEntry.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/util/BPELDateTimeHelpers.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELDateTimeHelpers.java
index 735627f..7aad85c 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELDateTimeHelpers.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELDateTimeHelpers.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/util/BPELDirectEditManager.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELDirectEditManager.java
index 3f3514b..7ca659c 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELDirectEditManager.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELDirectEditManager.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/util/BPELDragEditPartsTracker.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELDragEditPartsTracker.java
index 859b159..5ff020a 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELDragEditPartsTracker.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELDragEditPartsTracker.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/util/BPELEditModel.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELEditModel.java
index 9bf4bbf..34ab363 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELEditModel.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELEditModel.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/util/BPELEditModelClient.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELEditModelClient.java
index a9a3b39..b944ff7 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELEditModelClient.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELEditModelClient.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/util/BPELEditorUtil.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELEditorUtil.java
index 0855320..f34ca9e 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELEditorUtil.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELEditorUtil.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.ui/src/org/eclipse/bpel/ui/util/BPELNodeAssociationManager.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELNodeAssociationManager.java
index 1e8979e..6666c14 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELNodeAssociationManager.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELNodeAssociationManager.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.ui/src/org/eclipse/bpel/ui/util/BPELReader.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELReader.java
index f22a0a4..42b21e5 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELReader.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELReader.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/util/BPELUtil.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELUtil.java
index 43c0204..2e36b1a 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELUtil.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELUtil.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/util/BatchedMultiObjectAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BatchedMultiObjectAdapter.java
index eea1ad1..6a4dc71 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BatchedMultiObjectAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BatchedMultiObjectAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/util/BrowseUtil.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BrowseUtil.java
index 47619dc..9e94885 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BrowseUtil.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BrowseUtil.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/util/CommandStackChangeBatcher.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/CommandStackChangeBatcher.java
index 1491859..22e1a27 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/CommandStackChangeBatcher.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/CommandStackChangeBatcher.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/util/FlowLinkUtil.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/FlowLinkUtil.java
index 7981288..2d6f5e0 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/FlowLinkUtil.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/FlowLinkUtil.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/util/FlowXYLayout.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/FlowXYLayout.java
index 55b86c2..497a63d 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/FlowXYLayout.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/FlowXYLayout.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/util/IBatchedAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/IBatchedAdapter.java
index 29834ca..8ea1d2c 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/IBatchedAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/IBatchedAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/util/IHilightControllingTool.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/IHilightControllingTool.java
index e822922..ba4ea26 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/IHilightControllingTool.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/IHilightControllingTool.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/util/IModelVisitor.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/IModelVisitor.java
index 2441efd..fea3773 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/IModelVisitor.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/IModelVisitor.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/util/ImplicitLinkHandlerConnectionRouter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/ImplicitLinkHandlerConnectionRouter.java
index 8aa2916..e81ad2e 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/ImplicitLinkHandlerConnectionRouter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/ImplicitLinkHandlerConnectionRouter.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.ui/src/org/eclipse/bpel/ui/util/ListMap.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/ListMap.java
index 23caa23..8bb5291 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/ListMap.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/ListMap.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/util/ModelHelper.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/ModelHelper.java
index 851e9d7..547d8e6 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/ModelHelper.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/ModelHelper.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/util/MultiObjectAdapter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/MultiObjectAdapter.java
index c2186f4..e5b73a0 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/MultiObjectAdapter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/MultiObjectAdapter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/util/NameDialog.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/NameDialog.java
index acf4828..d5580e9 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/NameDialog.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/NameDialog.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/util/NamespaceUtils.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/NamespaceUtils.java
index dfd4c52..4564c3c 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/NamespaceUtils.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/NamespaceUtils.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/util/NonclippingXYLayout.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/NonclippingXYLayout.java
index 7e50797..9997215 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/NonclippingXYLayout.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/NonclippingXYLayout.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/util/PartMappingUtil.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/PartMappingUtil.java
index 6bb4689..994584b 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/PartMappingUtil.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/PartMappingUtil.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2007, 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.ui/src/org/eclipse/bpel/ui/util/RowColumnLayout.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/RowColumnLayout.java
index 4d1c5d1..978e5dc 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/RowColumnLayout.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/RowColumnLayout.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/util/TableCursor.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/TableCursor.java
index 67d039a..db0ce6b 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/TableCursor.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/TableCursor.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/util/TransferBuffer.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/TransferBuffer.java
index 3894a4b..7f8a5af 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/TransferBuffer.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/TransferBuffer.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/util/WSDLImportHelper.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/WSDLImportHelper.java
index e166d90..da9916f 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/WSDLImportHelper.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/WSDLImportHelper.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/util/XSDUtils.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/XSDUtils.java
index ac4d1d7..55a6b84 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/XSDUtils.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/XSDUtils.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/util/ZoominTool.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/ZoominTool.java
index 34c3fe2..c1ec8c5 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/ZoominTool.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/ZoominTool.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/util/ZoominToolEntry.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/ZoominToolEntry.java
index e7d6454..e97e47b 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/ZoominToolEntry.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/ZoominToolEntry.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/util/ZoomoutTool.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/ZoomoutTool.java
index f050469..a95111f 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/ZoomoutTool.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/ZoomoutTool.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/util/ZoomoutToolEntry.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/ZoomoutToolEntry.java
index 5a8b586..363eaa8 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/ZoomoutToolEntry.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/ZoomoutToolEntry.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/util/filedialog/FileSelectionGroup.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/filedialog/FileSelectionGroup.java
index b908779..4fe7fb1 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/filedialog/FileSelectionGroup.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/filedialog/FileSelectionGroup.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/util/filedialog/ViewerFileFilter.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/filedialog/ViewerFileFilter.java
index 40260fb..cc49b08 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/filedialog/ViewerFileFilter.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/filedialog/ViewerFileFilter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/util/marker/BPELEditPartMarkerDecorator.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/marker/BPELEditPartMarkerDecorator.java
index bf6781d..4952b4d 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/marker/BPELEditPartMarkerDecorator.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/marker/BPELEditPartMarkerDecorator.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2005, 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.ui/src/org/eclipse/bpel/ui/wizards/CreatePartnerLinkTypeWizardNamePage.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/CreatePartnerLinkTypeWizardNamePage.java
index cc96d60..e115065 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/CreatePartnerLinkTypeWizardNamePage.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/CreatePartnerLinkTypeWizardNamePage.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/wizards/CreatePartnerLinkTypeWizardRolePage.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/CreatePartnerLinkTypeWizardRolePage.java
index 5d1a53a..a341199 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/CreatePartnerLinkTypeWizardRolePage.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/CreatePartnerLinkTypeWizardRolePage.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/wizards/CreatePartnerLinkWizard.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/CreatePartnerLinkWizard.java
index becfd92..8bb5e58 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/CreatePartnerLinkWizard.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/CreatePartnerLinkWizard.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/wizards/Messages.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/Messages.java
index bc97e04..af59b36 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/Messages.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/Messages.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.ui/src/org/eclipse/bpel/ui/wizards/NewBpelFileFirstPage.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewBpelFileFirstPage.java
index 7cef826..f03872c 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewBpelFileFirstPage.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewBpelFileFirstPage.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2006, 2012 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

diff --git a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewBpelFileLocationPage.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewBpelFileLocationPage.java
index 329b95f..4b3f6a8 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewBpelFileLocationPage.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewBpelFileLocationPage.java
@@ -1,9 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2006, 2012 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.ui/src/org/eclipse/bpel/ui/wizards/NewBpelFilePortTypePage.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewBpelFilePortTypePage.java
index 3e875f0..bffb27a 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewBpelFilePortTypePage.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewBpelFilePortTypePage.java
@@ -1,9 +1,11 @@
 /******************************************************************************

  * Copyright (c) 2011, 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

diff --git a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewBpelFileTemplatePage.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewBpelFileTemplatePage.java
index e3d9665..97ed39c 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewBpelFileTemplatePage.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewBpelFileTemplatePage.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2006, 2012 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

diff --git a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewBpelFileWizard.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewBpelFileWizard.java
index 83865bb..1dc8014 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewBpelFileWizard.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewBpelFileWizard.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2006, 2012 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

diff --git a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewBpelFileWizardUtils.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewBpelFileWizardUtils.java
index 16c3d01..0281992 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewBpelFileWizardUtils.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewBpelFileWizardUtils.java
@@ -1,9 +1,11 @@
 /******************************************************************************

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

diff --git a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLServiceDetail.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLServiceDetail.java
index e3c9e02..ca7fde8 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLServiceDetail.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLServiceDetail.java
Binary files differ
diff --git a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/messages.properties b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/messages.properties
index c003696..749273c 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/messages.properties
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/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.ui/templates/async/template.properties b/plugins/org.eclipse.bpel.ui/templates/async/template.properties
index dd40739..9a16b27 100644
--- a/plugins/org.eclipse.bpel.ui/templates/async/template.properties
+++ b/plugins/org.eclipse.bpel.ui/templates/async/template.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.ui/templates/empty/template.properties b/plugins/org.eclipse.bpel.ui/templates/empty/template.properties
index f3f4ace..cfb1483 100644
--- a/plugins/org.eclipse.bpel.ui/templates/empty/template.properties
+++ b/plugins/org.eclipse.bpel.ui/templates/empty/template.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.ui/templates/sync/template.properties b/plugins/org.eclipse.bpel.ui/templates/sync/template.properties
index cf797d0..37c7d13 100644
--- a/plugins/org.eclipse.bpel.ui/templates/sync/template.properties
+++ b/plugins/org.eclipse.bpel.ui/templates/sync/template.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.validator.junit/about.html b/plugins/org.eclipse.bpel.validator.junit/about.html
index 363bc9d..31a983e 100644
--- a/plugins/org.eclipse.bpel.validator.junit/about.html
+++ b/plugins/org.eclipse.bpel.validator.junit/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.validator.junit/plugin.properties b/plugins/org.eclipse.bpel.validator.junit/plugin.properties
index acaa00d..1a6f7b6 100644
--- a/plugins/org.eclipse.bpel.validator.junit/plugin.properties
+++ b/plugins/org.eclipse.bpel.validator.junit/plugin.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.validator.junit/src/org/eclipse/bpel/validator/junit/SimpleRunner.java b/plugins/org.eclipse.bpel.validator.junit/src/org/eclipse/bpel/validator/junit/SimpleRunner.java
index 79979bb..a1aeecb 100644
--- a/plugins/org.eclipse.bpel.validator.junit/src/org/eclipse/bpel/validator/junit/SimpleRunner.java
+++ b/plugins/org.eclipse.bpel.validator.junit/src/org/eclipse/bpel/validator/junit/SimpleRunner.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.validator.junit/src/org/eclipse/bpel/validator/junit/TestRunner.java b/plugins/org.eclipse.bpel.validator.junit/src/org/eclipse/bpel/validator/junit/TestRunner.java
index 8c1c821..4360fa0 100644
--- a/plugins/org.eclipse.bpel.validator.junit/src/org/eclipse/bpel/validator/junit/TestRunner.java
+++ b/plugins/org.eclipse.bpel.validator.junit/src/org/eclipse/bpel/validator/junit/TestRunner.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.validator/about.html b/plugins/org.eclipse.bpel.validator/about.html
index 363bc9d..31a983e 100644
--- a/plugins/org.eclipse.bpel.validator/about.html
+++ b/plugins/org.eclipse.bpel.validator/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.validator/plugin.properties b/plugins/org.eclipse.bpel.validator/plugin.properties
index a997e64..5ab41a8 100644
--- a/plugins/org.eclipse.bpel.validator/plugin.properties
+++ b/plugins/org.eclipse.bpel.validator/plugin.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.validator/src/org/eclipse/bpel/validator/AdapterManagerHelper.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/AdapterManagerHelper.java
index 28d36e4..9169abc 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/AdapterManagerHelper.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/AdapterManagerHelper.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.validator/src/org/eclipse/bpel/validator/BPELReader.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/BPELReader.java
index a8e232b..6c3b396 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/BPELReader.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/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.validator/src/org/eclipse/bpel/validator/EmfModelQuery.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/EmfModelQuery.java
index 17108cc..c057244 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/EmfModelQuery.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/EmfModelQuery.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.validator/src/org/eclipse/bpel/validator/IBPELMarker.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/IBPELMarker.java
index e63f22c..9818065 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/IBPELMarker.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/IBPELMarker.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.validator/src/org/eclipse/bpel/validator/Main.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/Main.java
index ae1ad36..45634fd 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/Main.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/Main.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.validator/src/org/eclipse/bpel/validator/ModelQuery.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/ModelQuery.java
index 7ef44e5..54e7709 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/ModelQuery.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/ModelQuery.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.validator/src/org/eclipse/bpel/validator/Validator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/Validator.java
index df851d8..ea459a9 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/Validator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/Validator.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.validator/src/org/eclipse/bpel/validator/ValidatorHelper.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/ValidatorHelper.java
index 323ee75..a24b19d 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/ValidatorHelper.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/ValidatorHelper.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.validator/src/org/eclipse/bpel/validator/XSDUtils.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/XSDUtils.java
index 4b04ed3..4a4c6cb 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/XSDUtils.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/XSDUtils.java
Binary files differ
diff --git a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/adapters/BasicAdapter.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/adapters/BasicAdapter.java
index d2114c4..9998f55 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/adapters/BasicAdapter.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/adapters/BasicAdapter.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.validator/src/org/eclipse/bpel/validator/adapters/FunctionAdapter.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/adapters/FunctionAdapter.java
index 922c67e..fd29fd7 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/adapters/FunctionAdapter.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/adapters/FunctionAdapter.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.validator/src/org/eclipse/bpel/validator/adapters/PartnerActivityAdapter.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/adapters/PartnerActivityAdapter.java
index 16e11b1..59cefb2 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/adapters/PartnerActivityAdapter.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/adapters/PartnerActivityAdapter.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.validator/src/org/eclipse/bpel/validator/adapters/VariableAdapter.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/adapters/VariableAdapter.java
index b7a618e..c77e66a 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/adapters/VariableAdapter.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/adapters/VariableAdapter.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.validator/src/org/eclipse/bpel/validator/factory/BPELValidatorAdapterFactory.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/factory/BPELValidatorAdapterFactory.java
index 9b6028c..a747b33 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/factory/BPELValidatorAdapterFactory.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/factory/BPELValidatorAdapterFactory.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.validator/src/org/eclipse/bpel/validator/factory/FunctionMetaValidatorAdapterFactory.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/factory/FunctionMetaValidatorAdapterFactory.java
index 8c77068..e2cb652 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/factory/FunctionMetaValidatorAdapterFactory.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/factory/FunctionMetaValidatorAdapterFactory.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.validator/src/org/eclipse/bpel/validator/helpers/CmdValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/helpers/CmdValidator.java
index 5da1b41..ca77327 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/helpers/CmdValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/helpers/CmdValidator.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.validator/src/org/eclipse/bpel/validator/helpers/DOMNodeAdapter.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/helpers/DOMNodeAdapter.java
index 49b469d..ace99ca 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/helpers/DOMNodeAdapter.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/helpers/DOMNodeAdapter.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.validator/src/org/eclipse/bpel/validator/helpers/GetOpt.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/helpers/GetOpt.java
index e482199..e01dc5b 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/helpers/GetOpt.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/helpers/GetOpt.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.validator/src/org/eclipse/bpel/validator/helpers/JavaScriptSource.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/helpers/JavaScriptSource.java
index 7e63023..c469f98 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/helpers/JavaScriptSource.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/helpers/JavaScriptSource.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.validator/src/org/eclipse/bpel/validator/helpers/LocationCapturingDOMParser.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/helpers/LocationCapturingDOMParser.java
index 6d92885..adc1678 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/helpers/LocationCapturingDOMParser.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/helpers/LocationCapturingDOMParser.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.validator/src/org/eclipse/bpel/validator/helpers/ModelQueryImpl.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/helpers/ModelQueryImpl.java
index 2c45435..52455ae 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/helpers/ModelQueryImpl.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/helpers/ModelQueryImpl.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.validator/src/org/eclipse/bpel/validator/helpers/NCNameWordDetector.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/helpers/NCNameWordDetector.java
index 512b132..7ef4825 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/helpers/NCNameWordDetector.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/helpers/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.validator/src/org/eclipse/bpel/validator/helpers/QNameWordDetector.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/helpers/QNameWordDetector.java
index 1e3ab0e..b80a4b5 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/helpers/QNameWordDetector.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/helpers/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.validator/src/org/eclipse/bpel/validator/helpers/VariableNameWordDetector.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/helpers/VariableNameWordDetector.java
index f6228da..6708e4e 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/helpers/VariableNameWordDetector.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/helpers/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.validator/src/org/eclipse/bpel/validator/helpers/XMLNameWordDetector.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/helpers/XMLNameWordDetector.java
index e4e1b71..c535b20 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/helpers/XMLNameWordDetector.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/helpers/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.validator/src/org/eclipse/bpel/validator/model/ARule.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/ARule.java
index 560d23c..7be0e6d 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/ARule.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/ARule.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.validator/src/org/eclipse/bpel/validator/model/Filter.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/Filter.java
index a79e5bf..dd895a6 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/Filter.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/Filter.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.validator/src/org/eclipse/bpel/validator/model/Filters.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/Filters.java
index 5d141ae..8a33dc3 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/Filters.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/Filters.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.validator/src/org/eclipse/bpel/validator/model/IConstants.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IConstants.java
index b881859..07003ea 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IConstants.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IConstants.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.validator/src/org/eclipse/bpel/validator/model/IFactory.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IFactory.java
index 69782a9..84c9021 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IFactory.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IFactory.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.validator/src/org/eclipse/bpel/validator/model/IFilter.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IFilter.java
index e3b6c0e..01868ce 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IFilter.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IFilter.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.validator/src/org/eclipse/bpel/validator/model/IFunctionMeta.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IFunctionMeta.java
index a7fa82a..14a920c 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IFunctionMeta.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IFunctionMeta.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.validator/src/org/eclipse/bpel/validator/model/IModelQuery.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IModelQuery.java
index 5dfea7c..79618ee 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IModelQuery.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IModelQuery.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.validator/src/org/eclipse/bpel/validator/model/IModelQueryLookups.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IModelQueryLookups.java
index 81be83e..060be51 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IModelQueryLookups.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IModelQueryLookups.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.validator/src/org/eclipse/bpel/validator/model/INode.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/INode.java
index 04832ed..f41cf04 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/INode.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/INode.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.validator/src/org/eclipse/bpel/validator/model/IProblem.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IProblem.java
index e7cf29e..30eceef 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IProblem.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IProblem.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.validator/src/org/eclipse/bpel/validator/model/IValue.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IValue.java
index af27efe..88f60ee 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IValue.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/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.validator/src/org/eclipse/bpel/validator/model/Messages.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/Messages.java
index 5cf5ad0..684be40 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/Messages.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/Messages.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.validator/src/org/eclipse/bpel/validator/model/NodeAttributeValueFilter.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/NodeAttributeValueFilter.java
index 18316a0..d394cbb 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/NodeAttributeValueFilter.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/NodeAttributeValueFilter.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.validator/src/org/eclipse/bpel/validator/model/NodeNameFilter.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/NodeNameFilter.java
index 18f2e6c..1b633d2 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/NodeNameFilter.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/NodeNameFilter.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.validator/src/org/eclipse/bpel/validator/model/Problem.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/Problem.java
index 9bcb960..b1adff0 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/Problem.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/Problem.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.validator/src/org/eclipse/bpel/validator/model/RuleFactory.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/RuleFactory.java
index e855b1f..c832441 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/RuleFactory.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/RuleFactory.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.validator/src/org/eclipse/bpel/validator/model/RuleRunner.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/RuleRunner.java
index d0c312c..86705be 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/RuleRunner.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/RuleRunner.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.validator/src/org/eclipse/bpel/validator/model/Rules.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/Rules.java
index 411e392..e0aaf5d 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/Rules.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/Rules.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.validator/src/org/eclipse/bpel/validator/model/Runner.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/Runner.java
index ac1a6ee..fb7356e 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/Runner.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/Runner.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.validator/src/org/eclipse/bpel/validator/model/Selector.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/Selector.java
index f580803..79b94a9 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/Selector.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/Selector.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.validator/src/org/eclipse/bpel/validator/model/UndefinedNode.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/UndefinedNode.java
index 1eee97a..75ee99c 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/UndefinedNode.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/UndefinedNode.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.validator/src/org/eclipse/bpel/validator/model/Validator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/Validator.java
index 23a0dc1..3d664a7 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/Validator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/Validator.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.validator/src/org/eclipse/bpel/validator/model/ValueFilter.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/ValueFilter.java
index 7e503ba..1cdc4cb 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/ValueFilter.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/ValueFilter.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.validator/src/org/eclipse/bpel/validator/model/XNotImplemented.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/XNotImplemented.java
index a90bb02..a61689a 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/XNotImplemented.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/XNotImplemented.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.validator/src/org/eclipse/bpel/validator/plt/Factory.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/plt/Factory.java
index a37193b..4377cc6 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/plt/Factory.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/plt/Factory.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.validator/src/org/eclipse/bpel/validator/rules/AssignValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/AssignValidator.java
index 4cfe64e..c60b3b0 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/AssignValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/AssignValidator.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.validator/src/org/eclipse/bpel/validator/rules/BranchesValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/BranchesValidator.java
index 234a25b..08ed036 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/BranchesValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/BranchesValidator.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.validator/src/org/eclipse/bpel/validator/rules/CActivityValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CActivityValidator.java
index 92d182d..df01f34 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CActivityValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CActivityValidator.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.validator/src/org/eclipse/bpel/validator/rules/CContainerValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CContainerValidator.java
index b88223f..50efacf 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CContainerValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CContainerValidator.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.validator/src/org/eclipse/bpel/validator/rules/CPartnerActivityValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CPartnerActivityValidator.java
index 4749ec8..e8c3b2b 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CPartnerActivityValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CPartnerActivityValidator.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.validator/src/org/eclipse/bpel/validator/rules/CValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CValidator.java
index e2d67fb..2310b42 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CValidator.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.validator/src/org/eclipse/bpel/validator/rules/CatchAllValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CatchAllValidator.java
index fbe4f71..68fd05c 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CatchAllValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CatchAllValidator.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.validator/src/org/eclipse/bpel/validator/rules/CatchValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CatchValidator.java
index 18f35de..aee74ff 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CatchValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CatchValidator.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.validator/src/org/eclipse/bpel/validator/rules/CompensateScopeValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CompensateScopeValidator.java
index 671851a..60c961d 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CompensateScopeValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CompensateScopeValidator.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.validator/src/org/eclipse/bpel/validator/rules/CompensateValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CompensateValidator.java
index 47d4f8d..9360591 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CompensateValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CompensateValidator.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.validator/src/org/eclipse/bpel/validator/rules/CompensationHandlerValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CompensationHandlerValidator.java
index 85ed88f..4c74a8c 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CompensationHandlerValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CompensationHandlerValidator.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.validator/src/org/eclipse/bpel/validator/rules/CompletionConditionValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CompletionConditionValidator.java
index e006ea8..fd72662 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CompletionConditionValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CompletionConditionValidator.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.validator/src/org/eclipse/bpel/validator/rules/ConditionValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ConditionValidator.java
index 6bb417c..6320bdd 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ConditionValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ConditionValidator.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.validator/src/org/eclipse/bpel/validator/rules/CopyValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CopyValidator.java
index fb7e70b..e204526 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CopyValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CopyValidator.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.validator/src/org/eclipse/bpel/validator/rules/CorrelationSetValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CorrelationSetValidator.java
index 1dc95a3..e80f633 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CorrelationSetValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CorrelationSetValidator.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.validator/src/org/eclipse/bpel/validator/rules/CorrelationSetsValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CorrelationSetsValidator.java
index 6122c4f..8438003 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CorrelationSetsValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CorrelationSetsValidator.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.validator/src/org/eclipse/bpel/validator/rules/CorrelationValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CorrelationValidator.java
index 4ec9fe2..698147f 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CorrelationValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CorrelationValidator.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.validator/src/org/eclipse/bpel/validator/rules/CorrelationsValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CorrelationsValidator.java
index 48ebfc6..dbd68b8 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CorrelationsValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CorrelationsValidator.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.validator/src/org/eclipse/bpel/validator/rules/ElseValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ElseValidator.java
index 0c66bda..66b7f38 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ElseValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ElseValidator.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.validator/src/org/eclipse/bpel/validator/rules/ElseifValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ElseifValidator.java
index 722cf2d..e5eb7dc 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ElseifValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ElseifValidator.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.validator/src/org/eclipse/bpel/validator/rules/EmptyValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/EmptyValidator.java
index 7c6fb33..a82e8ad 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/EmptyValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/EmptyValidator.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.validator/src/org/eclipse/bpel/validator/rules/EventHandlersValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/EventHandlersValidator.java
index 59f2267..4e1e7fa 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/EventHandlersValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/EventHandlersValidator.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.validator/src/org/eclipse/bpel/validator/rules/ExitValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ExitValidator.java
index 2dd59cf..182270f 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ExitValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ExitValidator.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.validator/src/org/eclipse/bpel/validator/rules/ExtensionActivityValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ExtensionActivityValidator.java
index 07d31b6..c639940 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ExtensionActivityValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ExtensionActivityValidator.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.validator/src/org/eclipse/bpel/validator/rules/ExtensionValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ExtensionValidator.java
index b7196d2..b9e6789 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ExtensionValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ExtensionValidator.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.validator/src/org/eclipse/bpel/validator/rules/ExtensionsValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ExtensionsValidator.java
index 8635aef..cae50f2 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ExtensionsValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ExtensionsValidator.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.validator/src/org/eclipse/bpel/validator/rules/Factory.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/Factory.java
index a5cbf1b..72cb6b4 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/Factory.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/Factory.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.validator/src/org/eclipse/bpel/validator/rules/FaultHandlersValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/FaultHandlersValidator.java
index 748bd4f..1733b7b 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/FaultHandlersValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/FaultHandlersValidator.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.validator/src/org/eclipse/bpel/validator/rules/FinalCounterValueValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/FinalCounterValueValidator.java
index 43694b0..0a6147d 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/FinalCounterValueValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/FinalCounterValueValidator.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.validator/src/org/eclipse/bpel/validator/rules/FlowValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/FlowValidator.java
index da5f439..986294e 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/FlowValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/FlowValidator.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.validator/src/org/eclipse/bpel/validator/rules/ForEachValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ForEachValidator.java
index 6695a83..9990eea 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ForEachValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ForEachValidator.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.validator/src/org/eclipse/bpel/validator/rules/ForValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ForValidator.java
index 74fccc0..487c8fb 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ForValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ForValidator.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.validator/src/org/eclipse/bpel/validator/rules/FromPartValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/FromPartValidator.java
index e6f024d..cf7e92f 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/FromPartValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/FromPartValidator.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.validator/src/org/eclipse/bpel/validator/rules/FromPartsValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/FromPartsValidator.java
index cf47353..4ebe250 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/FromPartsValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/FromPartsValidator.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.validator/src/org/eclipse/bpel/validator/rules/FromValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/FromValidator.java
index 1219423..cf580b1 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/FromValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/FromValidator.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.validator/src/org/eclipse/bpel/validator/rules/IfValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/IfValidator.java
index 95f2f1b..c6fb0bc 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/IfValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/IfValidator.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.validator/src/org/eclipse/bpel/validator/rules/ImportValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ImportValidator.java
index 367b2a3..936f512 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ImportValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ImportValidator.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.validator/src/org/eclipse/bpel/validator/rules/InvokeValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/InvokeValidator.java
index 785beeb..9c59244 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/InvokeValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/InvokeValidator.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.validator/src/org/eclipse/bpel/validator/rules/JoinConditionValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/JoinConditionValidator.java
index a81ead4..9b91dda 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/JoinConditionValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/JoinConditionValidator.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.validator/src/org/eclipse/bpel/validator/rules/LinkValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/LinkValidator.java
index 06ddd3c..5491116 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/LinkValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/LinkValidator.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.validator/src/org/eclipse/bpel/validator/rules/LinksValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/LinksValidator.java
index 96d9964..761af51 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/LinksValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/LinksValidator.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.validator/src/org/eclipse/bpel/validator/rules/LiteralValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/LiteralValidator.java
index 3107faa..195620f 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/LiteralValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/LiteralValidator.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.validator/src/org/eclipse/bpel/validator/rules/MessageExchangeValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/MessageExchangeValidator.java
index b527c39..82f707c 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/MessageExchangeValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/MessageExchangeValidator.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.validator/src/org/eclipse/bpel/validator/rules/MessageExchangesValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/MessageExchangesValidator.java
index 64bc58b..5772d39 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/MessageExchangesValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/MessageExchangesValidator.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.validator/src/org/eclipse/bpel/validator/rules/OnAlarmValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/OnAlarmValidator.java
index 9ac7a3f..6b1acb2 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/OnAlarmValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/OnAlarmValidator.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.validator/src/org/eclipse/bpel/validator/rules/OnEventValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/OnEventValidator.java
index ebfc10e..510a4dc 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/OnEventValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/OnEventValidator.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.validator/src/org/eclipse/bpel/validator/rules/OnMessageValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/OnMessageValidator.java
index 1c0d007..bb71c19 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/OnMessageValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/OnMessageValidator.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.validator/src/org/eclipse/bpel/validator/rules/PartnerLinkValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/PartnerLinkValidator.java
index 838a7e8..874323e 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/PartnerLinkValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/PartnerLinkValidator.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.validator/src/org/eclipse/bpel/validator/rules/PartnerLinksValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/PartnerLinksValidator.java
index c32228c..22a24ee 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/PartnerLinksValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/PartnerLinksValidator.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.validator/src/org/eclipse/bpel/validator/rules/PickValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/PickValidator.java
index 421e2c0..ad95da1 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/PickValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/PickValidator.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.validator/src/org/eclipse/bpel/validator/rules/ProcessValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ProcessValidator.java
index 06aa813..7dbe78c 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ProcessValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ProcessValidator.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.validator/src/org/eclipse/bpel/validator/rules/QueryValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/QueryValidator.java
index 23ca0b1..1276b4e 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/QueryValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/QueryValidator.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.validator/src/org/eclipse/bpel/validator/rules/ReceiveValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ReceiveValidator.java
index a6b65f4..d69f736 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ReceiveValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ReceiveValidator.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.validator/src/org/eclipse/bpel/validator/rules/RepeatEveryValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/RepeatEveryValidator.java
index 29e8cb0..8a08e98 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/RepeatEveryValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/RepeatEveryValidator.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.validator/src/org/eclipse/bpel/validator/rules/RepeatUntilValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/RepeatUntilValidator.java
index d6cb0de..50c321a 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/RepeatUntilValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/RepeatUntilValidator.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.validator/src/org/eclipse/bpel/validator/rules/ReplyValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ReplyValidator.java
index 21e5bf2..9fcaefb 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ReplyValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ReplyValidator.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.validator/src/org/eclipse/bpel/validator/rules/RethrowValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/RethrowValidator.java
index be10bcf..657912b 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/RethrowValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/RethrowValidator.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.validator/src/org/eclipse/bpel/validator/rules/ScopeValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ScopeValidator.java
index a52c29a..1765d03 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ScopeValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ScopeValidator.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.validator/src/org/eclipse/bpel/validator/rules/SequenceValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/SequenceValidator.java
index 559b665..7faff69 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/SequenceValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/SequenceValidator.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.validator/src/org/eclipse/bpel/validator/rules/SourceValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/SourceValidator.java
index 9e22ab5..38e39a8 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/SourceValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/SourceValidator.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.validator/src/org/eclipse/bpel/validator/rules/SourcesValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/SourcesValidator.java
index 7d5cfa0..74c18b1 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/SourcesValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/SourcesValidator.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.validator/src/org/eclipse/bpel/validator/rules/StartCounterValueValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/StartCounterValueValidator.java
index 3b4de8e..ae7ffc8 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/StartCounterValueValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/StartCounterValueValidator.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.validator/src/org/eclipse/bpel/validator/rules/TargetValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/TargetValidator.java
index fca696d..d6bd4fc 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/TargetValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/TargetValidator.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.validator/src/org/eclipse/bpel/validator/rules/TargetsValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/TargetsValidator.java
index f1f5097..2959887 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/TargetsValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/TargetsValidator.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.validator/src/org/eclipse/bpel/validator/rules/TerminationHandlerValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/TerminationHandlerValidator.java
index 65b5dbd..acc1f60 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/TerminationHandlerValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/TerminationHandlerValidator.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.validator/src/org/eclipse/bpel/validator/rules/ThrowValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ThrowValidator.java
index 4ef1b68..08a76bb 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ThrowValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ThrowValidator.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.validator/src/org/eclipse/bpel/validator/rules/ToPartValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ToPartValidator.java
index 31c3291..59114cb 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ToPartValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ToPartValidator.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.validator/src/org/eclipse/bpel/validator/rules/ToPartsValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ToPartsValidator.java
index 2feca1f..d25c333 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ToPartsValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ToPartsValidator.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.validator/src/org/eclipse/bpel/validator/rules/ToValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ToValidator.java
index f6c4b2f..0ad4838 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ToValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ToValidator.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.validator/src/org/eclipse/bpel/validator/rules/TransitionConditionValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/TransitionConditionValidator.java
index 6873243..517fd49 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/TransitionConditionValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/TransitionConditionValidator.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.validator/src/org/eclipse/bpel/validator/rules/UnknownElementValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/UnknownElementValidator.java
index 2534d91..68554f2 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/UnknownElementValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/UnknownElementValidator.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.validator.rules;
 
diff --git a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/UntilValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/UntilValidator.java
index e80cf0f..f5dfd8d 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/UntilValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/UntilValidator.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.validator/src/org/eclipse/bpel/validator/rules/ValidateValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ValidateValidator.java
index a32aa45..68ca85d 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ValidateValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ValidateValidator.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.validator/src/org/eclipse/bpel/validator/rules/ValidatorNotFound.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ValidatorNotFound.java
index f04c98c..54d49ad 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ValidatorNotFound.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ValidatorNotFound.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.validator/src/org/eclipse/bpel/validator/rules/VariableValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/VariableValidator.java
index b4abb04..db23edc 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/VariableValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/VariableValidator.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.validator/src/org/eclipse/bpel/validator/rules/VariablesValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/VariablesValidator.java
index cc461ed..e770ca1 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/VariablesValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/VariablesValidator.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.validator/src/org/eclipse/bpel/validator/rules/WaitValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/WaitValidator.java
index fa87605..91dd4d2 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/WaitValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/WaitValidator.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.validator/src/org/eclipse/bpel/validator/rules/WhileValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/WhileValidator.java
index 7466099..4588a8b 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/WhileValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/WhileValidator.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.validator/src/org/eclipse/bpel/validator/tools/ParserTool.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/tools/ParserTool.java
index bf99965..72fb0a6 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/tools/ParserTool.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/tools/ParserTool.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.validator/src/org/eclipse/bpel/validator/unsupported/Factory.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/unsupported/Factory.java
index d459208..4b595c2 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/unsupported/Factory.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/unsupported/Factory.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.validator/src/org/eclipse/bpel/validator/unsupported/Process.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/unsupported/Process.java
index 1da4fea..653eaab 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/unsupported/Process.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/unsupported/Process.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.validator/src/org/eclipse/bpel/validator/vprop/Factory.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/vprop/Factory.java
index 9f5200a..b50c978 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/vprop/Factory.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/vprop/Factory.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.validator/src/org/eclipse/bpel/validator/vprop/Property.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/vprop/Property.java
index a56029c..38e839d 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/vprop/Property.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/vprop/Property.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.validator/src/org/eclipse/bpel/validator/vprop/PropertyAlias.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/vprop/PropertyAlias.java
index b34670e..b428f15 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/vprop/PropertyAlias.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/vprop/PropertyAlias.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.validator/src/org/eclipse/bpel/validator/vprop/Query.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/vprop/Query.java
index 5f0d6b6..58bd6f5 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/vprop/Query.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/vprop/Query.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.validator/src/org/eclipse/bpel/validator/wsdl/Definitions.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/wsdl/Definitions.java
index 9de88c8..1bfcae4 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/wsdl/Definitions.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/wsdl/Definitions.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.validator/src/org/eclipse/bpel/validator/wsdl/Factory.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/wsdl/Factory.java
index cb64aa0..1618e67 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/wsdl/Factory.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/wsdl/Factory.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.validator/src/org/eclipse/bpel/validator/xpath/Branches.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/Branches.java
index 3babe1e..6d3a6b5 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/Branches.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/Branches.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.validator/src/org/eclipse/bpel/validator/xpath/Condition.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/Condition.java
index e13158a..017c536 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/Condition.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/Condition.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.validator/src/org/eclipse/bpel/validator/xpath/Factory.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/Factory.java
index bdc13d7..b77a80f 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/Factory.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/Factory.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.validator/src/org/eclipse/bpel/validator/xpath/FinalCounterValue.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/FinalCounterValue.java
index c89b1b0..46d2f5c 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/FinalCounterValue.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/FinalCounterValue.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.validator/src/org/eclipse/bpel/validator/xpath/For.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/For.java
index b4ea0c7..cb911c8 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/For.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/For.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.validator/src/org/eclipse/bpel/validator/xpath/From.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/From.java
index 56fa4cf..080fd38 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/From.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/From.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.validator/src/org/eclipse/bpel/validator/xpath/JoinCondition.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/JoinCondition.java
index 44ce0bf..1ade98c 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/JoinCondition.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/JoinCondition.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.validator/src/org/eclipse/bpel/validator/xpath/Main.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/Main.java
index 9f0a5b7..bf3b95b 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/Main.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/Main.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.validator/src/org/eclipse/bpel/validator/xpath/Query.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/Query.java
index 7643f73..be97032 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/Query.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/Query.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.validator/src/org/eclipse/bpel/validator/xpath/RepeatUntil.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/RepeatUntil.java
index 33f4489..2e8b61f 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/RepeatUntil.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/RepeatUntil.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.validator/src/org/eclipse/bpel/validator/xpath/StartCounterValue.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/StartCounterValue.java
index 2aa58dc..cc0d0d8 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/StartCounterValue.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/StartCounterValue.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.validator/src/org/eclipse/bpel/validator/xpath/To.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/To.java
index 7bf58f9..cc9d957 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/To.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/To.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.validator/src/org/eclipse/bpel/validator/xpath/TransitionCondition.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/TransitionCondition.java
index 2cad3e5..8508e5e 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/TransitionCondition.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/TransitionCondition.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.validator/src/org/eclipse/bpel/validator/xpath/Until.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/Until.java
index c581269..ee5e344 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/Until.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/Until.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.validator/src/org/eclipse/bpel/validator/xpath/XPathValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/XPathValidator.java
index 4905803..081ac7e 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/XPathValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/XPathValidator.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.validator/src/org/eclipse/bpel/validator/xpath/XPathVisitor.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/XPathVisitor.java
index a1dd13d..83ef99d 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/XPathVisitor.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/XPathVisitor.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.validator/src/org/eclipse/bpel/validator/xpath0/Factory.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath0/Factory.java
index 82c5e25..de98134 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath0/Factory.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath0/Factory.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.validator/src/org/eclipse/bpel/validator/xpath0/XPathValidator.java b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath0/XPathValidator.java
index 178ca5f..1e9a124 100644
--- a/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath0/XPathValidator.java
+++ b/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath0/XPathValidator.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.wsil.model/about.html b/plugins/org.eclipse.bpel.wsil.model/about.html
index 363bc9d..31a983e 100644
--- a/plugins/org.eclipse.bpel.wsil.model/about.html
+++ b/plugins/org.eclipse.bpel.wsil.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.wsil.model/plugin.properties b/plugins/org.eclipse.bpel.wsil.model/plugin.properties
index 3a59e39..a2ff0c9 100644
--- a/plugins/org.eclipse.bpel.wsil.model/plugin.properties
+++ b/plugins/org.eclipse.bpel.wsil.model/plugin.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.xpath10.junit/about.html b/plugins/org.eclipse.bpel.xpath10.junit/about.html
index 363bc9d..31a983e 100644
--- a/plugins/org.eclipse.bpel.xpath10.junit/about.html
+++ b/plugins/org.eclipse.bpel.xpath10.junit/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.xpath10.junit/plugin.properties b/plugins/org.eclipse.bpel.xpath10.junit/plugin.properties
index 6702977..ed976ae 100644
--- a/plugins/org.eclipse.bpel.xpath10.junit/plugin.properties
+++ b/plugins/org.eclipse.bpel.xpath10.junit/plugin.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.xpath10/about.html b/plugins/org.eclipse.bpel.xpath10/about.html
index 363bc9d..31a983e 100644
--- a/plugins/org.eclipse.bpel.xpath10/about.html
+++ b/plugins/org.eclipse.bpel.xpath10/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.xpath10/plugin.properties b/plugins/org.eclipse.bpel.xpath10/plugin.properties
index 5b8637c..790b931 100644
--- a/plugins/org.eclipse.bpel.xpath10/plugin.properties
+++ b/plugins/org.eclipse.bpel.xpath10/plugin.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.xpath10/src/org/eclipse/bpel/xpath10/AdditiveExpr.java b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/AdditiveExpr.java
index 97939d8..427032a 100644
--- a/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/AdditiveExpr.java
+++ b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/AdditiveExpr.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.xpath10/src/org/eclipse/bpel/xpath10/AllNodeStep.java b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/AllNodeStep.java
index 8b62c05..29caf42 100644
--- a/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/AllNodeStep.java
+++ b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/AllNodeStep.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.xpath10/src/org/eclipse/bpel/xpath10/Axis.java b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/Axis.java
index 77b8e23..567a3ac 100644
--- a/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/Axis.java
+++ b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/Axis.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.xpath10/src/org/eclipse/bpel/xpath10/BinaryExpr.java b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/BinaryExpr.java
index 384389d..d752b57 100644
--- a/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/BinaryExpr.java
+++ b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/BinaryExpr.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.xpath10/src/org/eclipse/bpel/xpath10/CommentNodeStep.java b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/CommentNodeStep.java
index dae338a..860654d 100644
--- a/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/CommentNodeStep.java
+++ b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/CommentNodeStep.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.xpath10/src/org/eclipse/bpel/xpath10/EqualityExpr.java b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/EqualityExpr.java
index 5036705..18bac33 100644
--- a/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/EqualityExpr.java
+++ b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/EqualityExpr.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.xpath10/src/org/eclipse/bpel/xpath10/Expr.java b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/Expr.java
index 7b225ae..0484be2 100644
--- a/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/Expr.java
+++ b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/Expr.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.xpath10/src/org/eclipse/bpel/xpath10/FilterExpr.java b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/FilterExpr.java
index e62855a..fc73487 100644
--- a/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/FilterExpr.java
+++ b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/FilterExpr.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.xpath10/src/org/eclipse/bpel/xpath10/FunctionCallExpr.java b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/FunctionCallExpr.java
index a86feda..53c1441 100644
--- a/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/FunctionCallExpr.java
+++ b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/FunctionCallExpr.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.xpath10/src/org/eclipse/bpel/xpath10/LiteralExpr.java b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/LiteralExpr.java
index 13eeadb..c86b192 100644
--- a/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/LiteralExpr.java
+++ b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/LiteralExpr.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.xpath10/src/org/eclipse/bpel/xpath10/LocationPath.java b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/LocationPath.java
index 5239aff..1fb6e30 100644
--- a/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/LocationPath.java
+++ b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/LocationPath.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.xpath10/src/org/eclipse/bpel/xpath10/LogicalExpr.java b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/LogicalExpr.java
index 2033e79..f27f722 100644
--- a/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/LogicalExpr.java
+++ b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/LogicalExpr.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.xpath10/src/org/eclipse/bpel/xpath10/MultiplicativeExpr.java b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/MultiplicativeExpr.java
index dfe37fe..d1cfbc5 100644
--- a/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/MultiplicativeExpr.java
+++ b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/MultiplicativeExpr.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.xpath10/src/org/eclipse/bpel/xpath10/NameStep.java b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/NameStep.java
index 6a0a2da..cf2f953 100644
--- a/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/NameStep.java
+++ b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/NameStep.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.xpath10/src/org/eclipse/bpel/xpath10/NumberExpr.java b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/NumberExpr.java
index cac7177..6853c12 100644
--- a/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/NumberExpr.java
+++ b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/NumberExpr.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.xpath10/src/org/eclipse/bpel/xpath10/PathExpr.java b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/PathExpr.java
index c574488..1b5353d 100644
--- a/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/PathExpr.java
+++ b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/PathExpr.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.xpath10/src/org/eclipse/bpel/xpath10/Predicate.java b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/Predicate.java
index dc90be1..28a29a2 100644
--- a/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/Predicate.java
+++ b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/Predicate.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.xpath10/src/org/eclipse/bpel/xpath10/ProcessingInstructionNodeStep.java b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/ProcessingInstructionNodeStep.java
index 751a2ef..2853c7d 100644
--- a/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/ProcessingInstructionNodeStep.java
+++ b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/ProcessingInstructionNodeStep.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.xpath10/src/org/eclipse/bpel/xpath10/RelationalExpr.java b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/RelationalExpr.java
index 7c1297a..d9a7801 100644
--- a/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/RelationalExpr.java
+++ b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/RelationalExpr.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.xpath10/src/org/eclipse/bpel/xpath10/Step.java b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/Step.java
index 419c03d..46ce3fd 100644
--- a/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/Step.java
+++ b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/Step.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.xpath10/src/org/eclipse/bpel/xpath10/TextNodeStep.java b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/TextNodeStep.java
index 54294c3..0d50713 100644
--- a/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/TextNodeStep.java
+++ b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/TextNodeStep.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.xpath10/src/org/eclipse/bpel/xpath10/UnaryExpr.java b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/UnaryExpr.java
index c585d62..d506931 100644
--- a/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/UnaryExpr.java
+++ b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/UnaryExpr.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.xpath10/src/org/eclipse/bpel/xpath10/UnionExpr.java b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/UnionExpr.java
index 5e183d2..fcf04cd 100644
--- a/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/UnionExpr.java
+++ b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/UnionExpr.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.xpath10/src/org/eclipse/bpel/xpath10/VariableReferenceExpr.java b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/VariableReferenceExpr.java
index 9c6e7fe..98dbe90 100644
--- a/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/VariableReferenceExpr.java
+++ b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/VariableReferenceExpr.java
Binary files differ
diff --git a/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/Visitor.java b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/Visitor.java
index 7457056..00b11d2 100644
--- a/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/Visitor.java
+++ b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/Visitor.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.xpath10/src/org/eclipse/bpel/xpath10/parser/XPath10Exception.java b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/parser/XPath10Exception.java
index 657681b..efb9463 100644
--- a/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/parser/XPath10Exception.java
+++ b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/parser/XPath10Exception.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.xpath10/src/org/eclipse/bpel/xpath10/parser/XPath10Factory.java b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/parser/XPath10Factory.java
index 8b4b4b6..ba89780 100644
--- a/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/parser/XPath10Factory.java
+++ b/plugins/org.eclipse.bpel.xpath10/src/org/eclipse/bpel/xpath10/parser/XPath10Factory.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/tests/org.eclipse.bpel.common.wsdl.tests/about.html b/tests/org.eclipse.bpel.common.wsdl.tests/about.html
index 363bc9d..31a983e 100644
--- a/tests/org.eclipse.bpel.common.wsdl.tests/about.html
+++ b/tests/org.eclipse.bpel.common.wsdl.tests/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/tests/org.eclipse.bpel.common.wsdl.tests/src/org/eclipse/bpel/common/wsdl/importhelpers/WsdlImportHelperTest.java b/tests/org.eclipse.bpel.common.wsdl.tests/src/org/eclipse/bpel/common/wsdl/importhelpers/WsdlImportHelperTest.java
index ef9db80..d424c90 100644
--- a/tests/org.eclipse.bpel.common.wsdl.tests/src/org/eclipse/bpel/common/wsdl/importhelpers/WsdlImportHelperTest.java
+++ b/tests/org.eclipse.bpel.common.wsdl.tests/src/org/eclipse/bpel/common/wsdl/importhelpers/WsdlImportHelperTest.java
@@ -1,9 +1,11 @@
 /******************************************************************************
  * Copyright (c) 2011-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
diff --git a/tests/org.eclipse.bpel.common.wsdl.tests/src/org/eclipse/bpel/common/wsdl/parsers/WsdlParserTest.java b/tests/org.eclipse.bpel.common.wsdl.tests/src/org/eclipse/bpel/common/wsdl/parsers/WsdlParserTest.java
index 8ec97b8..3e932d9 100644
--- a/tests/org.eclipse.bpel.common.wsdl.tests/src/org/eclipse/bpel/common/wsdl/parsers/WsdlParserTest.java
+++ b/tests/org.eclipse.bpel.common.wsdl.tests/src/org/eclipse/bpel/common/wsdl/parsers/WsdlParserTest.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/tests/org.eclipse.bpel.ui.tests/about.html b/tests/org.eclipse.bpel.ui.tests/about.html
index 363bc9d..31a983e 100644
--- a/tests/org.eclipse.bpel.ui.tests/about.html
+++ b/tests/org.eclipse.bpel.ui.tests/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/tests/org.eclipse.bpel.ui.tests/src/org/eclipse/bpel/ui/wizards/NewBpelFileWizardTest.java b/tests/org.eclipse.bpel.ui.tests/src/org/eclipse/bpel/ui/wizards/NewBpelFileWizardTest.java
index 59ac51e..a2d5c82 100644
--- a/tests/org.eclipse.bpel.ui.tests/src/org/eclipse/bpel/ui/wizards/NewBpelFileWizardTest.java
+++ b/tests/org.eclipse.bpel.ui.tests/src/org/eclipse/bpel/ui/wizards/NewBpelFileWizardTest.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