Migrate license to EPL v2.0

Signed-off-by: Fred Bricon <fbricon@gmail.com>
diff --git a/org.eclipse.m2e.wtp.feature/feature.properties b/org.eclipse.m2e.wtp.feature/feature.properties
index 6b7acbe..2ba96f0 100644
--- a/org.eclipse.m2e.wtp.feature/feature.properties
+++ b/org.eclipse.m2e.wtp.feature/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2008, 2012 Sonatype, 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:
 #     Sonatype, Inc. - initial API and implementation
@@ -30,9 +32,11 @@
 copyright=\
 Copyright (c) 2008-2014 Sonatype, Inc and others.\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/\n\
+\n\
+  SPDX-License-Identifier: EPL-2.0\n\
 \n\
 Contributors:\n\
      Sonatype, Inc. - initial API and implementation\n\
diff --git a/org.eclipse.m2e.wtp.feature/feature.xml b/org.eclipse.m2e.wtp.feature/feature.xml
index fbfffac..f9373ca 100644
--- a/org.eclipse.m2e.wtp.feature/feature.xml
+++ b/org.eclipse.m2e.wtp.feature/feature.xml
@@ -17,10 +17,6 @@
       %copyright
    </copyright>
 
-   <license url="%licenseURL">
-      %license
-   </license>
-
    <requires>
       <import feature="org.eclipse.platform" version="3.6.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.rcp" version="3.6.0" match="greaterOrEqual"/>
diff --git a/org.eclipse.m2e.wtp.feature/pom.xml b/org.eclipse.m2e.wtp.feature/pom.xml
index db07a67..1f23ae0 100644
--- a/org.eclipse.m2e.wtp.feature/pom.xml
+++ b/org.eclipse.m2e.wtp.feature/pom.xml
@@ -2,9 +2,11 @@
 <!--
   Copyright (c) 2008 Sonatype, Inc.
   All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Public License v1.0
+  are made available under the terms of the Eclipse Public License 2.0
   which accompanies this distribution, and is available at
-  http://www.eclipse.org/legal/epl-v10.html
+  https://www.eclipse.org/legal/epl-2.0/
+
+  SPDX-License-Identifier: EPL-2.0
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
diff --git a/org.eclipse.m2e.wtp.jaxrs.feature/feature.properties b/org.eclipse.m2e.wtp.jaxrs.feature/feature.properties
index 82348c3..fff783b 100644
--- a/org.eclipse.m2e.wtp.jaxrs.feature/feature.properties
+++ b/org.eclipse.m2e.wtp.jaxrs.feature/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2008, 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:
 #     Red Hat, Inc. - initial API and implementation
@@ -30,9 +32,11 @@
 copyright=\
 Copyright (c) 2008-2014 Red Hat, Inc and others.\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/\n\
+\n\
+  SPDX-License-Identifier: EPL-2.0\n\
 \n\
 Contributors:\n\
      Red Hat, Inc. - Java EE configurators\n
diff --git a/org.eclipse.m2e.wtp.jaxrs.feature/feature.xml b/org.eclipse.m2e.wtp.jaxrs.feature/feature.xml
index b0c65e1..47784a3 100644
--- a/org.eclipse.m2e.wtp.jaxrs.feature/feature.xml
+++ b/org.eclipse.m2e.wtp.jaxrs.feature/feature.xml
@@ -17,10 +17,6 @@
       %copyright
    </copyright>
 
-   <license url="%licenseURL">
-      %license
-   </license>
-
    <requires>
       <!--
       <import plugin="org.eclipse.wst.common.frameworks"/>
diff --git a/org.eclipse.m2e.wtp.jaxrs/about.html b/org.eclipse.m2e.wtp.jaxrs/about.html
index f5783af..164f781 100644
--- a/org.eclipse.m2e.wtp.jaxrs/about.html
+++ b/org.eclipse.m2e.wtp.jaxrs/about.html
@@ -2,28 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About Maven JAX-RS Configurator</title>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
 </head>
 <body lang="EN-US">
-<h3>Maven JAX-RS Configurator</h3>
-<p>m2e configurator setting the JAX-RS Facet on projects having JAX-RS dependencies</p>
- 
-<p>October 29, 2010</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<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>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+	<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 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/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 being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/org.eclipse.m2e.wtp.jaxrs/src/org/eclipse/m2e/wtp/jaxrs/internal/MavenJaxRsActivator.java b/org.eclipse.m2e.wtp.jaxrs/src/org/eclipse/m2e/wtp/jaxrs/internal/MavenJaxRsActivator.java
index 41670d5..d169223 100644
--- a/org.eclipse.m2e.wtp.jaxrs/src/org/eclipse/m2e/wtp/jaxrs/internal/MavenJaxRsActivator.java
+++ b/org.eclipse.m2e.wtp.jaxrs/src/org/eclipse/m2e/wtp/jaxrs/internal/MavenJaxRsActivator.java
@@ -1,9 +1,11 @@
 /*************************************************************************************
  * Copyright (c) 2011-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:
  *     Fred Bricon (Red Hat, Inc.) - initial API and implementation
diff --git a/org.eclipse.m2e.wtp.jaxrs/src/org/eclipse/m2e/wtp/jaxrs/internal/MavenJaxRsConstants.java b/org.eclipse.m2e.wtp.jaxrs/src/org/eclipse/m2e/wtp/jaxrs/internal/MavenJaxRsConstants.java
index 5ed07c5..43bffb8 100644
--- a/org.eclipse.m2e.wtp.jaxrs/src/org/eclipse/m2e/wtp/jaxrs/internal/MavenJaxRsConstants.java
+++ b/org.eclipse.m2e.wtp.jaxrs/src/org/eclipse/m2e/wtp/jaxrs/internal/MavenJaxRsConstants.java
@@ -1,9 +1,11 @@
 /*************************************************************************************
  * Copyright (c) 2011-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:
  *     Fred Bricon (Red Hat, Inc.) - initial API and implementation
diff --git a/org.eclipse.m2e.wtp.jaxrs/src/org/eclipse/m2e/wtp/jaxrs/internal/Messages.java b/org.eclipse.m2e.wtp.jaxrs/src/org/eclipse/m2e/wtp/jaxrs/internal/Messages.java
index c092059..21b06fc 100644
--- a/org.eclipse.m2e.wtp.jaxrs/src/org/eclipse/m2e/wtp/jaxrs/internal/Messages.java
+++ b/org.eclipse.m2e.wtp.jaxrs/src/org/eclipse/m2e/wtp/jaxrs/internal/Messages.java
@@ -1,9 +1,11 @@
 /*************************************************************************************
  * Copyright (c) 2011-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:
  *     Snjezana Peco (Red Hat, Inc.) - initial API and implementation
diff --git a/org.eclipse.m2e.wtp.jaxrs/src/org/eclipse/m2e/wtp/jaxrs/internal/configurators/ClasspathJaxRsFacetDetector.java b/org.eclipse.m2e.wtp.jaxrs/src/org/eclipse/m2e/wtp/jaxrs/internal/configurators/ClasspathJaxRsFacetDetector.java
index 5a63f2d..e577526 100644
--- a/org.eclipse.m2e.wtp.jaxrs/src/org/eclipse/m2e/wtp/jaxrs/internal/configurators/ClasspathJaxRsFacetDetector.java
+++ b/org.eclipse.m2e.wtp.jaxrs/src/org/eclipse/m2e/wtp/jaxrs/internal/configurators/ClasspathJaxRsFacetDetector.java
@@ -1,9 +1,11 @@
 /*************************************************************************************
  * Copyright (c) 2011-2013 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:
  *     Fred Bricon (Red Hat, Inc.) - initial API and implementation
diff --git a/org.eclipse.m2e.wtp.jaxrs/src/org/eclipse/m2e/wtp/jaxrs/internal/configurators/JaxRsLifecycleMapping.java b/org.eclipse.m2e.wtp.jaxrs/src/org/eclipse/m2e/wtp/jaxrs/internal/configurators/JaxRsLifecycleMapping.java
index a72952b..41276bd 100644
--- a/org.eclipse.m2e.wtp.jaxrs/src/org/eclipse/m2e/wtp/jaxrs/internal/configurators/JaxRsLifecycleMapping.java
+++ b/org.eclipse.m2e.wtp.jaxrs/src/org/eclipse/m2e/wtp/jaxrs/internal/configurators/JaxRsLifecycleMapping.java
@@ -1,9 +1,11 @@
 /*************************************************************************************
  * Copyright (c) 2011-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:
  *     Fred Bricon (Red Hat, Inc.) - initial API and implementation
diff --git a/org.eclipse.m2e.wtp.jaxrs/src/org/eclipse/m2e/wtp/jaxrs/internal/configurators/JaxRsProjectConfigurator.java b/org.eclipse.m2e.wtp.jaxrs/src/org/eclipse/m2e/wtp/jaxrs/internal/configurators/JaxRsProjectConfigurator.java
index dc83432..fae45de 100644
--- a/org.eclipse.m2e.wtp.jaxrs/src/org/eclipse/m2e/wtp/jaxrs/internal/configurators/JaxRsProjectConfigurator.java
+++ b/org.eclipse.m2e.wtp.jaxrs/src/org/eclipse/m2e/wtp/jaxrs/internal/configurators/JaxRsProjectConfigurator.java
@@ -1,9 +1,11 @@
 /*************************************************************************************
  * Copyright (c) 2011-2014 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:
  *     Fred Bricon (Red Hat, Inc.) - initial API and implementation
diff --git a/org.eclipse.m2e.wtp.jpa.feature/feature.properties b/org.eclipse.m2e.wtp.jpa.feature/feature.properties
index 0d040ed..aae6886 100644
--- a/org.eclipse.m2e.wtp.jpa.feature/feature.properties
+++ b/org.eclipse.m2e.wtp.jpa.feature/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2008, 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:
 #     Red Hat, Inc. - initial API and implementation
@@ -30,9 +32,11 @@
 copyright=\
 Copyright (c) 2008-2014 Red Hat, Inc and others.\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/\n\
+\n\
+  SPDX-License-Identifier: EPL-2.0\n\
 \n\
 Contributors:\n\
      Red Hat, Inc. - Java EE configurators\n
diff --git a/org.eclipse.m2e.wtp.jpa.feature/feature.xml b/org.eclipse.m2e.wtp.jpa.feature/feature.xml
index 957b93f..09967f5 100644
--- a/org.eclipse.m2e.wtp.jpa.feature/feature.xml
+++ b/org.eclipse.m2e.wtp.jpa.feature/feature.xml
@@ -17,10 +17,6 @@
       %copyright
    </copyright>
 
-   <license url="%licenseURL">
-      %license
-   </license>
-
    <requires>
       <!--
       <import plugin="org.eclipse.wst.common.frameworks"/>
diff --git a/org.eclipse.m2e.wtp.jpa/about.html b/org.eclipse.m2e.wtp.jpa/about.html
index b50e5f4..164f781 100644
--- a/org.eclipse.m2e.wtp.jpa/about.html
+++ b/org.eclipse.m2e.wtp.jpa/about.html
@@ -2,28 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About Maven JPA Configurator</title>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
 </head>
 <body lang="EN-US">
-<h3>Maven JPA Configurator</h3>
-<p>m2e configurator setting the JPA Facet on projects having a persistence.xml JPA descriptor</p>
- 
-<p>October 29, 2010</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<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>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+	<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 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/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 being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/org.eclipse.m2e.wtp.jpa/src/org/eclipse/m2e/wtp/jpa/AbstractPlatformIdentifier.java b/org.eclipse.m2e.wtp.jpa/src/org/eclipse/m2e/wtp/jpa/AbstractPlatformIdentifier.java
index b860d79..d6c853c 100644
--- a/org.eclipse.m2e.wtp.jpa/src/org/eclipse/m2e/wtp/jpa/AbstractPlatformIdentifier.java
+++ b/org.eclipse.m2e.wtp.jpa/src/org/eclipse/m2e/wtp/jpa/AbstractPlatformIdentifier.java
@@ -1,9 +1,11 @@
 /*************************************************************************************
  * Copyright (c) 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:
  *     Fred Bricon (Red Hat, Inc.) - initial API and implementation
diff --git a/org.eclipse.m2e.wtp.jpa/src/org/eclipse/m2e/wtp/jpa/IPlatformIdentifier.java b/org.eclipse.m2e.wtp.jpa/src/org/eclipse/m2e/wtp/jpa/IPlatformIdentifier.java
index 1615749..bd871e3 100644
--- a/org.eclipse.m2e.wtp.jpa/src/org/eclipse/m2e/wtp/jpa/IPlatformIdentifier.java
+++ b/org.eclipse.m2e.wtp.jpa/src/org/eclipse/m2e/wtp/jpa/IPlatformIdentifier.java
@@ -1,9 +1,11 @@
 /*************************************************************************************
  * Copyright (c) 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:
  *     Fred Bricon (Red Hat, Inc.) - initial API and implementation
diff --git a/org.eclipse.m2e.wtp.jpa/src/org/eclipse/m2e/wtp/jpa/PlatformIdentifierManager.java b/org.eclipse.m2e.wtp.jpa/src/org/eclipse/m2e/wtp/jpa/PlatformIdentifierManager.java
index 52d5f7e..f28a060 100644
--- a/org.eclipse.m2e.wtp.jpa/src/org/eclipse/m2e/wtp/jpa/PlatformIdentifierManager.java
+++ b/org.eclipse.m2e.wtp.jpa/src/org/eclipse/m2e/wtp/jpa/PlatformIdentifierManager.java
@@ -1,9 +1,11 @@
 /*************************************************************************************
  * Copyright (c) 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:
  *     Fred Bricon (Red Hat, Inc.) - initial API and implementation
diff --git a/org.eclipse.m2e.wtp.jpa/src/org/eclipse/m2e/wtp/jpa/internal/MavenJpaActivator.java b/org.eclipse.m2e.wtp.jpa/src/org/eclipse/m2e/wtp/jpa/internal/MavenJpaActivator.java
index 1e003cf..9f9fc8a 100644
--- a/org.eclipse.m2e.wtp.jpa/src/org/eclipse/m2e/wtp/jpa/internal/MavenJpaActivator.java
+++ b/org.eclipse.m2e.wtp.jpa/src/org/eclipse/m2e/wtp/jpa/internal/MavenJpaActivator.java
@@ -1,9 +1,11 @@
 /*************************************************************************************
  * Copyright (c) 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:
  *     Fred Bricon (Red Hat, Inc.) - initial API and implementation
diff --git a/org.eclipse.m2e.wtp.jpa/src/org/eclipse/m2e/wtp/jpa/internal/configurators/JpaProjectConfigurator.java b/org.eclipse.m2e.wtp.jpa/src/org/eclipse/m2e/wtp/jpa/internal/configurators/JpaProjectConfigurator.java
index 98cf91d..bc286c8 100644
--- a/org.eclipse.m2e.wtp.jpa/src/org/eclipse/m2e/wtp/jpa/internal/configurators/JpaProjectConfigurator.java
+++ b/org.eclipse.m2e.wtp.jpa/src/org/eclipse/m2e/wtp/jpa/internal/configurators/JpaProjectConfigurator.java
@@ -1,9 +1,11 @@
 /*************************************************************************************
  * Copyright (c) 2012-2015 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:
  *     Fred Bricon (Red Hat, Inc.) - initial API and implementation
diff --git a/org.eclipse.m2e.wtp.jpa/src/org/eclipse/m2e/wtp/jpa/internal/configurators/MavenResourceLocator.java b/org.eclipse.m2e.wtp.jpa/src/org/eclipse/m2e/wtp/jpa/internal/configurators/MavenResourceLocator.java
index 10ad93a..52c7910 100644
--- a/org.eclipse.m2e.wtp.jpa/src/org/eclipse/m2e/wtp/jpa/internal/configurators/MavenResourceLocator.java
+++ b/org.eclipse.m2e.wtp.jpa/src/org/eclipse/m2e/wtp/jpa/internal/configurators/MavenResourceLocator.java
@@ -1,9 +1,11 @@
 /*************************************************************************************
  * Copyright (c) 2012-2015 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:
  *     Fred Bricon (Red Hat, Inc.) - initial API and implementation
diff --git a/org.eclipse.m2e.wtp.jpa/src/org/eclipse/m2e/wtp/jpa/internal/configurators/PersistenceXmlJpaFacetDetector.java b/org.eclipse.m2e.wtp.jpa/src/org/eclipse/m2e/wtp/jpa/internal/configurators/PersistenceXmlJpaFacetDetector.java
index 59dbcdf..a1943a4 100644
--- a/org.eclipse.m2e.wtp.jpa/src/org/eclipse/m2e/wtp/jpa/internal/configurators/PersistenceXmlJpaFacetDetector.java
+++ b/org.eclipse.m2e.wtp.jpa/src/org/eclipse/m2e/wtp/jpa/internal/configurators/PersistenceXmlJpaFacetDetector.java
@@ -1,9 +1,11 @@
 /*************************************************************************************
  * Copyright (c) 2011-2013 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:
  *     Fred Bricon (Red Hat, Inc.) - initial API and implementation
diff --git a/org.eclipse.m2e.wtp.jpa/src/org/eclipse/m2e/wtp/jpa/internal/util/JptUtils.java b/org.eclipse.m2e.wtp.jpa/src/org/eclipse/m2e/wtp/jpa/internal/util/JptUtils.java
index cf86e01..59fa3d0 100644
--- a/org.eclipse.m2e.wtp.jpa/src/org/eclipse/m2e/wtp/jpa/internal/util/JptUtils.java
+++ b/org.eclipse.m2e.wtp.jpa/src/org/eclipse/m2e/wtp/jpa/internal/util/JptUtils.java
@@ -1,9 +1,11 @@
 /*************************************************************************************
  * Copyright (c) 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:
  *     Fred Bricon (Red Hat, Inc.) - initial API and implementation
diff --git a/org.eclipse.m2e.wtp.jsf.feature/feature.properties b/org.eclipse.m2e.wtp.jsf.feature/feature.properties
index 3dd932c..7347771 100644
--- a/org.eclipse.m2e.wtp.jsf.feature/feature.properties
+++ b/org.eclipse.m2e.wtp.jsf.feature/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2008, 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:
 #     Red Hat, Inc. - initial API and implementation
@@ -30,9 +32,11 @@
 copyright=\
 Copyright (c) 2008-2014 Red Hat, Inc and others.\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/\n\
+\n\
+  SPDX-License-Identifier: EPL-2.0\n\
 \n\
 Contributors:\n\
      Red Hat, Inc. - Java EE configurators\n
diff --git a/org.eclipse.m2e.wtp.jsf.feature/feature.xml b/org.eclipse.m2e.wtp.jsf.feature/feature.xml
index 39962d1..75f0b57 100644
--- a/org.eclipse.m2e.wtp.jsf.feature/feature.xml
+++ b/org.eclipse.m2e.wtp.jsf.feature/feature.xml
@@ -17,10 +17,6 @@
       %copyright
    </copyright>
 
-   <license url="%licenseURL">
-      %license
-   </license>
-
    <requires>
       <import feature="org.eclipse.platform" version="3.6.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.rcp" version="3.6.0" match="greaterOrEqual"/>
diff --git a/org.eclipse.m2e.wtp.jsf/about.html b/org.eclipse.m2e.wtp.jsf/about.html
index f73d742..164f781 100644
--- a/org.eclipse.m2e.wtp.jsf/about.html
+++ b/org.eclipse.m2e.wtp.jsf/about.html
@@ -2,28 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About Maven JSF Configurator</title>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
 </head>
 <body lang="EN-US">
-<h3>Maven JSF Configurator</h3>
-<p>m2e configurator setting the JSF Facet on projects having JSF Dependencies</p>
- 
-<p>October 29, 2010</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<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>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+	<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 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/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 being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/MavenJSFActivator.java b/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/MavenJSFActivator.java
index baa253c..7fe507f 100644
--- a/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/MavenJSFActivator.java
+++ b/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/MavenJSFActivator.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011-2012 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     Snjezana Peco (Red Hat, Inc.) - initial API and implementation
diff --git a/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/MavenJSFConstants.java b/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/MavenJSFConstants.java
index 68a724d..f18a29a 100644
--- a/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/MavenJSFConstants.java
+++ b/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/MavenJSFConstants.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     Fred Bricon (Red Hat, Inc.) - initial API and implementation
diff --git a/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/Messages.java b/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/Messages.java
index dbaa07b..adbb371 100644
--- a/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/Messages.java
+++ b/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/Messages.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011-2012 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     Snjezana Peco (Red Hat, Inc.) - initial API and implementation
diff --git a/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/configurators/ClasspathJSFFacetDetector.java b/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/configurators/ClasspathJSFFacetDetector.java
index eab81b8..da93cb3 100644
--- a/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/configurators/ClasspathJSFFacetDetector.java
+++ b/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/configurators/ClasspathJSFFacetDetector.java
@@ -1,9 +1,11 @@
 /*************************************************************************************
  * Copyright (c) 2011-2013 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:
  *     Fred Bricon (Red Hat, Inc.) - initial API and implementation
diff --git a/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/configurators/FacesConfigJSFFacetDetector.java b/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/configurators/FacesConfigJSFFacetDetector.java
index 227cfd7..876df98 100644
--- a/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/configurators/FacesConfigJSFFacetDetector.java
+++ b/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/configurators/FacesConfigJSFFacetDetector.java
@@ -1,9 +1,11 @@
 /*************************************************************************************
  * Copyright (c) 2011-2013 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:
  *     Fred Bricon (Red Hat, Inc.) - initial API and implementation
diff --git a/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/configurators/JSFLifecycleMapping.java b/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/configurators/JSFLifecycleMapping.java
index 2a0a444..dc7ef44 100644
--- a/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/configurators/JSFLifecycleMapping.java
+++ b/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/configurators/JSFLifecycleMapping.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011-2012 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
   *     Snjezna Peco (Red Hat, Inc.) - initial API and implementation
diff --git a/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/configurators/JSFProjectConfigurator.java b/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/configurators/JSFProjectConfigurator.java
index f916c8a..41860d0 100644
--- a/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/configurators/JSFProjectConfigurator.java
+++ b/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/configurators/JSFProjectConfigurator.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011-2014 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     Snjezana Peco (Red Hat, Inc.) - initial API and implementation
diff --git a/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/configurators/WebXmlJSFFacetDetector.java b/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/configurators/WebXmlJSFFacetDetector.java
index b97c02e..18c0a43 100644
--- a/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/configurators/WebXmlJSFFacetDetector.java
+++ b/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/configurators/WebXmlJSFFacetDetector.java
@@ -1,9 +1,11 @@
 /*************************************************************************************
  * Copyright (c) 2011-2013 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:
  *     Fred Bricon (Red Hat, Inc.) - initial API and implementation
diff --git a/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/utils/FacesConfigQuickPeek.java b/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/utils/FacesConfigQuickPeek.java
index e358b38..8cf64a7 100644
--- a/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/utils/FacesConfigQuickPeek.java
+++ b/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/utils/FacesConfigQuickPeek.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011-2012 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
   *     Fred Bricon (Red Hat, Inc.) - initial API and implementation
diff --git a/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/utils/JSFUtils.java b/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/utils/JSFUtils.java
index a7b92b2..b14c2ba 100644
--- a/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/utils/JSFUtils.java
+++ b/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/utils/JSFUtils.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2012 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     Fred Bricon (Red Hat, Inc.) - initial API and implementation
diff --git a/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/utils/xpl/JSFAppConfigUtils.java b/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/utils/xpl/JSFAppConfigUtils.java
index 39a3669..da46eb9 100644
--- a/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/utils/xpl/JSFAppConfigUtils.java
+++ b/org.eclipse.m2e.wtp.jsf/src/org/eclipse/m2e/wtp/jsf/internal/utils/xpl/JSFAppConfigUtils.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 Oracle 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:
  *    Ian Trimble - initial API and implementation
diff --git a/org.eclipse.m2e.wtp.overlay.ui/about.html b/org.eclipse.m2e.wtp.overlay.ui/about.html
index 52b4fe9..164f781 100644
--- a/org.eclipse.m2e.wtp.overlay.ui/about.html
+++ b/org.eclipse.m2e.wtp.overlay.ui/about.html
@@ -2,26 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>October 29, 2010</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<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>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+	<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 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/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 being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
+
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/org.eclipse.m2e.wtp.overlay.ui/pom.xml b/org.eclipse.m2e.wtp.overlay.ui/pom.xml
index c7bf637..b9550f0 100644
--- a/org.eclipse.m2e.wtp.overlay.ui/pom.xml
+++ b/org.eclipse.m2e.wtp.overlay.ui/pom.xml
@@ -2,9 +2,11 @@
 <!--
   Copyright (c) 2010 Sonatype, Inc.
   All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Public License v1.0
+  are made available under the terms of the Eclipse Public License 2.0
   which accompanies this distribution, and is available at
-  http://www.eclipse.org/legal/epl-v10.html
+  https://www.eclipse.org/legal/epl-2.0/
+
+  SPDX-License-Identifier: EPL-2.0
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
diff --git a/org.eclipse.m2e.wtp.overlay.ui/src/org/eclipse/m2e/wtp/overlay/internal/ui/OverlayUIPluginActivator.java b/org.eclipse.m2e.wtp.overlay.ui/src/org/eclipse/m2e/wtp/overlay/internal/ui/OverlayUIPluginActivator.java
index bb7081b..d124be7 100644
--- a/org.eclipse.m2e.wtp.overlay.ui/src/org/eclipse/m2e/wtp/overlay/internal/ui/OverlayUIPluginActivator.java
+++ b/org.eclipse.m2e.wtp.overlay.ui/src/org/eclipse/m2e/wtp/overlay/internal/ui/OverlayUIPluginActivator.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.overlay.internal.ui;
 
diff --git a/org.eclipse.m2e.wtp.overlay.ui/src/org/eclipse/m2e/wtp/overlay/internal/ui/preferences/OverlayPublishingPreferencePage.java b/org.eclipse.m2e.wtp.overlay.ui/src/org/eclipse/m2e/wtp/overlay/internal/ui/preferences/OverlayPublishingPreferencePage.java
index 6baa99c..9b005b4 100644
--- a/org.eclipse.m2e.wtp.overlay.ui/src/org/eclipse/m2e/wtp/overlay/internal/ui/preferences/OverlayPublishingPreferencePage.java
+++ b/org.eclipse.m2e.wtp.overlay.ui/src/org/eclipse/m2e/wtp/overlay/internal/ui/preferences/OverlayPublishingPreferencePage.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.overlay.internal.ui.preferences;
 
diff --git a/org.eclipse.m2e.wtp.overlay/about.html b/org.eclipse.m2e.wtp.overlay/about.html
index 0a13914..164f781 100644
--- a/org.eclipse.m2e.wtp.overlay/about.html
+++ b/org.eclipse.m2e.wtp.overlay/about.html
@@ -2,51 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>October 29, 2010</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<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>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+	<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 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
 
-
-<h3>Third Party Content</h3>
-
-<p>
-The Content includes items that have been sourced from third parties as set out below. If you 
-did not receive this Content directly from the Eclipse Foundation, the following is provided 
-for informational purposes only, and you should look to the Redistributor&rsquo;s license for 
-terms and conditions of use.
-</p>
-
-<h4>Ant (Derivative work)</h4>
-<p>
-This software is based in part on the work of The Apache Software Foundation on the Ant project.</p>
-<p>The class org.eclipse.m2e.wtp.overlay.internal.modulecore.DynamicResourceFilter is derived from the following class from the Ant project :</p>
-<ul>
-<li>org.apache.tools.ant.DirectoryScanner</li>
-</ul>
-<p>
-Your use of Ant in source or binary code form is subject to the terms and conditions of the 
-The Apache Software License, Version 2.0 (&quot;ASL&quot;).  
-A copy of the ASL is available at <a href="http://maven.apache.org/license.html">http://maven.apache.org/license.html</a>.
-(a local copy can be found <a href="about_files/LICENSE-2.0.txt">here</a>)
-</p>
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/org.eclipse.m2e.wtp.overlay/pom.xml b/org.eclipse.m2e.wtp.overlay/pom.xml
index e027d1d..d700865 100644
--- a/org.eclipse.m2e.wtp.overlay/pom.xml
+++ b/org.eclipse.m2e.wtp.overlay/pom.xml
@@ -2,9 +2,11 @@
 <!--
   Copyright (c) 2010 Sonatype, Inc.
   All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Public License v1.0
+  are made available under the terms of the Eclipse Public License 2.0
   which accompanies this distribution, and is available at
-  http://www.eclipse.org/legal/epl-v10.html
+  https://www.eclipse.org/legal/epl-2.0/
+
+  SPDX-License-Identifier: EPL-2.0
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
diff --git a/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/OverlayConstants.java b/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/OverlayConstants.java
index 55e584d..534e918 100644
--- a/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/OverlayConstants.java
+++ b/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/OverlayConstants.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.overlay;
 
diff --git a/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/OverlayPluginActivator.java b/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/OverlayPluginActivator.java
index b5a1246..493b032 100644
--- a/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/OverlayPluginActivator.java
+++ b/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/OverlayPluginActivator.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.overlay.internal;
 
diff --git a/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/modulecore/CompositeVirtualFolder.java b/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/modulecore/CompositeVirtualFolder.java
index 7b3c3fb..1d540f4 100644
--- a/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/modulecore/CompositeVirtualFolder.java
+++ b/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/modulecore/CompositeVirtualFolder.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011-2015 Sonatype, 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.m2e.wtp.overlay.internal.modulecore;
 
diff --git a/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/modulecore/FileSystemResourceFilter.java b/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/modulecore/FileSystemResourceFilter.java
index 843b0e4..a60d78a 100644
--- a/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/modulecore/FileSystemResourceFilter.java
+++ b/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/modulecore/FileSystemResourceFilter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.overlay.internal.modulecore;
 
diff --git a/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/modulecore/IFilteredVirtualFolder.java b/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/modulecore/IFilteredVirtualFolder.java
index e0309f7..6b301a0 100644
--- a/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/modulecore/IFilteredVirtualFolder.java
+++ b/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/modulecore/IFilteredVirtualFolder.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.overlay.internal.modulecore;
 
diff --git a/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/modulecore/IResourceFilter.java b/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/modulecore/IResourceFilter.java
index 1ed9a9e..b5a67e3 100644
--- a/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/modulecore/IResourceFilter.java
+++ b/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/modulecore/IResourceFilter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.overlay.internal.modulecore;
 
diff --git a/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/modulecore/OverlaySelfComponent.java b/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/modulecore/OverlaySelfComponent.java
index 4d08eeb..b624013 100644
--- a/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/modulecore/OverlaySelfComponent.java
+++ b/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/modulecore/OverlaySelfComponent.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.overlay.internal.modulecore;
diff --git a/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/modulecore/OverlayVirtualArchiveComponent.java b/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/modulecore/OverlayVirtualArchiveComponent.java
index 640d696..60b781e 100644
--- a/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/modulecore/OverlayVirtualArchiveComponent.java
+++ b/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/modulecore/OverlayVirtualArchiveComponent.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.overlay.internal.modulecore;
diff --git a/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/modulecore/OverlayVirtualComponent.java b/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/modulecore/OverlayVirtualComponent.java
index 4bb34ef..9d78cfe 100644
--- a/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/modulecore/OverlayVirtualComponent.java
+++ b/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/modulecore/OverlayVirtualComponent.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.overlay.internal.modulecore;
diff --git a/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/modulecore/ResourceListVirtualFolder.java b/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/modulecore/ResourceListVirtualFolder.java
index a480445..4338a2d 100644
--- a/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/modulecore/ResourceListVirtualFolder.java
+++ b/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/modulecore/ResourceListVirtualFolder.java
@@ -1,9 +1,11 @@
 /*************************************************************************************
  * Copyright (c) 2011 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:
  *     Red Hat, Inc. - Initial implementation.
diff --git a/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/preferences/OverlayPreferencesInitializer.java b/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/preferences/OverlayPreferencesInitializer.java
index c86aaa9..2c36a0f 100644
--- a/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/preferences/OverlayPreferencesInitializer.java
+++ b/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/preferences/OverlayPreferencesInitializer.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.overlay.internal.preferences;
 
diff --git a/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/servers/OverlayResourceChangeListener.java b/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/servers/OverlayResourceChangeListener.java
index e250858..038dbd5 100644
--- a/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/servers/OverlayResourceChangeListener.java
+++ b/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/servers/OverlayResourceChangeListener.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.overlay.internal.servers;
 
diff --git a/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/utilities/CompressionUtil.java b/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/utilities/CompressionUtil.java
index f1d0c6d..012407f 100644
--- a/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/utilities/CompressionUtil.java
+++ b/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/utilities/CompressionUtil.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/utilities/PathUtil.java b/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/utilities/PathUtil.java
index c09f73b..b5c3e89 100644
--- a/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/utilities/PathUtil.java
+++ b/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/internal/utilities/PathUtil.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.overlay.internal.utilities;
 
diff --git a/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/modulecore/IOverlayVirtualComponent.java b/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/modulecore/IOverlayVirtualComponent.java
index b0545e0..3b7dea0 100644
--- a/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/modulecore/IOverlayVirtualComponent.java
+++ b/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/modulecore/IOverlayVirtualComponent.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.overlay.modulecore;
diff --git a/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/modulecore/ModuleURIUtil.java b/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/modulecore/ModuleURIUtil.java
index 3a9ba23..8f104d5 100644
--- a/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/modulecore/ModuleURIUtil.java
+++ b/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/modulecore/ModuleURIUtil.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.overlay.modulecore;
 
diff --git a/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/modulecore/OverlayComponentCore.java b/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/modulecore/OverlayComponentCore.java
index 1bbc337..eab955b 100644
--- a/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/modulecore/OverlayComponentCore.java
+++ b/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/modulecore/OverlayComponentCore.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.overlay.modulecore;
diff --git a/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/modulecore/OverlayReferenceResolver.java b/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/modulecore/OverlayReferenceResolver.java
index 76bf620..63ee4a9 100644
--- a/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/modulecore/OverlayReferenceResolver.java
+++ b/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/modulecore/OverlayReferenceResolver.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.overlay.modulecore;
diff --git a/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/modulecore/UnpackArchiveJob.java b/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/modulecore/UnpackArchiveJob.java
index 9caab11..b1ac80b 100644
--- a/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/modulecore/UnpackArchiveJob.java
+++ b/org.eclipse.m2e.wtp.overlay/src/org/eclipse/m2e/wtp/overlay/modulecore/UnpackArchiveJob.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.overlay.modulecore;
 
diff --git a/org.eclipse.m2e.wtp.sdk.feature/build.properties b/org.eclipse.m2e.wtp.sdk.feature/build.properties
index 6069b2b..2ec4b73 100644
--- a/org.eclipse.m2e.wtp.sdk.feature/build.properties
+++ b/org.eclipse.m2e.wtp.sdk.feature/build.properties
@@ -1,9 +1,11 @@
 #
 # Copyright (c) 2012-2014 Red Hat, Inc.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #      Red Hat, Inc. - initial API and implementation
diff --git a/org.eclipse.m2e.wtp.sdk.feature/feature.properties b/org.eclipse.m2e.wtp.sdk.feature/feature.properties
index 78131a9..2c8ed15 100644
--- a/org.eclipse.m2e.wtp.sdk.feature/feature.properties
+++ b/org.eclipse.m2e.wtp.sdk.feature/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 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:
 #     Red Hat, Inc. - initial API and implementation
@@ -30,9 +32,11 @@
 copyright=\
 Copyright (c) 2012-2014 Red Hat, Inc.\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/\n\
+\n\
+  SPDX-License-Identifier: EPL-2.0\n\
 \n\
 Contributors:\n\
      Red Hat, Inc. - initial API and implementation\n
diff --git a/org.eclipse.m2e.wtp.sdk.feature/feature.xml b/org.eclipse.m2e.wtp.sdk.feature/feature.xml
index 7f7fd8e..a1f9078 100644
--- a/org.eclipse.m2e.wtp.sdk.feature/feature.xml
+++ b/org.eclipse.m2e.wtp.sdk.feature/feature.xml
@@ -15,10 +15,6 @@
       %copyright
    </copyright>
 
-   <license url="%licenseURL">
-      %license
-   </license>
-
    <includes
          id="org.eclipse.m2e.wtp.feature"
          version="0.0.0"/>
diff --git a/org.eclipse.m2e.wtp.sdk.feature/pom.xml b/org.eclipse.m2e.wtp.sdk.feature/pom.xml
index b3bd954..e91cd45 100644
--- a/org.eclipse.m2e.wtp.sdk.feature/pom.xml
+++ b/org.eclipse.m2e.wtp.sdk.feature/pom.xml
@@ -2,9 +2,11 @@
 <!--
   Copyright (c) 2008 Sonatype, Inc.
   All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Public License v1.0
+  are made available under the terms of the Eclipse Public License 2.0
   which accompanies this distribution, and is available at
-  http://www.eclipse.org/legal/epl-v10.html
+  https://www.eclipse.org/legal/epl-2.0/
+
+  SPDX-License-Identifier: EPL-2.0
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/org.eclipse.m2e.wtp.site/pom.xml b/org.eclipse.m2e.wtp.site/pom.xml
index 2fb8e13..f396888 100644
--- a/org.eclipse.m2e.wtp.site/pom.xml
+++ b/org.eclipse.m2e.wtp.site/pom.xml
@@ -2,9 +2,11 @@
 <!--
   Copyright (c) 2008-2014 Sonatype, 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
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
diff --git a/org.eclipse.m2e.wtp.target-platform/pom.xml b/org.eclipse.m2e.wtp.target-platform/pom.xml
index 29ad285..ec560c9 100644
--- a/org.eclipse.m2e.wtp.target-platform/pom.xml
+++ b/org.eclipse.m2e.wtp.target-platform/pom.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
   <!--
-    Copyright (c) 2008 Sonatype, Inc. 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
+  Copyright (c) 2008 Sonatype, Inc.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License 2.0
+  which accompanies this distribution, and is available at
+  https://www.eclipse.org/legal/epl-2.0/
+
+  SPDX-License-Identifier: EPL-2.0
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/org.eclipse.m2e.wtp/about.html b/org.eclipse.m2e.wtp/about.html
index 99de9d4..164f781 100644
--- a/org.eclipse.m2e.wtp/about.html
+++ b/org.eclipse.m2e.wtp/about.html
@@ -2,103 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>October 29, 2010</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<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>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+	<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 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
 
-
-<h3>Third Party Content</h3>
-
-<p>
-The Content includes items that have been sourced from third parties as set out below. If you 
-did not receive this Content directly from the Eclipse Foundation, the following is provided 
-for informational purposes only, and you should look to the Redistributor&rsquo;s license for 
-terms and conditions of use.
-</p>
-
-<h4>maven-war-plugin 2.1.1</h4>
-<p>
-This software contains the maven-war-plugin-2.1.1.jar from the Apache Maven project.</p>
-<p>
-Your use of maven-war-plugin in source or binary code form is subject to the terms and conditions of the 
-The Apache Software License, Version 2.0 (&quot;ASL&quot;).  
-A copy of the ASL is available at <a href="http://maven.apache.org/license.html">http://maven.apache.org/license.html</a>.
-(a local copy can be found <a href="about_files/LICENSE-2.0.txt">here</a>)
-</p>
-
-<h4>maven-ear-plugin 2.6 (Derivative work)</h4>
-<p>
-This software contains the following classes, derived from the maven-ear-plugin-2.6.jar from the Apache Maven project.
- <ul>
-<li>org.eclipse.m2e.wtp.earmodules.AbstractEarModule derived from  org.apache.maven.plugin.ear.AbstractEarModule 
-</li><li>org.eclipse.m2e.wtp.namemapping.StandardFileNameMapping derived from org.apache.maven.plugin.ear.output.StandardFileNameMapping 
-</li><li>org.eclipse.m2e.wtp.earmodules.AppClientModule derived from org.apache.maven.plugin.ear.AppClientModule
-</li><li>org.eclipse.m2e.wtp.earmodules.ArtifactRepository derived from org.apache.maven.plugin.ear.util.ArtifactRepository
-</li><li>org.eclipse.m2e.wtp.earmodules.ArtifactTypeMappingService derived from org.apache.maven.plugin.ear.util.ArtifactTypeMappingService
-</li><li>org.eclipse.m2e.wtp.earmodules.EarModule derived from org.apache.maven.plugin.ear.EarModule
-</li><li>org.eclipse.m2e.wtp.earmodules.EarModuleFactory derived from org.apache.maven.plugin.ear.EarModuleFactory
-</li><li>org.eclipse.m2e.wtp.earmodules.EarPluginException derived from org.apache.maven.plugin.ear.EarPluginException
-</li><li>org.eclipse.m2e.wtp.earmodules.EjbClientModule derived from org.apache.maven.plugin.ear.EjbClientModule
-</li><li>org.eclipse.m2e.wtp.earmodules.EjbModule derived from org.apache.maven.plugin.ear.EjbModule
-</li><li>org.eclipse.m2e.wtp.earmodules.HarModule derived from org.apache.maven.plugin.ear.HarModule
-</li><li>org.eclipse.m2e.wtp.earmodules.JarModule derived from org.apache.maven.plugin.ear.JarModule
-</li><li>org.eclipse.m2e.wtp.earmodules.JbossEarModule derived from org.apache.maven.plugin.ear.JbossEarModule 
-</li><li>org.eclipse.m2e.wtp.earmodules.ParModule derived from org.apache.maven.plugin.ear.ParModule
-</li><li>org.eclipse.m2e.wtp.earmodules.RarModule derived from org.apache.maven.plugin.ear.RarModule
-</li><li>org.eclipse.m2e.wtp.earmodules.SarModule derived from org.apache.maven.plugin.ear.SarModule
-</li><li>org.eclipse.m2e.wtp.earmodules.SecurityRoleKey derived from  org.apache.maven.plugin.ear.SecurityRole
-</li><li>org.eclipse.m2e.wtp.earmodules.UnknownArtifactTypeException derived from org.apache.maven.plugin.ear.UnknownArtifactTypeException
-</li><li>org.eclipse.m2e.wtp.earmodules.WebModule derived from  org.apache.maven.plugin.ear.WebModule
-</li><li>org.eclipse.m2e.wtp.earmodules.WsrModule derived from  org.apache.maven.plugin.ear.WsrModule
-</li><li>org.eclipse.m2e.wtp.namemapping.AbstractFileNameMapping derived from  org.apache.maven.plugin.ear.output.AbstractFileNameMapping 
-</li><li>org.eclipse.m2e.wtp.namemapping.FileNameMapping derived from org.apache.maven.plugin.ear.output.FileNameMapping 
-</li><li>org.eclipse.m2e.wtp.namemapping.FileNameMappingFactory derived from  org.apache.maven.plugin.ear.output.FileNameMapping 
-</li><li>org.eclipse.m2e.wtp.namemapping.FullFileNameMapping derived from org.apache.maven.plugin.ear.output.FullFileNameMapping 
-</li><li>org.eclipse.m2e.wtp.namemapping.NoVersionFileNameMapping derived from org.apache.maven.plugin.ear.output.NoVersionFileNameMapping 
-</li>
- 
- </ul>
- </p>
-<p>
-Your use of maven-ear-plugin in source or binary code form is subject to the terms and conditions of the 
-The Apache Software License, Version 2.0 (&quot;ASL&quot;).  
-A copy of the ASL is available at <a href="http://maven.apache.org/license.html">http://maven.apache.org/license.html</a>.
-(a local copy can be found <a href="about_files/LICENSE-2.0.txt">here</a>)
-</p>
-
-
-<h4>Spring Core (Derivative work)</h4>
-<p>
-This software is based in part on the work of The SpringSource on the Spring Core project.</p>
-<p>The org.eclipse.m2e.wtp.internal.AntPathMatcher class is copied from the following class from the Spring Core project :</p>
-<ul>
-<li>org.springframework.util.AntPathMatcher</li>
-</ul>
-<p>
-Your use of Spring Core in source or binary code form is subject to the terms and conditions of the 
-The Apache Software License, Version 2.0 (&quot;ASL&quot;).  
-A copy of the ASL is available at <a href="http://maven.apache.org/license.html">http://maven.apache.org/license.html</a>.
-(a local copy can be found <a href="about_files/LICENSE-2.0.txt">here</a>)
-</p>
-
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/org.eclipse.m2e.wtp/pom.xml b/org.eclipse.m2e.wtp/pom.xml
index 833e0c3..ed5f609 100644
--- a/org.eclipse.m2e.wtp/pom.xml
+++ b/org.eclipse.m2e.wtp/pom.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2008 Sonatype, Inc. 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 -->
+<!-- Copyright (c) 2008 Sonatype, Inc.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License 2.0
+  which accompanies this distribution, and is available at
+  https://www.eclipse.org/legal/epl-2.0/
+
+  SPDX-License-Identifier: EPL-2.0-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
diff --git a/org.eclipse.m2e.wtp/schema/dependencyConfigurators.exsd b/org.eclipse.m2e.wtp/schema/dependencyConfigurators.exsd
index d31042e..727ac80 100644
--- a/org.eclipse.m2e.wtp/schema/dependencyConfigurators.exsd
+++ b/org.eclipse.m2e.wtp/schema/dependencyConfigurators.exsd
@@ -128,10 +128,12 @@
       </appinfo>
       <documentation>
          Copyright (c) 2007, 2008 Sonatype, Inc.
-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
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License 2.0
+  which accompanies this distribution, and is available at
+  https://www.eclipse.org/legal/epl-2.0/
+
+  SPDX-License-Identifier: EPL-2.0
       </documentation>
    </annotation>
 
diff --git a/org.eclipse.m2e.wtp/schema/facetDetectors.exsd b/org.eclipse.m2e.wtp/schema/facetDetectors.exsd
index 9805b24..035e0f1 100644
--- a/org.eclipse.m2e.wtp/schema/facetDetectors.exsd
+++ b/org.eclipse.m2e.wtp/schema/facetDetectors.exsd
@@ -125,10 +125,12 @@
       </appInfo>
       <documentation>
          Copyright (c) 2013 Red Hat, Inc.
-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
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License 2.0
+  which accompanies this distribution, and is available at
+  https://www.eclipse.org/legal/epl-2.0/
+
+  SPDX-License-Identifier: EPL-2.0
       </documentation>
    </annotation>
 
diff --git a/org.eclipse.m2e.wtp/schema/javaeeConfiguratorEnablers.exsd b/org.eclipse.m2e.wtp/schema/javaeeConfiguratorEnablers.exsd
index 59e18c5..1e9f8f6 100644
--- a/org.eclipse.m2e.wtp/schema/javaeeConfiguratorEnablers.exsd
+++ b/org.eclipse.m2e.wtp/schema/javaeeConfiguratorEnablers.exsd
@@ -126,10 +126,12 @@
       </appinfo>
       <documentation>
          Copyright (c) 2013 Red Hat, Inc.
-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
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License 2.0
+  which accompanies this distribution, and is available at
+  https://www.eclipse.org/legal/epl-2.0/
+
+  SPDX-License-Identifier: EPL-2.0
       </documentation>
    </annotation>
 
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/AbstractDependencyConfigurator.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/AbstractDependencyConfigurator.java
index ae33e20..5124575 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/AbstractDependencyConfigurator.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/AbstractDependencyConfigurator.java
@@ -2,9 +2,11 @@
 
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/AbstractFilteringSupportMavenPlugin.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/AbstractFilteringSupportMavenPlugin.java
index a10f58e..ca38ee5 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/AbstractFilteringSupportMavenPlugin.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/AbstractFilteringSupportMavenPlugin.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/AbstractProjectConfiguratorDelegate.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/AbstractProjectConfiguratorDelegate.java
index 6198984..bf1360f 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/AbstractProjectConfiguratorDelegate.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/AbstractProjectConfiguratorDelegate.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/AcrPluginConfiguration.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/AcrPluginConfiguration.java
index 1c18e69..e077798 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/AcrPluginConfiguration.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/AcrPluginConfiguration.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/AppClientProjectConfiguratorDelegate.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/AppClientProjectConfiguratorDelegate.java
index 8a4a15a..a5fa891 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/AppClientProjectConfiguratorDelegate.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/AppClientProjectConfiguratorDelegate.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2013 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
  *******************************************************************************/
 
 package org.eclipse.m2e.wtp;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/ArtifactHelper.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/ArtifactHelper.java
index 8d9d462..faf46fd 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/ArtifactHelper.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/ArtifactHelper.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/ConnectorProjectConfiguratorDelegate.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/ConnectorProjectConfiguratorDelegate.java
index 84cda81..218e6c4 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/ConnectorProjectConfiguratorDelegate.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/ConnectorProjectConfiguratorDelegate.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2014 Sonatype, 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.m2e.wtp;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/DeploymentDescriptorManagement.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/DeploymentDescriptorManagement.java
index 9ba4bfa..e8f93f2 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/DeploymentDescriptorManagement.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/DeploymentDescriptorManagement.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/DomUtils.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/DomUtils.java
index 5f0eb09..9bec911 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/DomUtils.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/DomUtils.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/EarPluginConfiguration.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/EarPluginConfiguration.java
index 0730b29..75665e9 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/EarPluginConfiguration.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/EarPluginConfiguration.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2012 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/EarProjectConfiguratorDelegate.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/EarProjectConfiguratorDelegate.java
index 9218d5b..601ec3f 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/EarProjectConfiguratorDelegate.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/EarProjectConfiguratorDelegate.java
@@ -2,9 +2,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/EjbPluginConfiguration.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/EjbPluginConfiguration.java
index 7c7334f..20fb305 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/EjbPluginConfiguration.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/EjbPluginConfiguration.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/EjbProjectConfiguratorDelegate.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/EjbProjectConfiguratorDelegate.java
index ae7531a..bc1e32d 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/EjbProjectConfiguratorDelegate.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/EjbProjectConfiguratorDelegate.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2013 Sonatype, 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.m2e.wtp;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/IMavenPackageFilter.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/IMavenPackageFilter.java
index 35ecea9..8e71342 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/IMavenPackageFilter.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/IMavenPackageFilter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/IPackagingConfiguration.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/IPackagingConfiguration.java
index 9d936ac..95b4658 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/IPackagingConfiguration.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/IPackagingConfiguration.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/IProjectConfiguratorDelegate.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/IProjectConfiguratorDelegate.java
index 05e04e9..05cc07e 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/IProjectConfiguratorDelegate.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/IProjectConfiguratorDelegate.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/JEEPackaging.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/JEEPackaging.java
index 70e1b6d..a7704f0 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/JEEPackaging.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/JEEPackaging.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/MarkedException.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/MarkedException.java
index 49dfc9d..be0b930 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/MarkedException.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/MarkedException.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/MavenDeploymentDescriptorManagement.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/MavenDeploymentDescriptorManagement.java
index ee72ec2..5874d67 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/MavenDeploymentDescriptorManagement.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/MavenDeploymentDescriptorManagement.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/MavenSessionHelper.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/MavenSessionHelper.java
index 95da53b..fa4c9bb 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/MavenSessionHelper.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/MavenSessionHelper.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/MavenWtpConstants.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/MavenWtpConstants.java
index fec89d4..4c473c9 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/MavenWtpConstants.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/MavenWtpConstants.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008-2015 Sonatype, 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.m2e.wtp;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/MavenWtpPlugin.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/MavenWtpPlugin.java
index 4c064a7..513fa1a 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/MavenWtpPlugin.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/MavenWtpPlugin.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/OverlayConfigurator.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/OverlayConfigurator.java
index f3eb261..c266697 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/OverlayConfigurator.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/OverlayConfigurator.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008-2014 Sonatype, 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.m2e.wtp;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/PackagingConfiguration.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/PackagingConfiguration.java
index 6cf2e29..931bc0e 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/PackagingConfiguration.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/PackagingConfiguration.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/ProjectConfiguratorDelegateFactory.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/ProjectConfiguratorDelegateFactory.java
index fffe557..d25669c 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/ProjectConfiguratorDelegateFactory.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/ProjectConfiguratorDelegateFactory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/ProjectUtils.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/ProjectUtils.java
index 4cf621d..cd41577 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/ProjectUtils.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/ProjectUtils.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/RarPluginConfiguration.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/RarPluginConfiguration.java
index 7ac715e..e3afa9e 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/RarPluginConfiguration.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/RarPluginConfiguration.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/ResourceCleaner.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/ResourceCleaner.java
index 3634294..732729b 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/ResourceCleaner.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/ResourceCleaner.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/UnsupportedDependencyTypeProjectConfigurator.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/UnsupportedDependencyTypeProjectConfigurator.java
index 1957afb..474d201 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/UnsupportedDependencyTypeProjectConfigurator.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/UnsupportedDependencyTypeProjectConfigurator.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2012-2014 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/UtilityProjectConfigurator.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/UtilityProjectConfigurator.java
index 26e2371..fe02503 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/UtilityProjectConfigurator.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/UtilityProjectConfigurator.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008-2014 Sonatype, 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.m2e.wtp;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/WTPProjectConfigurator.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/WTPProjectConfigurator.java
index 896992e..70833f2 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/WTPProjectConfigurator.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/WTPProjectConfigurator.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008-2015 Sonatype, 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.m2e.wtp;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/WTPProjectsUtil.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/WTPProjectsUtil.java
index 1f758cc..11f236b 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/WTPProjectsUtil.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/WTPProjectsUtil.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008-2014 Sonatype, 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.m2e.wtp;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/WarPluginConfiguration.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/WarPluginConfiguration.java
index 780f29e..990639e 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/WarPluginConfiguration.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/WarPluginConfiguration.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008-2015 Sonatype, 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.m2e.wtp;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/WebFragmentProjectConfigurator.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/WebFragmentProjectConfigurator.java
index 3b6e77d..b3d87a0 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/WebFragmentProjectConfigurator.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/WebFragmentProjectConfigurator.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008-2014 Sonatype, 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.m2e.wtp;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/WebProjectConfiguratorDelegate.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/WebProjectConfiguratorDelegate.java
index 14eb591..63a5661 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/WebProjectConfiguratorDelegate.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/WebProjectConfiguratorDelegate.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2013 Sonatype, 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.m2e.wtp;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/facets/AbstractFacetDetector.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/facets/AbstractFacetDetector.java
index 118797a..845b025 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/facets/AbstractFacetDetector.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/facets/AbstractFacetDetector.java
@@ -1,9 +1,11 @@
 /*************************************************************************************
  * Copyright (c) 2013 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:
  *     Fred Bricon (Red Hat, Inc.) - initial API and implementation
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/facets/FacetDetectorExtensionReader.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/facets/FacetDetectorExtensionReader.java
index 319ac07..adbf49b 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/facets/FacetDetectorExtensionReader.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/facets/FacetDetectorExtensionReader.java
@@ -1,9 +1,11 @@
 /*************************************************************************************
  * Copyright (c) 2013 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:
  *     Fred Bricon (Red Hat, Inc.) - initial API and implementation
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/facets/FacetDetectorManager.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/facets/FacetDetectorManager.java
index 68de613..e7ea660 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/facets/FacetDetectorManager.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/facets/FacetDetectorManager.java
@@ -1,9 +1,11 @@
 /*************************************************************************************
  * Copyright (c) 2011-2013 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:
  *     Fred Bricon (Red Hat, Inc.) - initial API and implementation
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/ExtensionReader.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/ExtensionReader.java
index 4cd8d2d..e03769d 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/ExtensionReader.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/ExtensionReader.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/Messages.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/Messages.java
index 31eb34f..917ade6 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/Messages.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/Messages.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/StringUtils.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/StringUtils.java
index 4290b3d..ea30211 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/StringUtils.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/StringUtils.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/WTPResourcesContentProvider.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/WTPResourcesContentProvider.java
index e7451e8..dcf9c32 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/WTPResourcesContentProvider.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/WTPResourcesContentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/WTPResourcesImages.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/WTPResourcesImages.java
index 631e6ec..8d2fac4 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/WTPResourcesImages.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/WTPResourcesImages.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/WTPResourcesLabelProvider.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/WTPResourcesLabelProvider.java
index 41d7ef2..68e8dce 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/WTPResourcesLabelProvider.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/WTPResourcesLabelProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/WTPResourcesNode.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/WTPResourcesNode.java
index 1251207..9071f5c 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/WTPResourcesNode.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/WTPResourcesNode.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/WTPResourcesSorter.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/WTPResourcesSorter.java
index 16ed1b8..a5cc18a 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/WTPResourcesSorter.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/WTPResourcesSorter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/build/WarProjectBuildParticipant.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/build/WarProjectBuildParticipant.java
index cc57dc6..19ee351 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/build/WarProjectBuildParticipant.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/build/WarProjectBuildParticipant.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2015 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.build;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/AbstractProjectFacetConversionEnabler.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/AbstractProjectFacetConversionEnabler.java
index e3aa707..4a91b3d 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/AbstractProjectFacetConversionEnabler.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/AbstractProjectFacetConversionEnabler.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2013 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *      Red Hat, Inc - initial API and implementation
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/AbstractWtpProjectConversionParticipant.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/AbstractWtpProjectConversionParticipant.java
index cae46a8..714aa2f 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/AbstractWtpProjectConversionParticipant.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/AbstractWtpProjectConversionParticipant.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.conversion;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/AppClientProjectConversionEnabler.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/AppClientProjectConversionEnabler.java
index 2e251cb..cd98ffe 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/AppClientProjectConversionEnabler.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/AppClientProjectConversionEnabler.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2013 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *      Red Hat, Inc - initial API and implementation
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/AppClientProjectConverter.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/AppClientProjectConverter.java
index 22215ed..ad5938a 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/AppClientProjectConverter.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/AppClientProjectConverter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2012 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.conversion;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/ConnectorProjectConversionEnabler.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/ConnectorProjectConversionEnabler.java
index 9b3b345..e5a87c1 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/ConnectorProjectConversionEnabler.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/ConnectorProjectConversionEnabler.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2013 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *      Red Hat, Inc - initial API and implementation
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/ConnectorProjectConverter.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/ConnectorProjectConverter.java
index fb2e5d2..82f9a85 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/ConnectorProjectConverter.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/ConnectorProjectConverter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2012 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.conversion;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/EarProjectConversionEnabler.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/EarProjectConversionEnabler.java
index f18b34f..06cd757 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/EarProjectConversionEnabler.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/EarProjectConversionEnabler.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2013 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *      Red Hat, Inc - initial API and implementation
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/EarProjectConverter.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/EarProjectConverter.java
index e7cfa91..10088dc 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/EarProjectConverter.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/EarProjectConverter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2012 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.conversion;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/EjbProjectConversionEnabler.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/EjbProjectConversionEnabler.java
index c510ed3..a04de9c 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/EjbProjectConversionEnabler.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/EjbProjectConversionEnabler.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2013 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *      Red Hat, Inc - initial API and implementation
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/EjbProjectConverter.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/EjbProjectConverter.java
index dcdb9ac..389dcd5 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/EjbProjectConverter.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/EjbProjectConverter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2012 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.conversion;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/MavenPluginUtils.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/MavenPluginUtils.java
index 927e515..049de0a 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/MavenPluginUtils.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/MavenPluginUtils.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.conversion;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/WebProjectConversionEnabler.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/WebProjectConversionEnabler.java
index 333ec25..8e55b99 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/WebProjectConversionEnabler.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/WebProjectConversionEnabler.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2013 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *      Red Hat, Inc - initial API and implementation
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/WebProjectConverter.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/WebProjectConverter.java
index 03e1c89..f7a0625 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/WebProjectConverter.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/conversion/WebProjectConverter.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2012 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.conversion;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/AppClientUninstallDelegate.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/AppClientUninstallDelegate.java
index b95dced..2f86e2f 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/AppClientUninstallDelegate.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/AppClientUninstallDelegate.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.facets;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/AppClientVersionChangeListener.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/AppClientVersionChangeListener.java
index 2699c4c..92c153c 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/AppClientVersionChangeListener.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/AppClientVersionChangeListener.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2012 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.facets;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/EarUninstallDelegate.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/EarUninstallDelegate.java
index 98ff7e4..5668a62 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/EarUninstallDelegate.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/EarUninstallDelegate.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.facets;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/EarVersionChangeListener.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/EarVersionChangeListener.java
index 537e26e..5317386 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/EarVersionChangeListener.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/EarVersionChangeListener.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2012 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.facets;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/EjbUninstallDelegate.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/EjbUninstallDelegate.java
index 84859bc..fa3453b 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/EjbUninstallDelegate.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/EjbUninstallDelegate.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.facets;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/EjbVersionChangeListener.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/EjbVersionChangeListener.java
index f0501f5..b48537f 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/EjbVersionChangeListener.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/EjbVersionChangeListener.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.facets;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/NoOpUninstallDelegate.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/NoOpUninstallDelegate.java
index a0fd61b..a2276c1 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/NoOpUninstallDelegate.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/NoOpUninstallDelegate.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.facets;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/NoOpVersionChangeListener.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/NoOpVersionChangeListener.java
index af3b6a6..6f46ee3 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/NoOpVersionChangeListener.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/NoOpVersionChangeListener.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.facets;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/RarUninstallDelegate.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/RarUninstallDelegate.java
index 9478518..81aff5a 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/RarUninstallDelegate.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/RarUninstallDelegate.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.facets;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/RarVersionChangeListener.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/RarVersionChangeListener.java
index 01e3795..95b908e 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/RarVersionChangeListener.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/RarVersionChangeListener.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.facets;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/WarUninstallDelegate.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/WarUninstallDelegate.java
index f5271fe..847ec48 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/WarUninstallDelegate.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/WarUninstallDelegate.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.facets;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/WarVersionChangeListener.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/WarVersionChangeListener.java
index 2f31478..7c1b12a 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/WarVersionChangeListener.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/facets/WarVersionChangeListener.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2012 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.facets;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/filtering/AbstractResourceFilteringConfiguration.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/filtering/AbstractResourceFilteringConfiguration.java
index d0d060c..8b338b9 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/filtering/AbstractResourceFilteringConfiguration.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/filtering/AbstractResourceFilteringConfiguration.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.filtering;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/filtering/AppClientResourceFilteringConfiguration.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/filtering/AppClientResourceFilteringConfiguration.java
index f3a8f2f..4710c56 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/filtering/AppClientResourceFilteringConfiguration.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/filtering/AppClientResourceFilteringConfiguration.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.filtering;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/filtering/EarResourceBuildParticipant.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/filtering/EarResourceBuildParticipant.java
index bac177d..415f489 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/filtering/EarResourceBuildParticipant.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/filtering/EarResourceBuildParticipant.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.filtering;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/filtering/EarResourceFilteringConfiguration.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/filtering/EarResourceFilteringConfiguration.java
index b8a05a5..19383d0 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/filtering/EarResourceFilteringConfiguration.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/filtering/EarResourceFilteringConfiguration.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008-2015 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.filtering;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/filtering/ResourceFilteringBuildParticipant.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/filtering/ResourceFilteringBuildParticipant.java
index a6dce3c..66e0b22 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/filtering/ResourceFilteringBuildParticipant.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/filtering/ResourceFilteringBuildParticipant.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008-2014 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.filtering;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/filtering/ResourceFilteringConfiguration.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/filtering/ResourceFilteringConfiguration.java
index 4d8c622..0ad90eb 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/filtering/ResourceFilteringConfiguration.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/filtering/ResourceFilteringConfiguration.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.filtering;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/filtering/ResourceFilteringConfigurationFactory.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/filtering/ResourceFilteringConfigurationFactory.java
index 827061b..3014d36 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/filtering/ResourceFilteringConfigurationFactory.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/filtering/ResourceFilteringConfigurationFactory.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.filtering;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/filtering/WebResourceFilteringConfiguration.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/filtering/WebResourceFilteringConfiguration.java
index 2ada9e3..76d2b74 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/filtering/WebResourceFilteringConfiguration.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/filtering/WebResourceFilteringConfiguration.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.filtering;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/jdt/launch/EjbClientClassifierClasspathProvider.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/jdt/launch/EjbClientClassifierClasspathProvider.java
index f5d398a..56a2ea2 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/jdt/launch/EjbClientClassifierClasspathProvider.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/jdt/launch/EjbClientClassifierClasspathProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2013 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *      Red Hat, Inc. - initial API and implementation
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/jdt/launch/WarClassesClassifierClasspathProvider.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/jdt/launch/WarClassesClassifierClasspathProvider.java
index 3d9f97c..568efce 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/jdt/launch/WarClassesClassifierClasspathProvider.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/jdt/launch/WarClassesClassifierClasspathProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2013 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *      Red Hat, Inc. - initial API and implementation
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/lifecycle/AcrLifecycleMapping.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/lifecycle/AcrLifecycleMapping.java
index 77c4ca7..e9f3927 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/lifecycle/AcrLifecycleMapping.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/lifecycle/AcrLifecycleMapping.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.lifecycle;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/lifecycle/EarLifecycleMapping.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/lifecycle/EarLifecycleMapping.java
index c51135b..bbaae5a 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/lifecycle/EarLifecycleMapping.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/lifecycle/EarLifecycleMapping.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.lifecycle;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/lifecycle/EjbLifecycleMapping.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/lifecycle/EjbLifecycleMapping.java
index 891b20d..e6d56cb 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/lifecycle/EjbLifecycleMapping.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/lifecycle/EjbLifecycleMapping.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.lifecycle;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/lifecycle/RarLifecycleMapping.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/lifecycle/RarLifecycleMapping.java
index e17bb2a..04e21ec 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/lifecycle/RarLifecycleMapping.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/lifecycle/RarLifecycleMapping.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.lifecycle;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/lifecycle/WarLifecycleMapping.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/lifecycle/WarLifecycleMapping.java
index a2b6a0b..7efeb54 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/lifecycle/WarLifecycleMapping.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/lifecycle/WarLifecycleMapping.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.lifecycle;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/mavenarchiver/AcrMavenArchiverConfigurator.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/mavenarchiver/AcrMavenArchiverConfigurator.java
index ce14670..eb0c7ee 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/mavenarchiver/AcrMavenArchiverConfigurator.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/mavenarchiver/AcrMavenArchiverConfigurator.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.mavenarchiver;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/mavenarchiver/EarMavenArchiverConfigurator.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/mavenarchiver/EarMavenArchiverConfigurator.java
index 19738e9..d1112a3 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/mavenarchiver/EarMavenArchiverConfigurator.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/mavenarchiver/EarMavenArchiverConfigurator.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.mavenarchiver;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/mavenarchiver/EjbMavenArchiverConfigurator.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/mavenarchiver/EjbMavenArchiverConfigurator.java
index 80d5ba5..358bf77 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/mavenarchiver/EjbMavenArchiverConfigurator.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/mavenarchiver/EjbMavenArchiverConfigurator.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.mavenarchiver;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/mavenarchiver/RarMavenArchiverConfigurator.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/mavenarchiver/RarMavenArchiverConfigurator.java
index 546bf73..e4ec782 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/mavenarchiver/RarMavenArchiverConfigurator.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/mavenarchiver/RarMavenArchiverConfigurator.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.mavenarchiver;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/mavenarchiver/WarMavenArchiverConfigurator.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/mavenarchiver/WarMavenArchiverConfigurator.java
index 0ecb3c4..3deccdb 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/mavenarchiver/WarMavenArchiverConfigurator.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/mavenarchiver/WarMavenArchiverConfigurator.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.mavenarchiver;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/preferences/ConfiguratorEnablerComposite.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/preferences/ConfiguratorEnablerComposite.java
index ad60bac..1aefdcb 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/preferences/ConfiguratorEnablerComposite.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/preferences/ConfiguratorEnablerComposite.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2013-2014 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *      Red Hat, Inc - initial API and implementation
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/preferences/MavenWtpPreferenceInitializer.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/preferences/MavenWtpPreferenceInitializer.java
index 831662a..4912e5a 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/preferences/MavenWtpPreferenceInitializer.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/preferences/MavenWtpPreferenceInitializer.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008-2014 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.preferences;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/preferences/MavenWtpPreferencePage.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/preferences/MavenWtpPreferencePage.java
index 1311482..c6f8740 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/preferences/MavenWtpPreferencePage.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/preferences/MavenWtpPreferencePage.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008-2014 Sonatype, 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.m2e.wtp.internal.preferences;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/preferences/MavenWtpPreferencesImpl.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/preferences/MavenWtpPreferencesImpl.java
index e36bf57..2d74e9d 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/preferences/MavenWtpPreferencesImpl.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/preferences/MavenWtpPreferencesImpl.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008-2014 Sonatype, 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.m2e.wtp.internal.preferences;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/preferences/MavenWtpPreferencesManagerImpl.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/preferences/MavenWtpPreferencesManagerImpl.java
index d201ee8..f19e333 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/preferences/MavenWtpPreferencesManagerImpl.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/preferences/MavenWtpPreferencesManagerImpl.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008-2014 Sonatype, 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.m2e.wtp.internal.preferences;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/utilities/ComponentModuleUtil.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/utilities/ComponentModuleUtil.java
index 2ca3b1b..189b2fb 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/utilities/ComponentModuleUtil.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/utilities/ComponentModuleUtil.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2015 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.utilities;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/utilities/DebugUtilities.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/utilities/DebugUtilities.java
index 7ad5a63..1e829ec 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/utilities/DebugUtilities.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/utilities/DebugUtilities.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.utilities;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/utilities/PathUtil.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/utilities/PathUtil.java
index 75d5852..4baca03 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/utilities/PathUtil.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/utilities/PathUtil.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2010 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.internal.utilities;
 
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/webfragment/WebFragmentQuickPeek.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/webfragment/WebFragmentQuickPeek.java
index b5cbcbe..15cf7dd 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/webfragment/WebFragmentQuickPeek.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/webfragment/WebFragmentQuickPeek.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2014 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
   *     Fred Bricon (Red Hat, Inc.) - initial API and implementation
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/webfragment/WebFragmentUtil.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/webfragment/WebFragmentUtil.java
index 3ea8536..253cea1 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/webfragment/WebFragmentUtil.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/webfragment/WebFragmentUtil.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2014 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
   *     Fred Bricon (Red Hat, Inc.) - initial API and implementation
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/mavenarchiver/AbstractWTPArchiverConfigurator.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/mavenarchiver/AbstractWTPArchiverConfigurator.java
index 5c163dd..3602057 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/mavenarchiver/AbstractWTPArchiverConfigurator.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/mavenarchiver/AbstractWTPArchiverConfigurator.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008-2014 Sonatype, 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.m2e.wtp.mavenarchiver;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/namemapping/PatternBasedFileNameMapping.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/namemapping/PatternBasedFileNameMapping.java
index 8b2448e..cf32e9e 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/namemapping/PatternBasedFileNameMapping.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/namemapping/PatternBasedFileNameMapping.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.namemapping;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/preferences/ConfiguratorEnabler.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/preferences/ConfiguratorEnabler.java
index d377fe1..85b7541 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/preferences/ConfiguratorEnabler.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/preferences/ConfiguratorEnabler.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.preferences;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/preferences/IMavenWtpPreferences.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/preferences/IMavenWtpPreferences.java
index 085f3a8..231ca74 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/preferences/IMavenWtpPreferences.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/preferences/IMavenWtpPreferences.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008-2014 Sonatype, 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.m2e.wtp.preferences;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/preferences/IMavenWtpPreferencesManager.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/preferences/IMavenWtpPreferencesManager.java
index 0ffd73e..09f6b6e 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/preferences/IMavenWtpPreferencesManager.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/preferences/IMavenWtpPreferencesManager.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is 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.m2e.wtp.preferences;
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/preferences/MavenWtpPreferencesConstants.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/preferences/MavenWtpPreferencesConstants.java
index 69f95f1..3dfbafe 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/preferences/MavenWtpPreferencesConstants.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/preferences/MavenWtpPreferencesConstants.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008-2014 Sonatype, 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.m2e.wtp.preferences;
diff --git a/pom.xml b/pom.xml
index 847cd1d..f2c83f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,9 +2,11 @@
 <!--
   Copyright (c) 2008-2015 Sonatype, 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
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -22,40 +24,35 @@
   <packaging>pom</packaging>
 
   <name>M2E-WTP :: Parent</name>
-  <url>http://www.eclipse.org/m2e-wtp</url>
+  <url>https://www.eclipse.org/m2e-wtp</url>
   <inceptionYear>2008</inceptionYear>
 
   <properties>
-    <tycho-version>1.4.0</tycho-version>
+    <tycho-version>1.5.1</tycho-version>
     <tycho-extras-version>${tycho-version}</tycho-extras-version>
     <tycho.scmUrl>scm:git:http://git.eclipse.org/gitroot/m2e-wtp/org.eclipse.m2e.wtp.git</tycho.scmUrl>
 
     <test.timeout>1800</test.timeout><!--  30 mins -->
     <tycho.test.jvmArgs>-Xmx512m</tycho.test.jvmArgs>
-    <eclipse.target>2019-06</eclipse.target>
-    <eclipse-repo.url>http://download.eclipse.org/releases/${eclipse.target}</eclipse-repo.url>
-    <webtools-repo.url>https://download.eclipse.org/webtools/downloads/drops/R3.14.0/S-3.14.0.M3-20190528041652/repository</webtools-repo.url>
-    <orbit-repo.url>http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository/</orbit-repo.url>
-    <m2e-repo.url>http://download.eclipse.org/technology/m2e/milestones/1.12/</m2e-repo.url>
+    <eclipse.target>2019-12</eclipse.target>
+    <eclipse-repo.url>https://download.eclipse.org/releases/${eclipse.target}</eclipse-repo.url>
+    <webtools-repo.url>https://download.eclipse.org/webtools/downloads/drops/R3.16.0/S-3.16.0.M3-20191121172023/repository</webtools-repo.url>
+    <orbit-repo.url>https://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository/</orbit-repo.url>
+    <m2e-repo.url>https://download.eclipse.org/technology/m2e/milestones/1.14/</m2e-repo.url>
     <!-- Warning : changing the mavenarchiver version requires submitting a new CQ in ipzilla -->
     <!-- Use signed version of m2eclipse-mavenarchiver 0.17.2.201606141937-signed-20160830073346, built on build.eclipse.org -->
     <mavenarchiver-repo.url>http://download.eclipse.org/m2e-wtp/signed/mavenarchiver/0.17.4/</mavenarchiver-repo.url>
-
   </properties>
 
-  <prerequisites>
-   <maven>3.0</maven>
-  </prerequisites>
-
   <organization>
     <name>Eclipse foundation</name>
-    <url>http://www.eclipse.org</url>
+    <url>https://www.eclipse.org</url>
   </organization>
 
   <licenses>
     <license>
-      <name>Eclipse Public License - v 1.0</name>
-      <url>http://www.eclipse.org/legal/epl-v10.html</url>
+      <name>Eclipse Public License - v 2.0</name>
+      <url>https://www.eclipse.org/legal/epl-v20.html</url>
     </license>
   </licenses>
 
@@ -170,7 +167,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-resources-plugin</artifactId>
-          <version>3.0.1</version>
+          <version>3.1.0</version>
         </plugin>
       </plugins>
     </pluginManagement>