[543810] Update copyrights and EPLv1 licenses to EPL 2.0

Change-Id: Ieb11ce0b7c7852cddaea5b326687ed8017651a37
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/DocBuild.xml b/docs/org.eclipse.jst.server.ui.doc.user/DocBuild.xml
index 1dcc5d6..2781c0d 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/DocBuild.xml
+++ b/docs/org.eclipse.jst.server.ui.doc.user/DocBuild.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!--
+    Copyright (c) 2007, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <!-- 
 
 	This script build the Help plug-in by transforming the DITA source files into HTML.
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/about.html b/docs/org.eclipse.jst.server.ui.doc.user/about.html
index 2199df3..a52f3af 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/about.html
+++ b/docs/org.eclipse.jst.server.ui.doc.user/about.html
@@ -16,15 +16,15 @@
 
 <P>The Eclipse Foundation makes available all content in this plug-in 
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
+under the terms and conditions of the Eclipse Public License Version 2.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
 Content is being redistributed by another party ("Redistributor") 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 
+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
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/build.properties b/docs/org.eclipse.jst.server.ui.doc.user/build.properties
index d75418d..a6ff5d5 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/build.properties
+++ b/docs/org.eclipse.jst.server.ui.doc.user/build.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 2019 IBM Corporation and others.
+# 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
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 bin.includes = org.eclipse.jst.server.ui.doc.user_build_toc.xml,\
                *.xml,\
                plugin.properties,\
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/build_toc.xml b/docs/org.eclipse.jst.server.ui.doc.user/build_toc.xml
index 4b38089..5d52ebd 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/build_toc.xml
+++ b/docs/org.eclipse.jst.server.ui.doc.user/build_toc.xml
@@ -2,9 +2,11 @@
 <!-- /*******************************************************************************
  * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/jst_reltable.xml b/docs/org.eclipse.jst.server.ui.doc.user/jst_reltable.xml
index 0f46c75..3da5b41 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/jst_reltable.xml
+++ b/docs/org.eclipse.jst.server.ui.doc.user/jst_reltable.xml
@@ -2,4 +2,17 @@
 
 <?NLS TYPE="org.eclipse.help.toc"?>
 
+<!--
+    Copyright (c) 2010, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <toc/>
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/myplugin.xml b/docs/org.eclipse.jst.server.ui.doc.user/myplugin.xml
index f5be97b..67a64ac 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/myplugin.xml
+++ b/docs/org.eclipse.jst.server.ui.doc.user/myplugin.xml
@@ -4,9 +4,11 @@
 <!-- /*******************************************************************************
  * Copyright (c) 2000, 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/docs/org.eclipse.jst.server.ui.doc.user/org.eclipse.jst.server.ui.doc.userindex.xml b/docs/org.eclipse.jst.server.ui.doc.user/org.eclipse.jst.server.ui.doc.userindex.xml
index f3200fa..0207082 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/org.eclipse.jst.server.ui.doc.userindex.xml
+++ b/docs/org.eclipse.jst.server.ui.doc.user/org.eclipse.jst.server.ui.doc.userindex.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2006, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <index>
   <entry keyword="testing">
     <entry keyword="Web projects">
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/plugin.properties b/docs/org.eclipse.jst.server.ui.doc.user/plugin.properties
index 5adea4f..851357e 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/plugin.properties
+++ b/docs/org.eclipse.jst.server.ui.doc.user/plugin.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2001, 2005 IBM Corporation and others.
+# Copyright (c) 2001, 2006 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/plugin.xml b/docs/org.eclipse.jst.server.ui.doc.user/plugin.xml
index 90d3fea..8efa693 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/plugin.xml
+++ b/docs/org.eclipse.jst.server.ui.doc.user/plugin.xml
@@ -4,9 +4,9 @@
 <!-- /*******************************************************************************
  * Copyright (c) 2000, 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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/pom.xml b/docs/org.eclipse.jst.server.ui.doc.user/pom.xml
index 564677f..b5edd38 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/pom.xml
+++ b/docs/org.eclipse.jst.server.ui.doc.user/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

-  Copyright (c) 2012, 2013 Eclipse Foundation and others.

+  Copyright (c) 2012, 2017 Eclipse Foundation and others.

   All rights reserved. This program and the accompanying materials

   are made available under the terms of the Eclipse Distribution License v1.0

   which accompanies this distribution, and is available at

@@ -8,7 +8,7 @@
  

   Contributors:

     Thanh Ha (Eclipse Foundation) - initial implementation

--->

+-->
 

 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"

     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

diff --git a/docs/org.eclipse.jst.server.ui.doc.user/tomcat_create.xml b/docs/org.eclipse.jst.server.ui.doc.user/tomcat_create.xml
index 10fc98c..f774de2 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/tomcat_create.xml
+++ b/docs/org.eclipse.jst.server.ui.doc.user/tomcat_create.xml
@@ -2,6 +2,19 @@
 
 <?NLS TYPE="org.eclipse.help.toc"?>
 
+<!--
+    Copyright (c) 2006, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <toc link_to="../org.eclipse.wst.server.ui.doc.user/wtp_create.xml#tomcat_create" label="tomcat_tasks" topic="topics/tomcat.html">
 <topic label="...Apache Tomcat" href="topics/tomcat.html"/>
 </toc>
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/tomcat_pref.xml b/docs/org.eclipse.jst.server.ui.doc.user/tomcat_pref.xml
index 87ec3b3..1bcb2bf 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/tomcat_pref.xml
+++ b/docs/org.eclipse.jst.server.ui.doc.user/tomcat_pref.xml
@@ -2,6 +2,19 @@
 
 <?NLS TYPE="org.eclipse.help.toc"?>
 
+<!--
+    Copyright (c) 2006, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <toc link_to="../org.eclipse.wst.server.ui.doc.user/wtp_create.xml#tomcat_pref" label="tomcat_tasks" topic="topics/twtomprf.html">
 <topic label="...for Apache Tomcat runtimes" href="topics/twtomprf.html"/>
 </toc>
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/topics/tomcat.html b/docs/org.eclipse.jst.server.ui.doc.user/topics/tomcat.html
index b2dfd2e..1a753e1 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/topics/tomcat.html
+++ b/docs/org.eclipse.jst.server.ui.doc.user/topics/tomcat.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. 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/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/topics/twtomprf.html b/docs/org.eclipse.jst.server.ui.doc.user/topics/twtomprf.html
index 4f81034..71cc4e5 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/topics/twtomprf.html
+++ b/docs/org.eclipse.jst.server.ui.doc.user/topics/twtomprf.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. 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/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.jst.server.ui.infopop/STjavaContexts.xml b/docs/org.eclipse.jst.server.ui.infopop/STjavaContexts.xml
index 3f822bf..9954b0d 100644
--- a/docs/org.eclipse.jst.server.ui.infopop/STjavaContexts.xml
+++ b/docs/org.eclipse.jst.server.ui.infopop/STjavaContexts.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?NLS type="org.eclipse.help.contexts"?>
 <!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/docs/org.eclipse.jst.server.ui.infopop/STtomcatContexts.xml b/docs/org.eclipse.jst.server.ui.infopop/STtomcatContexts.xml
index 16b563b..42b06bc 100644
--- a/docs/org.eclipse.jst.server.ui.infopop/STtomcatContexts.xml
+++ b/docs/org.eclipse.jst.server.ui.infopop/STtomcatContexts.xml
@@ -3,9 +3,11 @@
 <!-- /*******************************************************************************
  * Copyright (c) 2000, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/docs/org.eclipse.jst.server.ui.infopop/about.html b/docs/org.eclipse.jst.server.ui.infopop/about.html
index 2199df3..454947c 100644
--- a/docs/org.eclipse.jst.server.ui.infopop/about.html
+++ b/docs/org.eclipse.jst.server.ui.infopop/about.html
@@ -18,7 +18,7 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/docs/org.eclipse.jst.server.ui.infopop/build.properties b/docs/org.eclipse.jst.server.ui.infopop/build.properties
index 25c3c39..23a9a86 100644
--- a/docs/org.eclipse.jst.server.ui.infopop/build.properties
+++ b/docs/org.eclipse.jst.server.ui.infopop/build.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 2019 IBM Corporation and others.
+# 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
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 bin.includes = STjavaContexts.xml,\
                STtomcatContexts.xml,\
                plugin.properties,\
diff --git a/docs/org.eclipse.jst.server.ui.infopop/plugin.properties b/docs/org.eclipse.jst.server.ui.infopop/plugin.properties
index 7825c7e..f8f44d1 100644
--- a/docs/org.eclipse.jst.server.ui.infopop/plugin.properties
+++ b/docs/org.eclipse.jst.server.ui.infopop/plugin.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 2019 IBM Corporation and others.
+# 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
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 # NLS_MESSAGEFORMAT_VAR
 
 pluginName = Server Tools infopops for J2EE Standard Tools
diff --git a/docs/org.eclipse.jst.server.ui.infopop/plugin.xml b/docs/org.eclipse.jst.server.ui.infopop/plugin.xml
index 877ae60..76b5233 100644
--- a/docs/org.eclipse.jst.server.ui.infopop/plugin.xml
+++ b/docs/org.eclipse.jst.server.ui.infopop/plugin.xml
@@ -3,9 +3,9 @@
 <!-- /*******************************************************************************
  * Copyright (c) 2000, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/docs/org.eclipse.jst.server.ui.infopop/pom.xml b/docs/org.eclipse.jst.server.ui.infopop/pom.xml
index 67734a4..8078cb7 100644
--- a/docs/org.eclipse.jst.server.ui.infopop/pom.xml
+++ b/docs/org.eclipse.jst.server.ui.infopop/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

-  Copyright (c) 2012, 2013 Eclipse Foundation and others.

+  Copyright (c) 2012, 2017 Eclipse Foundation and others.

   All rights reserved. This program and the accompanying materials

   are made available under the terms of the Eclipse Distribution License v1.0

   which accompanies this distribution, and is available at

@@ -8,7 +8,7 @@
  

   Contributors:

     Thanh Ha (Eclipse Foundation) - initial implementation

--->

+-->
 

 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"

     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

diff --git a/docs/org.eclipse.server.doc.isv/about.html b/docs/org.eclipse.server.doc.isv/about.html
index 2199df3..454947c 100644
--- a/docs/org.eclipse.server.doc.isv/about.html
+++ b/docs/org.eclipse.server.doc.isv/about.html
@@ -18,7 +18,7 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/docs/org.eclipse.server.doc.isv/build.properties b/docs/org.eclipse.server.doc.isv/build.properties
index bf6b205..1181ac2 100644
--- a/docs/org.eclipse.server.doc.isv/build.properties
+++ b/docs/org.eclipse.server.doc.isv/build.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2008, 2019 IBM Corporation and others.
+# 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
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 bin.includes = META-INF/,\
                plugin.xml,\
                topics_ExtPoint_Reference.xml,\
diff --git a/docs/org.eclipse.server.doc.isv/buildExtDocs.properties b/docs/org.eclipse.server.doc.isv/buildExtDocs.properties
index 6d984f1..c14f83d 100644
--- a/docs/org.eclipse.server.doc.isv/buildExtDocs.properties
+++ b/docs/org.eclipse.server.doc.isv/buildExtDocs.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2001, 2008 Oracle Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #     Oracle Corporation - initial API and implementation
diff --git a/docs/org.eclipse.server.doc.isv/buildExtDocs.xml b/docs/org.eclipse.server.doc.isv/buildExtDocs.xml
index 67432f6..1ab1ca6 100644
--- a/docs/org.eclipse.server.doc.isv/buildExtDocs.xml
+++ b/docs/org.eclipse.server.doc.isv/buildExtDocs.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <project name="Build Extension Point Documentation" default="createExtDocs" basedir=".">
 
 	<property file="buildExtDocs.properties"/>
diff --git a/docs/org.eclipse.server.doc.isv/extDocListings.xml b/docs/org.eclipse.server.doc.isv/extDocListings.xml
index 872ba5f..eae27e1 100644
--- a/docs/org.eclipse.server.doc.isv/extDocListings.xml
+++ b/docs/org.eclipse.server.doc.isv/extDocListings.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <components>
 	<component name="Server Tools" id="servertools" file="servertoolsextdocs.xml"/>
 </components>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_internalRuntimeComponentProviders.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_internalRuntimeComponentProviders.html
index b4c910c..2d77246 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_internalRuntimeComponentProviders.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_internalRuntimeComponentProviders.html
@@ -51,9 +51,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2006 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_runtimeClasspathProviders.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_runtimeClasspathProviders.html
index 0e81b96..f1a5c11 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_runtimeClasspathProviders.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_runtimeClasspathProviders.html
@@ -50,9 +50,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_runtimeFacetMappings.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_runtimeFacetMappings.html
index 71dcd4b..92eef94 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_runtimeFacetMappings.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_runtimeFacetMappings.html
@@ -51,9 +51,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_serverProfilers.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_serverProfilers.html
index 5fbb1f2..4dcc302 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_serverProfilers.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_serverProfilers.html
@@ -49,9 +49,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2006 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_clients.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_clients.html
index fe45e10..6bb34cb 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_clients.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_clients.html
@@ -248,9 +248,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_installableRuntimes.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_installableRuntimes.html
index 9a48f9c..695aa2b 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_installableRuntimes.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_installableRuntimes.html
@@ -97,9 +97,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_installableServers.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_installableServers.html
index a598cf4..1218459 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_installableServers.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_installableServers.html
@@ -60,9 +60,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_internalServerMonitors.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_internalServerMonitors.html
index 08adc71..fdc9efa 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_internalServerMonitors.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_internalServerMonitors.html
@@ -47,9 +47,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_internalStartup.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_internalStartup.html
index a03fc91..ecdbe33 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_internalStartup.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_internalStartup.html
@@ -50,9 +50,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_launchableAdapters.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_launchableAdapters.html
index b319629..af84e04 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_launchableAdapters.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_launchableAdapters.html
@@ -51,9 +51,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleArtifactAdapters.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleArtifactAdapters.html
index e6341ec..32b0b69 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleArtifactAdapters.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleArtifactAdapters.html
@@ -237,9 +237,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2008 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleFactories.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleFactories.html
index 716e806..521b3e8 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleFactories.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleFactories.html
@@ -64,9 +64,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleTypes.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleTypes.html
index ff33f97..00ae7e8 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleTypes.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleTypes.html
@@ -49,9 +49,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_publishTasks.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_publishTasks.html
index 71f83d5..3f6daef 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_publishTasks.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_publishTasks.html
@@ -45,9 +45,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_publishers.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_publishers.html
index 3705480..da0cf65 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_publishers.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_publishers.html
@@ -51,9 +51,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2008 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeFacetComponentProviders.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeFacetComponentProviders.html
index 42c0a86..a5870b9 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeFacetComponentProviders.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeFacetComponentProviders.html
@@ -51,9 +51,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2007 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeLocators.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeLocators.html
index 064244f..527fdfa 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeLocators.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeLocators.html
@@ -52,9 +52,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeTargetHandlers.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeTargetHandlers.html
index c08e040..856af90 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeTargetHandlers.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeTargetHandlers.html
@@ -54,9 +54,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeTypes.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeTypes.html
index ad57210..1c81a16 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeTypes.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeTypes.html
@@ -72,9 +72,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_serverLocators.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_serverLocators.html
index bb63ee5..63f8a30 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_serverLocators.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_serverLocators.html
@@ -53,9 +53,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_serverTypes.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_serverTypes.html
index 3e2b699..785a262 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_serverTypes.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_serverTypes.html
@@ -72,9 +72,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_audio.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_audio.html
index 5b05283..1cb9434 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_audio.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_audio.html
@@ -57,9 +57,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorActions.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorActions.html
index be5eb39..ee86f8e 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorActions.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorActions.html
@@ -247,9 +247,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorPageSections.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorPageSections.html
index 808d90f..ed00652 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorPageSections.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorPageSections.html
@@ -247,9 +247,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorPages.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorPages.html
index f61b489..a5d9712 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorPages.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorPages.html
@@ -248,9 +248,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_initialSelectionProvider.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_initialSelectionProvider.html
index c905ee0..b7aa427 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_initialSelectionProvider.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_initialSelectionProvider.html
@@ -48,9 +48,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_serverImages.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_serverImages.html
index f3f857a..9250143 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_serverImages.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_serverImages.html
@@ -50,9 +50,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_serverToolTip.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_serverToolTip.html
index 850738d..f8614c7 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_serverToolTip.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_serverToolTip.html
@@ -53,9 +53,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2007 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_wizardFragments.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_wizardFragments.html
index 40eeb41..af24736 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_wizardFragments.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_wizardFragments.html
@@ -50,9 +50,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/javadoc.properties b/docs/org.eclipse.server.doc.isv/javadoc.properties
index 46cb22c..83c3269 100644
--- a/docs/org.eclipse.server.doc.isv/javadoc.properties
+++ b/docs/org.eclipse.server.doc.isv/javadoc.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2001, 2008 Oracle Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #     Oracle Corporation - initial API and implementation
diff --git a/docs/org.eclipse.server.doc.isv/javadoc.xml b/docs/org.eclipse.server.doc.isv/javadoc.xml
index 97af1e7..5ca5963 100644
--- a/docs/org.eclipse.server.doc.isv/javadoc.xml
+++ b/docs/org.eclipse.server.doc.isv/javadoc.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <!--overview="${basedir}/html/api_reference/erview/overview.html"-->
 <project default="main" basedir=".">
 
diff --git a/docs/org.eclipse.server.doc.isv/javadocBuild.xml b/docs/org.eclipse.server.doc.isv/javadocBuild.xml
index 5119a48..22330d9 100644
--- a/docs/org.eclipse.server.doc.isv/javadocBuild.xml
+++ b/docs/org.eclipse.server.doc.isv/javadocBuild.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <!--overview="${basedir}/html/api_reference/erview/overview.html"-->
 <project default="main" basedir=".">
 
diff --git a/docs/org.eclipse.server.doc.isv/javadoctoc.xml b/docs/org.eclipse.server.doc.isv/javadoctoc.xml
index 542a3b3..e3d3a86 100644
--- a/docs/org.eclipse.server.doc.isv/javadoctoc.xml
+++ b/docs/org.eclipse.server.doc.isv/javadoctoc.xml
@@ -1,6 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?NLS TYPE="org.eclipse.help.toc"?>
-	 <toc label="Javadoc Packages Reference">
+	
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+ <toc label="Javadoc Packages Reference">
 <topic label="org.eclipse.jst.server.core" href="html/api_reference/org/eclipse/jst/server/core/package-summary.html"/>
 <topic label="org.eclipse.wst.server.core" href="html/api_reference/org/eclipse/wst/server/core/package-summary.html"/>
 <topic label="org.eclipse.wst.server.core.model" href="html/api_reference/org/eclipse/wst/server/core/model/package-summary.html"/>
diff --git a/docs/org.eclipse.server.doc.isv/packages.xml b/docs/org.eclipse.server.doc.isv/packages.xml
index 089b76a..d0b114d 100644
--- a/docs/org.eclipse.server.doc.isv/packages.xml
+++ b/docs/org.eclipse.server.doc.isv/packages.xml
@@ -1 +1,13 @@
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
 <packages><package></package><package>org.eclipse.jst.server.core</package><package>org.eclipse.wst.server.core</package><package>org.eclipse.wst.server.core.model</package><package>org.eclipse.wst.server.core.util</package><package>org.eclipse.wst.server.ui</package><package>org.eclipse.wst.server.ui.actions</package><package>org.eclipse.wst.server.ui.editor</package><package>org.eclipse.wst.server.ui.wizard</package></packages>
\ No newline at end of file
diff --git a/docs/org.eclipse.server.doc.isv/plugin.properties b/docs/org.eclipse.server.doc.isv/plugin.properties
index 465d8a1..7de52a5 100644
--- a/docs/org.eclipse.server.doc.isv/plugin.properties
+++ b/docs/org.eclipse.server.doc.isv/plugin.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2008 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/docs/org.eclipse.server.doc.isv/plugins.xml b/docs/org.eclipse.server.doc.isv/plugins.xml
index 7bc30d4..590338e 100644
--- a/docs/org.eclipse.server.doc.isv/plugins.xml
+++ b/docs/org.eclipse.server.doc.isv/plugins.xml
@@ -1,3 +1,15 @@
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
 org.eclipse.wst.internet.monitor.core;
 org.eclipse.wst.server.core;
 org.eclipse.wst.server.http.core;
diff --git a/docs/org.eclipse.server.doc.isv/pom.xml b/docs/org.eclipse.server.doc.isv/pom.xml
index 420251c..14026b4 100644
--- a/docs/org.eclipse.server.doc.isv/pom.xml
+++ b/docs/org.eclipse.server.doc.isv/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

-  Copyright (c) 2012, 2013 Eclipse Foundation and others.

+  Copyright (c) 2012, 2017 Eclipse Foundation and others.

   All rights reserved. This program and the accompanying materials

   are made available under the terms of the Eclipse Distribution License v1.0

   which accompanies this distribution, and is available at

@@ -8,7 +8,7 @@
  

   Contributors:

     Thanh Ha (Eclipse Foundation) - initial implementation

--->

+-->
 

 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"

     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

diff --git a/docs/org.eclipse.server.doc.isv/servertoolsextdocs.xml b/docs/org.eclipse.server.doc.isv/servertoolsextdocs.xml
index c26677d..06945bd 100644
--- a/docs/org.eclipse.server.doc.isv/servertoolsextdocs.xml
+++ b/docs/org.eclipse.server.doc.isv/servertoolsextdocs.xml
@@ -1 +1,13 @@
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
 <files component="servertools"><file>org_eclipse_jst_server_core_internalRuntimeComponentProviders.html</file>/n/n<file>org_eclipse_jst_server_core_runtimeClasspathProviders.html</file>/n/n<file>org_eclipse_jst_server_core_runtimeFacetMappings.html</file>/n/n<file>org_eclipse_jst_server_core_serverProfilers.html</file>/n/n<file>org_eclipse_wst_server_core_clients.html</file>/n/n<file>org_eclipse_wst_server_core_installableRuntimes.html</file>/n/n<file>org_eclipse_wst_server_core_installableServers.html</file>/n/n<file>org_eclipse_wst_server_core_internalServerMonitors.html</file>/n/n<file>org_eclipse_wst_server_core_internalStartup.html</file>/n/n<file>org_eclipse_wst_server_core_launchableAdapters.html</file>/n/n<file>org_eclipse_wst_server_core_moduleArtifactAdapters.html</file>/n/n<file>org_eclipse_wst_server_core_moduleFactories.html</file>/n/n<file>org_eclipse_wst_server_core_moduleTypes.html</file>/n/n<file>org_eclipse_wst_server_core_publishTasks.html</file>/n/n<file>org_eclipse_wst_server_core_publishers.html</file>/n/n<file>org_eclipse_wst_server_core_runtimeFacetComponentProviders.html</file>/n/n<file>org_eclipse_wst_server_core_runtimeLocators.html</file>/n/n<file>org_eclipse_wst_server_core_runtimeTargetHandlers.html</file>/n/n<file>org_eclipse_wst_server_core_runtimeTypes.html</file>/n/n<file>org_eclipse_wst_server_core_serverLocators.html</file>/n/n<file>org_eclipse_wst_server_core_serverTypes.html</file>/n/n<file>org_eclipse_wst_server_ui_audio.html</file>/n/n<file>org_eclipse_wst_server_ui_editorActions.html</file>/n/n<file>org_eclipse_wst_server_ui_editorPageSections.html</file>/n/n<file>org_eclipse_wst_server_ui_editorPages.html</file>/n/n<file>org_eclipse_wst_server_ui_initialSelectionProvider.html</file>/n/n<file>org_eclipse_wst_server_ui_serverImages.html</file>/n/n<file>org_eclipse_wst_server_ui_serverToolTip.html</file>/n/n<file>org_eclipse_wst_server_ui_wizardFragments.html</file></files>
\ No newline at end of file
diff --git a/docs/org.eclipse.server.doc.isv/tocreference.xml b/docs/org.eclipse.server.doc.isv/tocreference.xml
index d52b879..fb524d6 100644
--- a/docs/org.eclipse.server.doc.isv/tocreference.xml
+++ b/docs/org.eclipse.server.doc.isv/tocreference.xml
@@ -1,6 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?NLS TYPE="org.eclipse.help.toc"?>
 
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <toc label="Server Tools Reference" link_to="../org.eclipse.wst.doc.user/reference_toc.xml#javadoc_servertools"> 
 	<topic label="Server Tools API Reference" href="html/api_reference/overview-summary.html">
     <link toc="javadoctoc.xml"/>
diff --git a/docs/org.eclipse.server.doc.isv/topics_ExtPoint_Reference.xml b/docs/org.eclipse.server.doc.isv/topics_ExtPoint_Reference.xml
index 5228142..52a5d7f 100644
--- a/docs/org.eclipse.server.doc.isv/topics_ExtPoint_Reference.xml
+++ b/docs/org.eclipse.server.doc.isv/topics_ExtPoint_Reference.xml
@@ -1,6 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?NLS TYPE="org.eclipse.help.toc"?>
-	 	<toc label="Extension Points Reference">
+	 
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+	<toc label="Extension Points Reference">
 <topic label="org.eclipse.jst.server.core.internalRuntimeComponentProviders" href="html/extpts_reference/servertools/org_eclipse_jst_server_core_internalRuntimeComponentProviders.html"/>
 <topic label="org.eclipse.jst.server.core.runtimeClasspathProviders" href="html/extpts_reference/servertools/org_eclipse_jst_server_core_runtimeClasspathProviders.html"/>
 <topic label="org.eclipse.jst.server.core.runtimeFacetMappings" href="html/extpts_reference/servertools/org_eclipse_jst_server_core_runtimeFacetMappings.html"/>
diff --git a/docs/org.eclipse.servertools.doc.isv/about.html b/docs/org.eclipse.servertools.doc.isv/about.html
index 2199df3..454947c 100644
--- a/docs/org.eclipse.servertools.doc.isv/about.html
+++ b/docs/org.eclipse.servertools.doc.isv/about.html
@@ -18,7 +18,7 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/docs/org.eclipse.servertools.doc.isv/build.properties b/docs/org.eclipse.servertools.doc.isv/build.properties
index b727e07..5861924 100644
--- a/docs/org.eclipse.servertools.doc.isv/build.properties
+++ b/docs/org.eclipse.servertools.doc.isv/build.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2008, 2019 IBM Corporation and others.
+# 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
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 bin.includes = .,\
                plugin.xml,\
                plugin.properties,\
diff --git a/docs/org.eclipse.servertools.doc.isv/buildExtDocs.properties b/docs/org.eclipse.servertools.doc.isv/buildExtDocs.properties
index 6d984f1..c14f83d 100644
--- a/docs/org.eclipse.servertools.doc.isv/buildExtDocs.properties
+++ b/docs/org.eclipse.servertools.doc.isv/buildExtDocs.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2001, 2008 Oracle Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #     Oracle Corporation - initial API and implementation
diff --git a/docs/org.eclipse.servertools.doc.isv/buildExtDocs.xml b/docs/org.eclipse.servertools.doc.isv/buildExtDocs.xml
index 67432f6..1ab1ca6 100644
--- a/docs/org.eclipse.servertools.doc.isv/buildExtDocs.xml
+++ b/docs/org.eclipse.servertools.doc.isv/buildExtDocs.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <project name="Build Extension Point Documentation" default="createExtDocs" basedir=".">
 
 	<property file="buildExtDocs.properties"/>
diff --git a/docs/org.eclipse.servertools.doc.isv/extDocListings.xml b/docs/org.eclipse.servertools.doc.isv/extDocListings.xml
index 872ba5f..eae27e1 100644
--- a/docs/org.eclipse.servertools.doc.isv/extDocListings.xml
+++ b/docs/org.eclipse.servertools.doc.isv/extDocListings.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <components>
 	<component name="Server Tools" id="servertools" file="servertoolsextdocs.xml"/>
 </components>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_internalRuntimeComponentProviders.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_internalRuntimeComponentProviders.html
index b4c910c..2d77246 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_internalRuntimeComponentProviders.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_internalRuntimeComponentProviders.html
@@ -51,9 +51,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2006 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_runtimeClasspathProviders.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_runtimeClasspathProviders.html
index 0e81b96..f1a5c11 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_runtimeClasspathProviders.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_runtimeClasspathProviders.html
@@ -50,9 +50,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_runtimeFacetMappings.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_runtimeFacetMappings.html
index 71dcd4b..92eef94 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_runtimeFacetMappings.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_runtimeFacetMappings.html
@@ -51,9 +51,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_serverProfilers.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_serverProfilers.html
index 5fbb1f2..4dcc302 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_serverProfilers.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_serverProfilers.html
@@ -49,9 +49,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2006 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_clients.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_clients.html
index fe45e10..6bb34cb 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_clients.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_clients.html
@@ -248,9 +248,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_installableRuntimes.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_installableRuntimes.html
index 9a48f9c..695aa2b 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_installableRuntimes.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_installableRuntimes.html
@@ -97,9 +97,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_installableServers.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_installableServers.html
index a598cf4..1218459 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_installableServers.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_installableServers.html
@@ -60,9 +60,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_internalServerMonitors.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_internalServerMonitors.html
index 08adc71..fdc9efa 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_internalServerMonitors.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_internalServerMonitors.html
@@ -47,9 +47,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_internalStartup.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_internalStartup.html
index a03fc91..ecdbe33 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_internalStartup.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_internalStartup.html
@@ -50,9 +50,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_launchableAdapters.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_launchableAdapters.html
index b319629..af84e04 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_launchableAdapters.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_launchableAdapters.html
@@ -51,9 +51,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleArtifactAdapters.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleArtifactAdapters.html
index e6341ec..32b0b69 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleArtifactAdapters.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleArtifactAdapters.html
@@ -237,9 +237,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2008 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleFactories.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleFactories.html
index 716e806..521b3e8 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleFactories.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleFactories.html
@@ -64,9 +64,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleTypes.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleTypes.html
index ff33f97..00ae7e8 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleTypes.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleTypes.html
@@ -49,9 +49,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_publishTasks.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_publishTasks.html
index 71f83d5..3f6daef 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_publishTasks.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_publishTasks.html
@@ -45,9 +45,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_publishers.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_publishers.html
index 3705480..da0cf65 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_publishers.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_publishers.html
@@ -51,9 +51,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2008 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeFacetComponentProviders.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeFacetComponentProviders.html
index 42c0a86..a5870b9 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeFacetComponentProviders.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeFacetComponentProviders.html
@@ -51,9 +51,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2007 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeLocators.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeLocators.html
index 064244f..527fdfa 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeLocators.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeLocators.html
@@ -52,9 +52,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeTargetHandlers.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeTargetHandlers.html
index c08e040..856af90 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeTargetHandlers.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeTargetHandlers.html
@@ -54,9 +54,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeTypes.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeTypes.html
index ad57210..1c81a16 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeTypes.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeTypes.html
@@ -72,9 +72,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_serverLocators.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_serverLocators.html
index bb63ee5..63f8a30 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_serverLocators.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_serverLocators.html
@@ -53,9 +53,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_serverTypes.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_serverTypes.html
index 3e2b699..785a262 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_serverTypes.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_serverTypes.html
@@ -72,9 +72,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_audio.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_audio.html
index 5b05283..1cb9434 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_audio.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_audio.html
@@ -57,9 +57,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorActions.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorActions.html
index be5eb39..ee86f8e 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorActions.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorActions.html
@@ -247,9 +247,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorPageSections.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorPageSections.html
index 808d90f..ed00652 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorPageSections.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorPageSections.html
@@ -247,9 +247,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorPages.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorPages.html
index f61b489..a5d9712 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorPages.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorPages.html
@@ -248,9 +248,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_initialSelectionProvider.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_initialSelectionProvider.html
index c905ee0..b7aa427 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_initialSelectionProvider.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_initialSelectionProvider.html
@@ -48,9 +48,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_serverImages.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_serverImages.html
index f3f857a..9250143 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_serverImages.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_serverImages.html
@@ -50,9 +50,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_serverToolTip.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_serverToolTip.html
index 850738d..f8614c7 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_serverToolTip.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_serverToolTip.html
@@ -53,9 +53,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2007 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_wizardFragments.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_wizardFragments.html
index 40eeb41..af24736 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_wizardFragments.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_wizardFragments.html
@@ -50,9 +50,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/javadoc.properties b/docs/org.eclipse.servertools.doc.isv/javadoc.properties
index 46cb22c..83c3269 100644
--- a/docs/org.eclipse.servertools.doc.isv/javadoc.properties
+++ b/docs/org.eclipse.servertools.doc.isv/javadoc.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2001, 2008 Oracle Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #     Oracle Corporation - initial API and implementation
diff --git a/docs/org.eclipse.servertools.doc.isv/javadoc.xml b/docs/org.eclipse.servertools.doc.isv/javadoc.xml
index 97af1e7..5ca5963 100644
--- a/docs/org.eclipse.servertools.doc.isv/javadoc.xml
+++ b/docs/org.eclipse.servertools.doc.isv/javadoc.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <!--overview="${basedir}/html/api_reference/erview/overview.html"-->
 <project default="main" basedir=".">
 
diff --git a/docs/org.eclipse.servertools.doc.isv/javadocBuild.xml b/docs/org.eclipse.servertools.doc.isv/javadocBuild.xml
index 5119a48..22330d9 100644
--- a/docs/org.eclipse.servertools.doc.isv/javadocBuild.xml
+++ b/docs/org.eclipse.servertools.doc.isv/javadocBuild.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <!--overview="${basedir}/html/api_reference/erview/overview.html"-->
 <project default="main" basedir=".">
 
diff --git a/docs/org.eclipse.servertools.doc.isv/javadoctoc.xml b/docs/org.eclipse.servertools.doc.isv/javadoctoc.xml
index 542a3b3..e3d3a86 100644
--- a/docs/org.eclipse.servertools.doc.isv/javadoctoc.xml
+++ b/docs/org.eclipse.servertools.doc.isv/javadoctoc.xml
@@ -1,6 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?NLS TYPE="org.eclipse.help.toc"?>
-	 <toc label="Javadoc Packages Reference">
+	
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+ <toc label="Javadoc Packages Reference">
 <topic label="org.eclipse.jst.server.core" href="html/api_reference/org/eclipse/jst/server/core/package-summary.html"/>
 <topic label="org.eclipse.wst.server.core" href="html/api_reference/org/eclipse/wst/server/core/package-summary.html"/>
 <topic label="org.eclipse.wst.server.core.model" href="html/api_reference/org/eclipse/wst/server/core/model/package-summary.html"/>
diff --git a/docs/org.eclipse.servertools.doc.isv/packages.xml b/docs/org.eclipse.servertools.doc.isv/packages.xml
index 089b76a..d0b114d 100644
--- a/docs/org.eclipse.servertools.doc.isv/packages.xml
+++ b/docs/org.eclipse.servertools.doc.isv/packages.xml
@@ -1 +1,13 @@
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
 <packages><package></package><package>org.eclipse.jst.server.core</package><package>org.eclipse.wst.server.core</package><package>org.eclipse.wst.server.core.model</package><package>org.eclipse.wst.server.core.util</package><package>org.eclipse.wst.server.ui</package><package>org.eclipse.wst.server.ui.actions</package><package>org.eclipse.wst.server.ui.editor</package><package>org.eclipse.wst.server.ui.wizard</package></packages>
\ No newline at end of file
diff --git a/docs/org.eclipse.servertools.doc.isv/plugin.properties b/docs/org.eclipse.servertools.doc.isv/plugin.properties
index 07eb3d5..7f3c06d 100644
--- a/docs/org.eclipse.servertools.doc.isv/plugin.properties
+++ b/docs/org.eclipse.servertools.doc.isv/plugin.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2008 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/docs/org.eclipse.servertools.doc.isv/plugins.xml b/docs/org.eclipse.servertools.doc.isv/plugins.xml
index 7bc30d4..590338e 100644
--- a/docs/org.eclipse.servertools.doc.isv/plugins.xml
+++ b/docs/org.eclipse.servertools.doc.isv/plugins.xml
@@ -1,3 +1,15 @@
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
 org.eclipse.wst.internet.monitor.core;
 org.eclipse.wst.server.core;
 org.eclipse.wst.server.http.core;
diff --git a/docs/org.eclipse.servertools.doc.isv/pom.xml b/docs/org.eclipse.servertools.doc.isv/pom.xml
index 4e5e026..8d25857 100644
--- a/docs/org.eclipse.servertools.doc.isv/pom.xml
+++ b/docs/org.eclipse.servertools.doc.isv/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

-  Copyright (c) 2012, 2013 Eclipse Foundation and others.

+  Copyright (c) 2012, 2018 Eclipse Foundation and others.

   All rights reserved. This program and the accompanying materials

   are made available under the terms of the Eclipse Distribution License v1.0

   which accompanies this distribution, and is available at

@@ -8,7 +8,7 @@
  

   Contributors:

     Thanh Ha (Eclipse Foundation) - initial implementation

--->

+-->
 

 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"

     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

diff --git a/docs/org.eclipse.servertools.doc.isv/servertoolsextdocs.xml b/docs/org.eclipse.servertools.doc.isv/servertoolsextdocs.xml
index c26677d..06945bd 100644
--- a/docs/org.eclipse.servertools.doc.isv/servertoolsextdocs.xml
+++ b/docs/org.eclipse.servertools.doc.isv/servertoolsextdocs.xml
@@ -1 +1,13 @@
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
 <files component="servertools"><file>org_eclipse_jst_server_core_internalRuntimeComponentProviders.html</file>/n/n<file>org_eclipse_jst_server_core_runtimeClasspathProviders.html</file>/n/n<file>org_eclipse_jst_server_core_runtimeFacetMappings.html</file>/n/n<file>org_eclipse_jst_server_core_serverProfilers.html</file>/n/n<file>org_eclipse_wst_server_core_clients.html</file>/n/n<file>org_eclipse_wst_server_core_installableRuntimes.html</file>/n/n<file>org_eclipse_wst_server_core_installableServers.html</file>/n/n<file>org_eclipse_wst_server_core_internalServerMonitors.html</file>/n/n<file>org_eclipse_wst_server_core_internalStartup.html</file>/n/n<file>org_eclipse_wst_server_core_launchableAdapters.html</file>/n/n<file>org_eclipse_wst_server_core_moduleArtifactAdapters.html</file>/n/n<file>org_eclipse_wst_server_core_moduleFactories.html</file>/n/n<file>org_eclipse_wst_server_core_moduleTypes.html</file>/n/n<file>org_eclipse_wst_server_core_publishTasks.html</file>/n/n<file>org_eclipse_wst_server_core_publishers.html</file>/n/n<file>org_eclipse_wst_server_core_runtimeFacetComponentProviders.html</file>/n/n<file>org_eclipse_wst_server_core_runtimeLocators.html</file>/n/n<file>org_eclipse_wst_server_core_runtimeTargetHandlers.html</file>/n/n<file>org_eclipse_wst_server_core_runtimeTypes.html</file>/n/n<file>org_eclipse_wst_server_core_serverLocators.html</file>/n/n<file>org_eclipse_wst_server_core_serverTypes.html</file>/n/n<file>org_eclipse_wst_server_ui_audio.html</file>/n/n<file>org_eclipse_wst_server_ui_editorActions.html</file>/n/n<file>org_eclipse_wst_server_ui_editorPageSections.html</file>/n/n<file>org_eclipse_wst_server_ui_editorPages.html</file>/n/n<file>org_eclipse_wst_server_ui_initialSelectionProvider.html</file>/n/n<file>org_eclipse_wst_server_ui_serverImages.html</file>/n/n<file>org_eclipse_wst_server_ui_serverToolTip.html</file>/n/n<file>org_eclipse_wst_server_ui_wizardFragments.html</file></files>
\ No newline at end of file
diff --git a/docs/org.eclipse.servertools.doc.isv/tocreference.xml b/docs/org.eclipse.servertools.doc.isv/tocreference.xml
index d52b879..fb524d6 100644
--- a/docs/org.eclipse.servertools.doc.isv/tocreference.xml
+++ b/docs/org.eclipse.servertools.doc.isv/tocreference.xml
@@ -1,6 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?NLS TYPE="org.eclipse.help.toc"?>
 
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <toc label="Server Tools Reference" link_to="../org.eclipse.wst.doc.user/reference_toc.xml#javadoc_servertools"> 
 	<topic label="Server Tools API Reference" href="html/api_reference/overview-summary.html">
     <link toc="javadoctoc.xml"/>
diff --git a/docs/org.eclipse.servertools.doc.isv/topics_ExtPoint_Reference.xml b/docs/org.eclipse.servertools.doc.isv/topics_ExtPoint_Reference.xml
index 5228142..52a5d7f 100644
--- a/docs/org.eclipse.servertools.doc.isv/topics_ExtPoint_Reference.xml
+++ b/docs/org.eclipse.servertools.doc.isv/topics_ExtPoint_Reference.xml
@@ -1,6 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?NLS TYPE="org.eclipse.help.toc"?>
-	 	<toc label="Extension Points Reference">
+	 
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+	<toc label="Extension Points Reference">
 <topic label="org.eclipse.jst.server.core.internalRuntimeComponentProviders" href="html/extpts_reference/servertools/org_eclipse_jst_server_core_internalRuntimeComponentProviders.html"/>
 <topic label="org.eclipse.jst.server.core.runtimeClasspathProviders" href="html/extpts_reference/servertools/org_eclipse_jst_server_core_runtimeClasspathProviders.html"/>
 <topic label="org.eclipse.jst.server.core.runtimeFacetMappings" href="html/extpts_reference/servertools/org_eclipse_jst_server_core_runtimeFacetMappings.html"/>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/DocBuild.xml b/docs/org.eclipse.wst.server.ui.doc.user/DocBuild.xml
index ee647cd..b872889 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/DocBuild.xml
+++ b/docs/org.eclipse.wst.server.ui.doc.user/DocBuild.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!--
+    Copyright (c) 2007, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <!-- 
 
 	This script build the Help plug-in by transforming the DITA source files into HTML.
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/about.html b/docs/org.eclipse.wst.server.ui.doc.user/about.html
index f3924bb..aa05246 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/about.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/about.html
@@ -18,8 +18,8 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">
-http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/">
+https://www.eclipse.org/legal/epl-2.0/</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/build.properties b/docs/org.eclipse.wst.server.ui.doc.user/build.properties
index 33819b8..c762fdd 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/build.properties
+++ b/docs/org.eclipse.wst.server.ui.doc.user/build.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 2019 IBM Corporation and others.
+# 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
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 bin.includes = *.xml,\
                plugin.properties,\
                plugin.xml,\
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/myplugin.xml b/docs/org.eclipse.wst.server.ui.doc.user/myplugin.xml
index 3d30b56..d82df14 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/myplugin.xml
+++ b/docs/org.eclipse.wst.server.ui.doc.user/myplugin.xml
@@ -4,9 +4,11 @@
 <!-- /*******************************************************************************
  * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/org.eclipse.wst.server.ui.doc.userindex.xml b/docs/org.eclipse.wst.server.ui.doc.user/org.eclipse.wst.server.ui.doc.userindex.xml
index 00a8bc4..cf6db05 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/org.eclipse.wst.server.ui.doc.userindex.xml
+++ b/docs/org.eclipse.wst.server.ui.doc.user/org.eclipse.wst.server.ui.doc.userindex.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2006, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <index>
   <entry keyword="servers">
     <entry keyword="starting">
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/plugin.properties b/docs/org.eclipse.wst.server.ui.doc.user/plugin.properties
index cc08e51..2a7bcc5 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/plugin.properties
+++ b/docs/org.eclipse.wst.server.ui.doc.user/plugin.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2001, 2008 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/plugin.xml b/docs/org.eclipse.wst.server.ui.doc.user/plugin.xml
index 3d30b56..2a27f2e 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/plugin.xml
+++ b/docs/org.eclipse.wst.server.ui.doc.user/plugin.xml
@@ -4,9 +4,9 @@
 <!-- /*******************************************************************************
  * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/pom.xml b/docs/org.eclipse.wst.server.ui.doc.user/pom.xml
index 42ecc37..ed6ab29 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/pom.xml
+++ b/docs/org.eclipse.wst.server.ui.doc.user/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

-  Copyright (c) 2012, 2013 Eclipse Foundation and others.

+  Copyright (c) 2012, 2017 Eclipse Foundation and others.

   All rights reserved. This program and the accompanying materials

   are made available under the terms of the Eclipse Distribution License v1.0

   which accompanies this distribution, and is available at

@@ -8,7 +8,7 @@
  

   Contributors:

     Thanh Ha (Eclipse Foundation) - initial implementation

--->

+-->
 

 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"

     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/cwflow.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/cwflow.html
index dfc7b63..dadcd60 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/cwflow.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/cwflow.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. 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/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/cwover.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/cwover.html
index 63bbb30..57b2be8 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/cwover.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/cwover.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. 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/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/cwres.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/cwres.html
index c8d8324..a0b11c1 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/cwres.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/cwres.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. 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/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/raccessserver.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/raccessserver.html
index f71e7e6..10d6cc0 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/raccessserver.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/raccessserver.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. 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/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/rwrcview.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/rwrcview.html
index dda84a4..c9f2a6c 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/rwrcview.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/rwrcview.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. 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/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/rwtcpvw.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/rwtcpvw.html
index 5cc0bbf..69675e3 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/rwtcpvw.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/rwtcpvw.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. 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/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tclean.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tclean.html
index 96b248d..ffd6ce1 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tclean.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tclean.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. 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/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tcreate.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tcreate.html
index cf4a470..fc1be81 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tcreate.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tcreate.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. 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/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tdbgjsp.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tdbgjsp.html
index d2cec0b..c93fe85 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tdbgjsp.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tdbgjsp.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. 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/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tdebug.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tdebug.html
index bbe611d..a4f7ebc 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tdebug.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tdebug.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. 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/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tdecor.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tdecor.html
index 6d6c229..1f9ff16 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tdecor.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tdecor.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. 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/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/testing.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/testing.html
index 230243a..4f1c562 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/testing.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/testing.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. 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/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/thttppreview.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/thttppreview.html
index 258ef71..f9fd87c 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/thttppreview.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/thttppreview.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. 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/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tj2ee.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tj2ee.html
index b7ceba9..33fc6b4 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tj2ee.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tj2ee.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. 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/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tj2eepreview.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tj2eepreview.html
index 91cd9f8..35e8640 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tj2eepreview.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tj2eepreview.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. 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/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tmetasrv.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tmetasrv.html
index c6e8a2c..eee6d8f 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tmetasrv.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tmetasrv.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. 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/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tmonitorport.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tmonitorport.html
index 2a7e6bc..c2f1f1f 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tmonitorport.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tmonitorport.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. 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/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tpref.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tpref.html
index 9f19cd6..42acb9c 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tpref.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tpref.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. 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/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tprefaud.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tprefaud.html
index 71690e4..00af50d 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tprefaud.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tprefaud.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. 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/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tpublish.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tpublish.html
index 0883d2a..1ed7773 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tpublish.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tpublish.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. 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/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tservlet.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tservlet.html
index c1b15b5..3027f8e 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tservlet.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tservlet.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. 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/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/ttimeout.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/ttimeout.html
index e6e6d41..6da19d9 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/ttimeout.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/ttimeout.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. 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/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twaddprj.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twaddprj.html
index 8631688..2b2cb48 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twaddprj.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twaddprj.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. 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/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twcrtins.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twcrtins.html
index d2a61f4..6dd8730 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twcrtins.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twcrtins.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. 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/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twdelins.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twdelins.html
index e933fdf..4a6e189 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twdelins.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twdelins.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. 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/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twedtins.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twedtins.html
index fe6579f..76f3257 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twedtins.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twedtins.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. 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/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twinstprf.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twinstprf.html
index 319ce12..97bf4fb 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twinstprf.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twinstprf.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. 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/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twlaunchpref.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twlaunchpref.html
index 37ee2c6..13e7e32 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twlaunchpref.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twlaunchpref.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. 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/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twmanage.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twmanage.html
index e109670..2f2bab4 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twmanage.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twmanage.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. 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/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twprefin.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twprefin.html
index d646b92..6b68744 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twprefin.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twprefin.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. 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/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twpub.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twpub.html
index 64489a2..c8ddd9c 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twpub.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twpub.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. 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/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twremprj.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twremprj.html
index 7945c85..ff8d72c 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twremprj.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twremprj.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. 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/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrtdbg.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrtdbg.html
index 7faa352..8026036 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrtdbg.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrtdbg.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. 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/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrtins.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrtins.html
index 026dcbd..28661e5 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrtins.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrtins.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. 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/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrvprf.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrvprf.html
index 154b23f..c153f58 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrvprf.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrvprf.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. 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/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twstpins.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twstpins.html
index 80cc538..9e210d2 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twstpins.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twstpins.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. 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/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twtcpprf.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twtcpprf.html
index 79aaa84..b2e002e 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twtcpprf.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twtcpprf.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. 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/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/wtp_main_toc.xml b/docs/org.eclipse.wst.server.ui.doc.user/wtp_main_toc.xml
index 571af2a..f4e6462 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/wtp_main_toc.xml
+++ b/docs/org.eclipse.wst.server.ui.doc.user/wtp_main_toc.xml
@@ -2,6 +2,19 @@
 
 <?NLS TYPE="org.eclipse.help.toc"?>
 
+<!--
+    Copyright (c) 2006, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <toc label="Testing and publishing applications" topic="topics/cwover.html">
 <topic label="Testing and publishing on your server" href="topics/cwover.html">
 <topic label="Servers view" href="topics/rwrcview.html">
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/wtp_reltable.xml b/docs/org.eclipse.wst.server.ui.doc.user/wtp_reltable.xml
index 0f46c75..1d189ce 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/wtp_reltable.xml
+++ b/docs/org.eclipse.wst.server.ui.doc.user/wtp_reltable.xml
@@ -2,4 +2,17 @@
 
 <?NLS TYPE="org.eclipse.help.toc"?>
 
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <toc/>
diff --git a/docs/org.eclipse.wst.server.ui.infopop/STtcpipContexts.xml b/docs/org.eclipse.wst.server.ui.infopop/STtcpipContexts.xml
index 91b275c..bd682ef 100644
--- a/docs/org.eclipse.wst.server.ui.infopop/STtcpipContexts.xml
+++ b/docs/org.eclipse.wst.server.ui.infopop/STtcpipContexts.xml
@@ -3,9 +3,11 @@
 <!-- /*******************************************************************************
  * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/docs/org.eclipse.wst.server.ui.infopop/STuiContexts.xml b/docs/org.eclipse.wst.server.ui.infopop/STuiContexts.xml
index b7837f0..78e6e01 100644
--- a/docs/org.eclipse.wst.server.ui.infopop/STuiContexts.xml
+++ b/docs/org.eclipse.wst.server.ui.infopop/STuiContexts.xml
@@ -3,9 +3,11 @@
 <!-- /*******************************************************************************
  * Copyright (c) 2000, 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/docs/org.eclipse.wst.server.ui.infopop/STutilitiesContexts.xml b/docs/org.eclipse.wst.server.ui.infopop/STutilitiesContexts.xml
index 206488b..67935b2 100644
--- a/docs/org.eclipse.wst.server.ui.infopop/STutilitiesContexts.xml
+++ b/docs/org.eclipse.wst.server.ui.infopop/STutilitiesContexts.xml
@@ -3,9 +3,11 @@
 <!-- /*******************************************************************************
  * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/docs/org.eclipse.wst.server.ui.infopop/about.html b/docs/org.eclipse.wst.server.ui.infopop/about.html
index 2199df3..454947c 100644
--- a/docs/org.eclipse.wst.server.ui.infopop/about.html
+++ b/docs/org.eclipse.wst.server.ui.infopop/about.html
@@ -18,7 +18,7 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/docs/org.eclipse.wst.server.ui.infopop/build.properties b/docs/org.eclipse.wst.server.ui.infopop/build.properties
index d0e0f7b..03757e6 100644
--- a/docs/org.eclipse.wst.server.ui.infopop/build.properties
+++ b/docs/org.eclipse.wst.server.ui.infopop/build.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 2019 IBM Corporation and others.
+# 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
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 bin.includes = STtcpipContexts.xml,\
                STuiContexts.xml,\
                STutilitiesContexts.xml,\
diff --git a/docs/org.eclipse.wst.server.ui.infopop/plugin.properties b/docs/org.eclipse.wst.server.ui.infopop/plugin.properties
index 4dfddec..0f743e1 100644
--- a/docs/org.eclipse.wst.server.ui.infopop/plugin.properties
+++ b/docs/org.eclipse.wst.server.ui.infopop/plugin.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 2019 IBM Corporation and others.
+# 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
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 # NLS_MESSAGEFORMAT_VAR
 
 pluginName   = Server Tools infopops for Web Standard Tools
diff --git a/docs/org.eclipse.wst.server.ui.infopop/plugin.xml b/docs/org.eclipse.wst.server.ui.infopop/plugin.xml
index 923bc30..14cfd97 100644
--- a/docs/org.eclipse.wst.server.ui.infopop/plugin.xml
+++ b/docs/org.eclipse.wst.server.ui.infopop/plugin.xml
@@ -5,9 +5,9 @@
 <!-- /*******************************************************************************
  * Copyright (c) 2000, 20010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/docs/org.eclipse.wst.server.ui.infopop/pom.xml b/docs/org.eclipse.wst.server.ui.infopop/pom.xml
index 835009f..38720ba 100644
--- a/docs/org.eclipse.wst.server.ui.infopop/pom.xml
+++ b/docs/org.eclipse.wst.server.ui.infopop/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

-  Copyright (c) 2012, 2013 Eclipse Foundation and others.

+  Copyright (c) 2012, 2017 Eclipse Foundation and others.

   All rights reserved. This program and the accompanying materials

   are made available under the terms of the Eclipse Distribution License v1.0

   which accompanies this distribution, and is available at

@@ -8,7 +8,7 @@
  

   Contributors:

     Thanh Ha (Eclipse Foundation) - initial implementation

--->

+-->
 

 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"

     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

diff --git a/features/org.eclipse.jst.server_adapters.ext.feature/build.properties b/features/org.eclipse.jst.server_adapters.ext.feature/build.properties
index fe0cb5c..bac1a80 100644
--- a/features/org.eclipse.jst.server_adapters.ext.feature/build.properties
+++ b/features/org.eclipse.jst.server_adapters.ext.feature/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
+# Copyright (c) 2005, 2009 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/features/org.eclipse.jst.server_adapters.ext.feature/feature.properties b/features/org.eclipse.jst.server_adapters.ext.feature/feature.properties
index 654ca64..71986f6 100644
--- a/features/org.eclipse.jst.server_adapters.ext.feature/feature.properties
+++ b/features/org.eclipse.jst.server_adapters.ext.feature/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2006, 2019 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
@@ -28,9 +30,11 @@
 copyright=\
 Copyright (c) 2006, 2007 IBM Corporation 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\
     IBM Corporation - initial API and implementation\n
diff --git a/features/org.eclipse.jst.server_adapters.ext.feature/feature.xml b/features/org.eclipse.jst.server_adapters.ext.feature/feature.xml
index d5d004f..3bc3061 100644
--- a/features/org.eclipse.jst.server_adapters.ext.feature/feature.xml
+++ b/features/org.eclipse.jst.server_adapters.ext.feature/feature.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>

+<!--

+    Copyright (c) 2009, 2019 IBM Corporation and others.

+    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

+

+    Contributors:

+        IBM Corporation - initial API and implementation

+ -->
+
 <feature

       id="org.eclipse.jst.server_adapters.ext.feature"

       label="%featureName"

diff --git a/features/org.eclipse.jst.server_adapters.ext.feature/pom.xml b/features/org.eclipse.jst.server_adapters.ext.feature/pom.xml
index 4e96b18..54553d8 100644
--- a/features/org.eclipse.jst.server_adapters.ext.feature/pom.xml
+++ b/features/org.eclipse.jst.server_adapters.ext.feature/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

-  Copyright (c) 2012, 2017 Eclipse Foundation and others.

+  Copyright (c) 2012, 2018 Eclipse Foundation and others.

   All rights reserved. This program and the accompanying materials

   are made available under the terms of the Eclipse Distribution License v1.0

   which accompanies this distribution, and is available at

@@ -8,7 +8,7 @@
  

   Contributors:

     Thanh Ha (Eclipse Foundation) - initial implementation

--->

+-->
 

 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"

     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

diff --git a/features/org.eclipse.jst.server_adapters.ext.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.jst.server_adapters.ext.feature/sourceTemplateFeature/build.properties
index be19849..9e5d9ed 100644
--- a/features/org.eclipse.jst.server_adapters.ext.feature/sourceTemplateFeature/build.properties
+++ b/features/org.eclipse.jst.server_adapters.ext.feature/sourceTemplateFeature/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2000, 2006 IBM Corporation and others.
+# Copyright (c) 2000, 2009 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/features/org.eclipse.jst.server_adapters.ext.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.jst.server_adapters.ext.feature/sourceTemplateFeature/feature.properties
index 855b8fb..4ae755a 100644
--- a/features/org.eclipse.jst.server_adapters.ext.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.jst.server_adapters.ext.feature/sourceTemplateFeature/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2000, 2006 IBM Corporation and others.
+# Copyright (c) 2000, 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
@@ -28,9 +30,11 @@
 copyright=\
 Copyright (c) 2006 IBM Corporation 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\
     IBM Corporation - initial API and implementation\n
diff --git a/features/org.eclipse.jst.server_adapters.ext.sdk.feature/build.properties b/features/org.eclipse.jst.server_adapters.ext.sdk.feature/build.properties
index 3e69ba2..9f19256 100644
--- a/features/org.eclipse.jst.server_adapters.ext.sdk.feature/build.properties
+++ b/features/org.eclipse.jst.server_adapters.ext.sdk.feature/build.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2009, 2019 IBM Corporation and others.
+# 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
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 bin.includes = feature.xml,\
                eclipse_update_120.jpg,\
                feature.properties
diff --git a/features/org.eclipse.jst.server_adapters.ext.sdk.feature/feature.properties b/features/org.eclipse.jst.server_adapters.ext.sdk.feature/feature.properties
index f82868d..8413522 100644
--- a/features/org.eclipse.jst.server_adapters.ext.sdk.feature/feature.properties
+++ b/features/org.eclipse.jst.server_adapters.ext.sdk.feature/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
+# 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
@@ -28,9 +30,11 @@
 copyright=\
 Copyright (c) 2006 IBM Corporation 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\
     IBM Corporation - initial API and implementation\n
diff --git a/features/org.eclipse.jst.server_adapters.ext.sdk.feature/feature.xml b/features/org.eclipse.jst.server_adapters.ext.sdk.feature/feature.xml
index 6228daa..58b8024 100644
--- a/features/org.eclipse.jst.server_adapters.ext.sdk.feature/feature.xml
+++ b/features/org.eclipse.jst.server_adapters.ext.sdk.feature/feature.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>

+<!--

+    Copyright (c) 2009, 2019 IBM Corporation and others.

+    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

+

+    Contributors:

+        IBM Corporation - initial API and implementation

+ -->
+
 <feature

       id="org.eclipse.jst.server_adapters.ext.sdk.feature"

       label="%featureName"

diff --git a/features/org.eclipse.jst.server_adapters.ext.sdk.feature/pom.xml b/features/org.eclipse.jst.server_adapters.ext.sdk.feature/pom.xml
index eaa4a0c..cc0333d 100644
--- a/features/org.eclipse.jst.server_adapters.ext.sdk.feature/pom.xml
+++ b/features/org.eclipse.jst.server_adapters.ext.sdk.feature/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

-  Copyright (c) 2012, 2013 Eclipse Foundation and others.

+  Copyright (c) 2012, 2018 Eclipse Foundation and others.

   All rights reserved. This program and the accompanying materials

   are made available under the terms of the Eclipse Distribution License v1.0

   which accompanies this distribution, and is available at

@@ -8,7 +8,7 @@
  

   Contributors:

     Thanh Ha (Eclipse Foundation) - initial implementation

--->

+-->
 

 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"

     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

diff --git a/features/org.eclipse.jst.server_adapters.ext_tests.feature/build.properties b/features/org.eclipse.jst.server_adapters.ext_tests.feature/build.properties
index fe0cb5c..bac1a80 100644
--- a/features/org.eclipse.jst.server_adapters.ext_tests.feature/build.properties
+++ b/features/org.eclipse.jst.server_adapters.ext_tests.feature/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
+# Copyright (c) 2005, 2009 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/features/org.eclipse.jst.server_adapters.ext_tests.feature/feature.properties b/features/org.eclipse.jst.server_adapters.ext_tests.feature/feature.properties
index 2db5f9c..60d92e8 100644
--- a/features/org.eclipse.jst.server_adapters.ext_tests.feature/feature.properties
+++ b/features/org.eclipse.jst.server_adapters.ext_tests.feature/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
+# 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
@@ -28,9 +30,11 @@
 copyright=\
 Copyright (c) 2006 IBM Corporation 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\
     IBM Corporation - initial API and implementation\n
diff --git a/features/org.eclipse.jst.server_adapters.ext_tests.feature/feature.xml b/features/org.eclipse.jst.server_adapters.ext_tests.feature/feature.xml
index 2d1e601..ed32542 100644
--- a/features/org.eclipse.jst.server_adapters.ext_tests.feature/feature.xml
+++ b/features/org.eclipse.jst.server_adapters.ext_tests.feature/feature.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2009, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <feature
       id="org.eclipse.jst.server_adapters.ext_tests.feature"
       label="%featureName"
diff --git a/features/org.eclipse.jst.server_adapters.ext_tests.feature/pom.xml b/features/org.eclipse.jst.server_adapters.ext_tests.feature/pom.xml
index 14184ec..447a7b9 100644
--- a/features/org.eclipse.jst.server_adapters.ext_tests.feature/pom.xml
+++ b/features/org.eclipse.jst.server_adapters.ext_tests.feature/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

-  Copyright (c) 2012, 2013 Eclipse Foundation and others.

+  Copyright (c) 2012, 2015 Eclipse Foundation and others.

   All rights reserved. This program and the accompanying materials

   are made available under the terms of the Eclipse Distribution License v1.0

   which accompanies this distribution, and is available at

@@ -8,7 +8,7 @@
  

   Contributors:

     Thanh Ha (Eclipse Foundation) - initial implementation

--->

+-->
 

 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"

     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

diff --git a/features/org.eclipse.jst.server_adapters.feature/build.properties b/features/org.eclipse.jst.server_adapters.feature/build.properties
index fe0cb5c..150d89e 100644
--- a/features/org.eclipse.jst.server_adapters.feature/build.properties
+++ b/features/org.eclipse.jst.server_adapters.feature/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
+# Copyright (c) 2005, 2007 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/features/org.eclipse.jst.server_adapters.feature/feature.properties b/features/org.eclipse.jst.server_adapters.feature/feature.properties
index 53cac38..6a62d18 100644
--- a/features/org.eclipse.jst.server_adapters.feature/feature.properties
+++ b/features/org.eclipse.jst.server_adapters.feature/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2006, 2019 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
@@ -28,9 +30,11 @@
 copyright=\
 Copyright (c) 2006, 2007 IBM Corporation 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\
     IBM Corporation - initial API and implementation\n
diff --git a/features/org.eclipse.jst.server_adapters.feature/feature.xml b/features/org.eclipse.jst.server_adapters.feature/feature.xml
index bd4b4ca..7b387f6 100644
--- a/features/org.eclipse.jst.server_adapters.feature/feature.xml
+++ b/features/org.eclipse.jst.server_adapters.feature/feature.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>

+<!--

+    Copyright (c) 2005, 2019 IBM Corporation and others.

+    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

+

+    Contributors:

+        IBM Corporation - initial API and implementation

+ -->
+
 <feature

       id="org.eclipse.jst.server_adapters.feature"

       label="%featureName"

diff --git a/features/org.eclipse.jst.server_adapters.feature/pom.xml b/features/org.eclipse.jst.server_adapters.feature/pom.xml
index 98d5e42..b3e736c 100644
--- a/features/org.eclipse.jst.server_adapters.feature/pom.xml
+++ b/features/org.eclipse.jst.server_adapters.feature/pom.xml
@@ -8,7 +8,7 @@
  

   Contributors:

     Thanh Ha (Eclipse Foundation) - initial implementation

--->

+-->
 

 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"

     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

diff --git a/features/org.eclipse.jst.server_adapters.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.jst.server_adapters.feature/sourceTemplateFeature/build.properties
index be19849..6eaa6b6 100644
--- a/features/org.eclipse.jst.server_adapters.feature/sourceTemplateFeature/build.properties
+++ b/features/org.eclipse.jst.server_adapters.feature/sourceTemplateFeature/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2000, 2006 IBM Corporation and others.
+# Copyright (c) 2000, 2007 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/features/org.eclipse.jst.server_adapters.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.jst.server_adapters.feature/sourceTemplateFeature/feature.properties
index 855b8fb..4ae755a 100644
--- a/features/org.eclipse.jst.server_adapters.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.jst.server_adapters.feature/sourceTemplateFeature/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2000, 2006 IBM Corporation and others.
+# Copyright (c) 2000, 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
@@ -28,9 +30,11 @@
 copyright=\
 Copyright (c) 2006 IBM Corporation 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\
     IBM Corporation - initial API and implementation\n
diff --git a/features/org.eclipse.jst.server_adapters.sdk.feature/build.properties b/features/org.eclipse.jst.server_adapters.sdk.feature/build.properties
index 3e69ba2..714bc7a 100644
--- a/features/org.eclipse.jst.server_adapters.sdk.feature/build.properties
+++ b/features/org.eclipse.jst.server_adapters.sdk.feature/build.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2006, 2019 IBM Corporation and others.
+# 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
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 bin.includes = feature.xml,\
                eclipse_update_120.jpg,\
                feature.properties
diff --git a/features/org.eclipse.jst.server_adapters.sdk.feature/feature.properties b/features/org.eclipse.jst.server_adapters.sdk.feature/feature.properties
index f82868d..8413522 100644
--- a/features/org.eclipse.jst.server_adapters.sdk.feature/feature.properties
+++ b/features/org.eclipse.jst.server_adapters.sdk.feature/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
+# 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
@@ -28,9 +30,11 @@
 copyright=\
 Copyright (c) 2006 IBM Corporation 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\
     IBM Corporation - initial API and implementation\n
diff --git a/features/org.eclipse.jst.server_adapters.sdk.feature/feature.xml b/features/org.eclipse.jst.server_adapters.sdk.feature/feature.xml
index 4390e47..5a5a01f 100644
--- a/features/org.eclipse.jst.server_adapters.sdk.feature/feature.xml
+++ b/features/org.eclipse.jst.server_adapters.sdk.feature/feature.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2006, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <feature
       id="org.eclipse.jst.server_adapters.sdk.feature"
       label="%featureName"
diff --git a/features/org.eclipse.jst.server_adapters.sdk.feature/pom.xml b/features/org.eclipse.jst.server_adapters.sdk.feature/pom.xml
index 5eb4b1d..8c25c76 100644
--- a/features/org.eclipse.jst.server_adapters.sdk.feature/pom.xml
+++ b/features/org.eclipse.jst.server_adapters.sdk.feature/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

-  Copyright (c) 2012, 2013 Eclipse Foundation and others.

+  Copyright (c) 2012, 2018 Eclipse Foundation and others.

   All rights reserved. This program and the accompanying materials

   are made available under the terms of the Eclipse Distribution License v1.0

   which accompanies this distribution, and is available at

@@ -8,7 +8,7 @@
  

   Contributors:

     Thanh Ha (Eclipse Foundation) - initial implementation

--->

+-->
 

 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"

     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

diff --git a/features/org.eclipse.jst.server_core.feature.patch/build.properties b/features/org.eclipse.jst.server_core.feature.patch/build.properties
index cd1f9c4..45b278d 100644
--- a/features/org.eclipse.jst.server_core.feature.patch/build.properties
+++ b/features/org.eclipse.jst.server_core.feature.patch/build.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2009, 2019 IBM Corporation and others.
+# 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
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 bin.includes = feature.xml,\
                license.html,\
                feature.properties,\
diff --git a/features/org.eclipse.jst.server_core.feature.patch/feature.properties b/features/org.eclipse.jst.server_core.feature.patch/feature.properties
index d7f7e4e..739e930 100644
--- a/features/org.eclipse.jst.server_core.feature.patch/feature.properties
+++ b/features/org.eclipse.jst.server_core.feature.patch/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2007 IBM Corporation and others.
+# Copyright (c) 2007, 2009 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
@@ -36,9 +38,11 @@
 copyright=\
 Copyright (c) 2007 IBM Corporation 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\
     IBM Corporation - initial API and implementation\n
@@ -73,7 +77,7 @@
 Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
 is provided to you under the terms and conditions of the Eclipse Public\n\
 License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+Content and is also available at https://www.eclipse.org/legal/epl-2.0/.\n\
 For purposes of the EPL, "Program" will mean the Content.\n\
 \n\
 Content includes, but is not limited to, source code, object code,\n\
diff --git a/features/org.eclipse.jst.server_core.feature.patch/feature.xml b/features/org.eclipse.jst.server_core.feature.patch/feature.xml
index f390dc2..add4ee0 100644
--- a/features/org.eclipse.jst.server_core.feature.patch/feature.xml
+++ b/features/org.eclipse.jst.server_core.feature.patch/feature.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>

+<!--

+    Copyright (c) 2009, 2019 IBM Corporation and others.

+    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

+

+    Contributors:

+        IBM Corporation - initial API and implementation

+ -->
+
 <feature

       id="org.eclipse.jst.server_core.feature.patch"

       label="%featureName"

diff --git a/features/org.eclipse.jst.server_core.feature.patch/license.html b/features/org.eclipse.jst.server_core.feature.patch/license.html
index 2347060..c8f01bb 100644
--- a/features/org.eclipse.jst.server_core.feature.patch/license.html
+++ b/features/org.eclipse.jst.server_core.feature.patch/license.html
@@ -22,7 +22,7 @@
 Foundation is provided to you under the terms and conditions of the Eclipse 
 Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
 Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
+href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 <P>Content includes, but is not limited to, source code, object code, 
 documentation and other files maintained in the Eclipse.org CVS repository 
diff --git a/features/org.eclipse.jst.server_core.feature.patch/pom.xml b/features/org.eclipse.jst.server_core.feature.patch/pom.xml
index ed032b3..775870d 100644
--- a/features/org.eclipse.jst.server_core.feature.patch/pom.xml
+++ b/features/org.eclipse.jst.server_core.feature.patch/pom.xml
@@ -8,7 +8,7 @@
  

   Contributors:

     Thanh Ha (Eclipse Foundation) - initial implementation

--->

+-->
 

 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"

     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

diff --git a/features/org.eclipse.jst.server_core.feature/build.properties b/features/org.eclipse.jst.server_core.feature/build.properties
index fe0cb5c..150d89e 100644
--- a/features/org.eclipse.jst.server_core.feature/build.properties
+++ b/features/org.eclipse.jst.server_core.feature/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
+# Copyright (c) 2005, 2007 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/features/org.eclipse.jst.server_core.feature/feature.properties b/features/org.eclipse.jst.server_core.feature/feature.properties
index 6212934..4769acd 100644
--- a/features/org.eclipse.jst.server_core.feature/feature.properties
+++ b/features/org.eclipse.jst.server_core.feature/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
+# 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
@@ -28,9 +30,11 @@
 copyright=\
 Copyright (c) 2006 IBM Corporation 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\
     IBM Corporation - initial API and implementation\n
diff --git a/features/org.eclipse.jst.server_core.feature/feature.xml b/features/org.eclipse.jst.server_core.feature/feature.xml
index 17afa15..5a5d5e9 100644
--- a/features/org.eclipse.jst.server_core.feature/feature.xml
+++ b/features/org.eclipse.jst.server_core.feature/feature.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>

+<!--

+    Copyright (c) 2005, 2019 IBM Corporation and others.

+    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

+

+    Contributors:

+        IBM Corporation - initial API and implementation

+ -->
+
 <feature

       id="org.eclipse.jst.server_core.feature"

       label="%featureName"

diff --git a/features/org.eclipse.jst.server_core.feature/pom.xml b/features/org.eclipse.jst.server_core.feature/pom.xml
index 8c47b66..ecd4248 100644
--- a/features/org.eclipse.jst.server_core.feature/pom.xml
+++ b/features/org.eclipse.jst.server_core.feature/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

-  Copyright (c) 2012, 2013 Eclipse Foundation and others.

+  Copyright (c) 2012, 2016 Eclipse Foundation and others.

   All rights reserved. This program and the accompanying materials

   are made available under the terms of the Eclipse Distribution License v1.0

   which accompanies this distribution, and is available at

@@ -8,7 +8,7 @@
  

   Contributors:

     Thanh Ha (Eclipse Foundation) - initial implementation

--->

+-->
 

 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"

     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

diff --git a/features/org.eclipse.jst.server_core.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.jst.server_core.feature/sourceTemplateFeature/build.properties
index be839a7..70786c5 100644
--- a/features/org.eclipse.jst.server_core.feature/sourceTemplateFeature/build.properties
+++ b/features/org.eclipse.jst.server_core.feature/sourceTemplateFeature/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2000, 2005 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/features/org.eclipse.jst.server_core.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.jst.server_core.feature/sourceTemplateFeature/feature.properties
index 90e48c5..db21e3f 100644
--- a/features/org.eclipse.jst.server_core.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.jst.server_core.feature/sourceTemplateFeature/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
+# 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
@@ -28,9 +30,11 @@
 copyright=\
 Copyright (c) 2006 IBM Corporation 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\
     IBM Corporation - initial API and implementation\n
diff --git a/features/org.eclipse.jst.server_sdk.feature/build.properties b/features/org.eclipse.jst.server_sdk.feature/build.properties
index 8b01ac5..ce30ae7 100644
--- a/features/org.eclipse.jst.server_sdk.feature/build.properties
+++ b/features/org.eclipse.jst.server_sdk.feature/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
+# Copyright (c) 2005, 2018 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/features/org.eclipse.jst.server_sdk.feature/feature.properties b/features/org.eclipse.jst.server_sdk.feature/feature.properties
index 4a3d872..cd94a8f 100644
--- a/features/org.eclipse.jst.server_sdk.feature/feature.properties
+++ b/features/org.eclipse.jst.server_sdk.feature/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
+# 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
@@ -28,9 +30,11 @@
 copyright=\
 Copyright (c) 2006 IBM Corporation 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\
     IBM Corporation - initial API and implementation\n
diff --git a/features/org.eclipse.jst.server_sdk.feature/feature.xml b/features/org.eclipse.jst.server_sdk.feature/feature.xml
index 53e6f40..acf5f31 100644
--- a/features/org.eclipse.jst.server_sdk.feature/feature.xml
+++ b/features/org.eclipse.jst.server_sdk.feature/feature.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2005, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <feature
       id="org.eclipse.jst.server_sdk.feature"
       label="%featureName"
diff --git a/features/org.eclipse.jst.server_sdk.feature/pom.xml b/features/org.eclipse.jst.server_sdk.feature/pom.xml
index 20b512a..aec91f1 100644
--- a/features/org.eclipse.jst.server_sdk.feature/pom.xml
+++ b/features/org.eclipse.jst.server_sdk.feature/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

-  Copyright (c) 2012, 2013 Eclipse Foundation and others.

+  Copyright (c) 2012, 2018 Eclipse Foundation and others.

   All rights reserved. This program and the accompanying materials

   are made available under the terms of the Eclipse Distribution License v1.0

   which accompanies this distribution, and is available at

@@ -8,7 +8,7 @@
  

   Contributors:

     Thanh Ha (Eclipse Foundation) - initial implementation

--->

+-->
 

 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"

     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

diff --git a/features/org.eclipse.jst.server_tests.feature/build.properties b/features/org.eclipse.jst.server_tests.feature/build.properties
index fe0cb5c..150d89e 100644
--- a/features/org.eclipse.jst.server_tests.feature/build.properties
+++ b/features/org.eclipse.jst.server_tests.feature/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
+# Copyright (c) 2005, 2007 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/features/org.eclipse.jst.server_tests.feature/feature.properties b/features/org.eclipse.jst.server_tests.feature/feature.properties
index 2db5f9c..60d92e8 100644
--- a/features/org.eclipse.jst.server_tests.feature/feature.properties
+++ b/features/org.eclipse.jst.server_tests.feature/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
+# 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
@@ -28,9 +30,11 @@
 copyright=\
 Copyright (c) 2006 IBM Corporation 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\
     IBM Corporation - initial API and implementation\n
diff --git a/features/org.eclipse.jst.server_tests.feature/feature.xml b/features/org.eclipse.jst.server_tests.feature/feature.xml
index 1053a23..b5aada3 100644
--- a/features/org.eclipse.jst.server_tests.feature/feature.xml
+++ b/features/org.eclipse.jst.server_tests.feature/feature.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>

+<!--

+    Copyright (c) 2005, 2019 IBM Corporation and others.

+    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

+

+    Contributors:

+        IBM Corporation - initial API and implementation

+ -->
+
 <feature

       id="org.eclipse.jst.server_tests.feature"

       label="%featureName"

diff --git a/features/org.eclipse.jst.server_tests.feature/pom.xml b/features/org.eclipse.jst.server_tests.feature/pom.xml
index b6b7d12..46642a8 100644
--- a/features/org.eclipse.jst.server_tests.feature/pom.xml
+++ b/features/org.eclipse.jst.server_tests.feature/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

-  Copyright (c) 2012, 2013 Eclipse Foundation and others.

+  Copyright (c) 2012, 2015 Eclipse Foundation and others.

   All rights reserved. This program and the accompanying materials

   are made available under the terms of the Eclipse Distribution License v1.0

   which accompanies this distribution, and is available at

@@ -8,7 +8,7 @@
  

   Contributors:

     Thanh Ha (Eclipse Foundation) - initial implementation

--->

+-->
 

 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"

     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

diff --git a/features/org.eclipse.jst.server_ui.feature/build.properties b/features/org.eclipse.jst.server_ui.feature/build.properties
index fe0cb5c..150d89e 100644
--- a/features/org.eclipse.jst.server_ui.feature/build.properties
+++ b/features/org.eclipse.jst.server_ui.feature/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
+# Copyright (c) 2005, 2007 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/features/org.eclipse.jst.server_ui.feature/feature.properties b/features/org.eclipse.jst.server_ui.feature/feature.properties
index a0ccce7..8dea145 100644
--- a/features/org.eclipse.jst.server_ui.feature/feature.properties
+++ b/features/org.eclipse.jst.server_ui.feature/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
+# 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
@@ -28,9 +30,11 @@
 copyright=\
 Copyright (c) 2006 IBM Corporation 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\
     IBM Corporation - initial API and implementation\n
diff --git a/features/org.eclipse.jst.server_ui.feature/feature.xml b/features/org.eclipse.jst.server_ui.feature/feature.xml
index 4c28222..234291f 100644
--- a/features/org.eclipse.jst.server_ui.feature/feature.xml
+++ b/features/org.eclipse.jst.server_ui.feature/feature.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>

+<!--

+    Copyright (c) 2005, 2019 IBM Corporation and others.

+    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

+

+    Contributors:

+        IBM Corporation - initial API and implementation

+ -->
+
 <feature

       id="org.eclipse.jst.server_ui.feature"

       label="%featureName"

diff --git a/features/org.eclipse.jst.server_ui.feature/pom.xml b/features/org.eclipse.jst.server_ui.feature/pom.xml
index 9f3e94c..bc6398a 100644
--- a/features/org.eclipse.jst.server_ui.feature/pom.xml
+++ b/features/org.eclipse.jst.server_ui.feature/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

-  Copyright (c) 2012, 2013 Eclipse Foundation and others.

+  Copyright (c) 2012, 2016 Eclipse Foundation and others.

   All rights reserved. This program and the accompanying materials

   are made available under the terms of the Eclipse Distribution License v1.0

   which accompanies this distribution, and is available at

@@ -8,7 +8,7 @@
  

   Contributors:

     Thanh Ha (Eclipse Foundation) - initial implementation

--->

+-->
 

 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"

     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

diff --git a/features/org.eclipse.jst.server_ui.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.jst.server_ui.feature/sourceTemplateFeature/build.properties
index a3cc361..d036e64 100644
--- a/features/org.eclipse.jst.server_ui.feature/sourceTemplateFeature/build.properties
+++ b/features/org.eclipse.jst.server_ui.feature/sourceTemplateFeature/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
+# Copyright (c) 2000, 2018 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/features/org.eclipse.jst.server_ui.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.jst.server_ui.feature/sourceTemplateFeature/feature.properties
index 470ffd1..ae06607 100644
--- a/features/org.eclipse.jst.server_ui.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.jst.server_ui.feature/sourceTemplateFeature/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2000, 2006 IBM Corporation and others.
+# Copyright (c) 2000, 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
@@ -28,9 +30,11 @@
 copyright=\
 Copyright (c) 2006 IBM Corporation 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\
     IBM Corporation - initial API and implementation\n
diff --git a/features/org.eclipse.jst.server_userdoc.feature/build.properties b/features/org.eclipse.jst.server_userdoc.feature/build.properties
index 7c626e2..80ef680 100644
--- a/features/org.eclipse.jst.server_userdoc.feature/build.properties
+++ b/features/org.eclipse.jst.server_userdoc.feature/build.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 2019 IBM Corporation and others.
+# 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
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 bin.includes = feature.xml,\
                eclipse_update_120.jpg,\
                feature.properties
diff --git a/features/org.eclipse.jst.server_userdoc.feature/feature.properties b/features/org.eclipse.jst.server_userdoc.feature/feature.properties
index c21bd71..61a4e0a 100644
--- a/features/org.eclipse.jst.server_userdoc.feature/feature.properties
+++ b/features/org.eclipse.jst.server_userdoc.feature/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
+# 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
@@ -28,9 +30,11 @@
 copyright=\
 Copyright (c) 2006 IBM Corporation 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\
     IBM Corporation - initial API and implementation\n
diff --git a/features/org.eclipse.jst.server_userdoc.feature/feature.xml b/features/org.eclipse.jst.server_userdoc.feature/feature.xml
index 60e717a..afa6bd7 100644
--- a/features/org.eclipse.jst.server_userdoc.feature/feature.xml
+++ b/features/org.eclipse.jst.server_userdoc.feature/feature.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>

+<!--

+    Copyright (c) 2005, 2019 IBM Corporation and others.

+    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

+

+    Contributors:

+        IBM Corporation - initial API and implementation

+ -->
+
 <feature

       id="org.eclipse.jst.server_userdoc.feature"

       label="%featureName"

diff --git a/features/org.eclipse.jst.server_userdoc.feature/pom.xml b/features/org.eclipse.jst.server_userdoc.feature/pom.xml
index 3e02bad..1c243fa 100644
--- a/features/org.eclipse.jst.server_userdoc.feature/pom.xml
+++ b/features/org.eclipse.jst.server_userdoc.feature/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

-  Copyright (c) 2012, 2013 Eclipse Foundation and others.

+  Copyright (c) 2012, 2015 Eclipse Foundation and others.

   All rights reserved. This program and the accompanying materials

   are made available under the terms of the Eclipse Distribution License v1.0

   which accompanies this distribution, and is available at

@@ -8,7 +8,7 @@
  

   Contributors:

     Thanh Ha (Eclipse Foundation) - initial implementation

--->

+-->
 

 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"

     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

diff --git a/features/org.eclipse.wst.server_adapters.feature/build.properties b/features/org.eclipse.wst.server_adapters.feature/build.properties
index 7c626e2..fe6d07d 100644
--- a/features/org.eclipse.wst.server_adapters.feature/build.properties
+++ b/features/org.eclipse.wst.server_adapters.feature/build.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2007, 2019 IBM Corporation and others.
+# 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
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 bin.includes = feature.xml,\
                eclipse_update_120.jpg,\
                feature.properties
diff --git a/features/org.eclipse.wst.server_adapters.feature/feature.properties b/features/org.eclipse.wst.server_adapters.feature/feature.properties
index a7f2a85..95545f6 100644
--- a/features/org.eclipse.wst.server_adapters.feature/feature.properties
+++ b/features/org.eclipse.wst.server_adapters.feature/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2007, 2017 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
@@ -29,9 +31,11 @@
 copyright=\
 Copyright (c) 2007, 2017 IBM Corporation 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\
     IBM Corporation - initial API and implementation\n
diff --git a/features/org.eclipse.wst.server_adapters.feature/feature.xml b/features/org.eclipse.wst.server_adapters.feature/feature.xml
index 93bca70..27179b8 100644
--- a/features/org.eclipse.wst.server_adapters.feature/feature.xml
+++ b/features/org.eclipse.wst.server_adapters.feature/feature.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>

+<!--

+    Copyright (c) 2007, 2019 IBM Corporation and others.

+    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

+

+    Contributors:

+        IBM Corporation - initial API and implementation

+ -->
+
 <feature

       id="org.eclipse.wst.server_adapters.feature"

       label="%featureName"

diff --git a/features/org.eclipse.wst.server_adapters.feature/pom.xml b/features/org.eclipse.wst.server_adapters.feature/pom.xml
index e6fec79..c7b507f 100644
--- a/features/org.eclipse.wst.server_adapters.feature/pom.xml
+++ b/features/org.eclipse.wst.server_adapters.feature/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

-  Copyright (c) 2012, 2013 Eclipse Foundation and others.

+  Copyright (c) 2012, 2017 Eclipse Foundation and others.

   All rights reserved. This program and the accompanying materials

   are made available under the terms of the Eclipse Distribution License v1.0

   which accompanies this distribution, and is available at

@@ -8,7 +8,7 @@
  

   Contributors:

     Thanh Ha (Eclipse Foundation) - initial implementation

--->

+-->
 

 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"

     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

diff --git a/features/org.eclipse.wst.server_adapters.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.wst.server_adapters.feature/sourceTemplateFeature/build.properties
index be19849..6eaa6b6 100644
--- a/features/org.eclipse.wst.server_adapters.feature/sourceTemplateFeature/build.properties
+++ b/features/org.eclipse.wst.server_adapters.feature/sourceTemplateFeature/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2000, 2006 IBM Corporation and others.
+# Copyright (c) 2000, 2007 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/features/org.eclipse.wst.server_adapters.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.wst.server_adapters.feature/sourceTemplateFeature/feature.properties
index fec3bc7..9dd7955 100644
--- a/features/org.eclipse.wst.server_adapters.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.wst.server_adapters.feature/sourceTemplateFeature/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2007 IBM Corporation and others.
+# Copyright (c) 2007, 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
@@ -28,9 +30,11 @@
 copyright=\
 Copyright (c) 2007 IBM Corporation 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\
     IBM Corporation - initial API and implementation\n
diff --git a/features/org.eclipse.wst.server_adapters.sdk.feature/build.properties b/features/org.eclipse.wst.server_adapters.sdk.feature/build.properties
index 3e69ba2..8415dc8 100644
--- a/features/org.eclipse.wst.server_adapters.sdk.feature/build.properties
+++ b/features/org.eclipse.wst.server_adapters.sdk.feature/build.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2007, 2019 IBM Corporation and others.
+# 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
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 bin.includes = feature.xml,\
                eclipse_update_120.jpg,\
                feature.properties
diff --git a/features/org.eclipse.wst.server_adapters.sdk.feature/feature.properties b/features/org.eclipse.wst.server_adapters.sdk.feature/feature.properties
index b458f85..1bbf1a4 100644
--- a/features/org.eclipse.wst.server_adapters.sdk.feature/feature.properties
+++ b/features/org.eclipse.wst.server_adapters.sdk.feature/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2007 IBM Corporation and others.
+# Copyright (c) 2007, 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
@@ -28,9 +30,11 @@
 copyright=\
 Copyright (c) 2007 IBM Corporation 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\
     IBM Corporation - initial API and implementation\n
diff --git a/features/org.eclipse.wst.server_adapters.sdk.feature/feature.xml b/features/org.eclipse.wst.server_adapters.sdk.feature/feature.xml
index 0f5d591..6fd961b 100644
--- a/features/org.eclipse.wst.server_adapters.sdk.feature/feature.xml
+++ b/features/org.eclipse.wst.server_adapters.sdk.feature/feature.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>

+<!--

+    Copyright (c) 2007, 2019 IBM Corporation and others.

+    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

+

+    Contributors:

+        IBM Corporation - initial API and implementation

+ -->
+
 <feature

       id="org.eclipse.wst.server_adapters.sdk.feature"

       label="%featureName"

diff --git a/features/org.eclipse.wst.server_adapters.sdk.feature/pom.xml b/features/org.eclipse.wst.server_adapters.sdk.feature/pom.xml
index 570d215..649eef2 100644
--- a/features/org.eclipse.wst.server_adapters.sdk.feature/pom.xml
+++ b/features/org.eclipse.wst.server_adapters.sdk.feature/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

-  Copyright (c) 2012, 2013 Eclipse Foundation and others.

+  Copyright (c) 2012, 2018 Eclipse Foundation and others.

   All rights reserved. This program and the accompanying materials

   are made available under the terms of the Eclipse Distribution License v1.0

   which accompanies this distribution, and is available at

@@ -8,7 +8,7 @@
  

   Contributors:

     Thanh Ha (Eclipse Foundation) - initial implementation

--->

+-->
 

 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"

     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

diff --git a/features/org.eclipse.wst.server_core.feature.patch/build.properties b/features/org.eclipse.wst.server_core.feature.patch/build.properties
index cd1f9c4..cd5160c 100644
--- a/features/org.eclipse.wst.server_core.feature.patch/build.properties
+++ b/features/org.eclipse.wst.server_core.feature.patch/build.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2007, 2019 IBM Corporation and others.
+# 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
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 bin.includes = feature.xml,\
                license.html,\
                feature.properties,\
diff --git a/features/org.eclipse.wst.server_core.feature.patch/build.xml b/features/org.eclipse.wst.server_core.feature.patch/build.xml
index 1be1285..cbcb67a 100644
--- a/features/org.eclipse.wst.server_core.feature.patch/build.xml
+++ b/features/org.eclipse.wst.server_core.feature.patch/build.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2007, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <project name="org.eclipse.wst.server_core.feature.patch" default="build.update.jar" basedir=".">
 
 	<target name="init">
diff --git a/features/org.eclipse.wst.server_core.feature.patch/feature.properties b/features/org.eclipse.wst.server_core.feature.patch/feature.properties
index 385a356..f377c1b 100644
--- a/features/org.eclipse.wst.server_core.feature.patch/feature.properties
+++ b/features/org.eclipse.wst.server_core.feature.patch/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
+# Copyright (c) 2006, 2007 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
@@ -36,9 +38,11 @@
 copyright=\
 Copyright (c) 2006 IBM Corporation 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\
     IBM Corporation - initial API and implementation\n
@@ -73,7 +77,7 @@
 Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
 is provided to you under the terms and conditions of the Eclipse Public\n\
 License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+Content and is also available at https://www.eclipse.org/legal/epl-2.0/.\n\
 For purposes of the EPL, "Program" will mean the Content.\n\
 \n\
 Content includes, but is not limited to, source code, object code,\n\
diff --git a/features/org.eclipse.wst.server_core.feature.patch/feature.xml b/features/org.eclipse.wst.server_core.feature.patch/feature.xml
index 6c03ec2..1f21e82 100644
--- a/features/org.eclipse.wst.server_core.feature.patch/feature.xml
+++ b/features/org.eclipse.wst.server_core.feature.patch/feature.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>

+<!--

+    Copyright (c) 2007, 2019 IBM Corporation and others.

+    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

+

+    Contributors:

+        IBM Corporation - initial API and implementation

+ -->
+
 <feature

       id="org.eclipse.wst.server_core.feature.patch"

       label="Patch Feature for Server Core"

diff --git a/features/org.eclipse.wst.server_core.feature.patch/license.html b/features/org.eclipse.wst.server_core.feature.patch/license.html
index 2347060..c8f01bb 100644
--- a/features/org.eclipse.wst.server_core.feature.patch/license.html
+++ b/features/org.eclipse.wst.server_core.feature.patch/license.html
@@ -22,7 +22,7 @@
 Foundation is provided to you under the terms and conditions of the Eclipse 
 Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
 Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
+href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 <P>Content includes, but is not limited to, source code, object code, 
 documentation and other files maintained in the Eclipse.org CVS repository 
diff --git a/features/org.eclipse.wst.server_core.feature.patch/pom.xml b/features/org.eclipse.wst.server_core.feature.patch/pom.xml
index cc0d379..734e724 100644
--- a/features/org.eclipse.wst.server_core.feature.patch/pom.xml
+++ b/features/org.eclipse.wst.server_core.feature.patch/pom.xml
@@ -8,7 +8,7 @@
  

   Contributors:

     Thanh Ha (Eclipse Foundation) - initial implementation

--->

+-->
 

 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"

     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

diff --git a/features/org.eclipse.wst.server_core.feature/build.properties b/features/org.eclipse.wst.server_core.feature/build.properties
index fe0cb5c..150d89e 100644
--- a/features/org.eclipse.wst.server_core.feature/build.properties
+++ b/features/org.eclipse.wst.server_core.feature/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
+# Copyright (c) 2005, 2007 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/features/org.eclipse.wst.server_core.feature/feature.properties b/features/org.eclipse.wst.server_core.feature/feature.properties
index f61f05d..78f6c5c 100644
--- a/features/org.eclipse.wst.server_core.feature/feature.properties
+++ b/features/org.eclipse.wst.server_core.feature/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
+# 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
@@ -28,9 +30,11 @@
 copyright=\
 Copyright (c) 2006 IBM Corporation 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\
     IBM Corporation - initial API and implementation\n
diff --git a/features/org.eclipse.wst.server_core.feature/feature.xml b/features/org.eclipse.wst.server_core.feature/feature.xml
index a9fb17f..21b25a9 100644
--- a/features/org.eclipse.wst.server_core.feature/feature.xml
+++ b/features/org.eclipse.wst.server_core.feature/feature.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2005, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <feature
       id="org.eclipse.wst.server_core.feature"
       label="%featureName"
diff --git a/features/org.eclipse.wst.server_core.feature/pom.xml b/features/org.eclipse.wst.server_core.feature/pom.xml
index cbc242d..349c083 100644
--- a/features/org.eclipse.wst.server_core.feature/pom.xml
+++ b/features/org.eclipse.wst.server_core.feature/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2012, 2013 Eclipse Foundation and others.
+  Copyright (c) 2012, 2017 Eclipse Foundation and others.
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Distribution License v1.0
   which accompanies this distribution, and is available at
diff --git a/features/org.eclipse.wst.server_core.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.wst.server_core.feature/sourceTemplateFeature/build.properties
index be839a7..70786c5 100644
--- a/features/org.eclipse.wst.server_core.feature/sourceTemplateFeature/build.properties
+++ b/features/org.eclipse.wst.server_core.feature/sourceTemplateFeature/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2000, 2005 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/features/org.eclipse.wst.server_core.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.wst.server_core.feature/sourceTemplateFeature/feature.properties
index 97ca815..1678cac 100644
--- a/features/org.eclipse.wst.server_core.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.wst.server_core.feature/sourceTemplateFeature/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
+# 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
@@ -28,9 +30,11 @@
 copyright=\
 Copyright (c) 2006 IBM Corporation 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\
     IBM Corporation - initial API and implementation\n
diff --git a/features/org.eclipse.wst.server_sdk.feature.patch/build.properties b/features/org.eclipse.wst.server_sdk.feature.patch/build.properties
index cd1f9c4..45b278d 100644
--- a/features/org.eclipse.wst.server_sdk.feature.patch/build.properties
+++ b/features/org.eclipse.wst.server_sdk.feature.patch/build.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2009, 2019 IBM Corporation and others.
+# 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
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 bin.includes = feature.xml,\
                license.html,\
                feature.properties,\
diff --git a/features/org.eclipse.wst.server_sdk.feature.patch/feature.properties b/features/org.eclipse.wst.server_sdk.feature.patch/feature.properties
index 9b591fc..17bf3ce 100644
--- a/features/org.eclipse.wst.server_sdk.feature.patch/feature.properties
+++ b/features/org.eclipse.wst.server_sdk.feature.patch/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2009 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
@@ -34,9 +36,11 @@
 copyright=\
 Copyright (c) 2009 IBM Corporation 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\
     IBM Corporation - initial API and implementation\n
@@ -71,7 +75,7 @@
 Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
 is provided to you under the terms and conditions of the Eclipse Public\n\
 License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+Content and is also available at https://www.eclipse.org/legal/epl-2.0/.\n\
 For purposes of the EPL, "Program" will mean the Content.\n\
 \n\
 Content includes, but is not limited to, source code, object code,\n\
diff --git a/features/org.eclipse.wst.server_sdk.feature.patch/feature.xml b/features/org.eclipse.wst.server_sdk.feature.patch/feature.xml
index aa54d1b..0027471 100644
--- a/features/org.eclipse.wst.server_sdk.feature.patch/feature.xml
+++ b/features/org.eclipse.wst.server_sdk.feature.patch/feature.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>

+<!--

+    Copyright (c) 2009, 2019 IBM Corporation and others.

+    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

+

+    Contributors:

+        IBM Corporation - initial API and implementation

+ -->
+
 <feature

       id="org.eclipse.wst.server_sdk.feature.patch"

       label="%featureName"

diff --git a/features/org.eclipse.wst.server_sdk.feature.patch/license.html b/features/org.eclipse.wst.server_sdk.feature.patch/license.html
index 2347060..c8f01bb 100644
--- a/features/org.eclipse.wst.server_sdk.feature.patch/license.html
+++ b/features/org.eclipse.wst.server_sdk.feature.patch/license.html
@@ -22,7 +22,7 @@
 Foundation is provided to you under the terms and conditions of the Eclipse 
 Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
 Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
+href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 <P>Content includes, but is not limited to, source code, object code, 
 documentation and other files maintained in the Eclipse.org CVS repository 
diff --git a/features/org.eclipse.wst.server_sdk.feature.patch/pom.xml b/features/org.eclipse.wst.server_sdk.feature.patch/pom.xml
index 901fd64..068bf3a 100644
--- a/features/org.eclipse.wst.server_sdk.feature.patch/pom.xml
+++ b/features/org.eclipse.wst.server_sdk.feature.patch/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

-  Copyright (c) 2012, 2013 Eclipse Foundation and others.

+  Copyright (c) 2012, 2018 Eclipse Foundation and others.

   All rights reserved. This program and the accompanying materials

   are made available under the terms of the Eclipse Distribution License v1.0

   which accompanies this distribution, and is available at

@@ -8,7 +8,7 @@
  

   Contributors:

     Thanh Ha (Eclipse Foundation) - initial implementation

--->

+-->
 

 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"

     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

diff --git a/features/org.eclipse.wst.server_sdk.feature/build.properties b/features/org.eclipse.wst.server_sdk.feature/build.properties
index fe0cb5c..1e19ba2 100644
--- a/features/org.eclipse.wst.server_sdk.feature/build.properties
+++ b/features/org.eclipse.wst.server_sdk.feature/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
+# Copyright (c) 2005, 2018 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/features/org.eclipse.wst.server_sdk.feature/feature.properties b/features/org.eclipse.wst.server_sdk.feature/feature.properties
index fabc7e3..aa55359 100644
--- a/features/org.eclipse.wst.server_sdk.feature/feature.properties
+++ b/features/org.eclipse.wst.server_sdk.feature/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
+# 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
@@ -28,9 +30,11 @@
 copyright=\
 Copyright (c) 2000, 2006 IBM Corporation 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\
     IBM Corporation - initial API and implementation\n
diff --git a/features/org.eclipse.wst.server_sdk.feature/feature.xml b/features/org.eclipse.wst.server_sdk.feature/feature.xml
index 151462e..28221a8 100644
--- a/features/org.eclipse.wst.server_sdk.feature/feature.xml
+++ b/features/org.eclipse.wst.server_sdk.feature/feature.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>

+<!--

+    Copyright (c) 2005, 2019 IBM Corporation and others.

+    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

+

+    Contributors:

+        IBM Corporation - initial API and implementation

+ -->
+
 <feature

       id="org.eclipse.wst.server_sdk.feature"

       label="%featureName"

diff --git a/features/org.eclipse.wst.server_sdk.feature/pom.xml b/features/org.eclipse.wst.server_sdk.feature/pom.xml
index 5d8551c..2648242 100644
--- a/features/org.eclipse.wst.server_sdk.feature/pom.xml
+++ b/features/org.eclipse.wst.server_sdk.feature/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

-  Copyright (c) 2012, 2013 Eclipse Foundation and others.

+  Copyright (c) 2012, 2016 Eclipse Foundation and others.

   All rights reserved. This program and the accompanying materials

   are made available under the terms of the Eclipse Distribution License v1.0

   which accompanies this distribution, and is available at

@@ -8,7 +8,7 @@
  

   Contributors:

     Thanh Ha (Eclipse Foundation) - initial implementation

--->

+-->
 

 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"

     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

diff --git a/features/org.eclipse.wst.server_tests.feature/build.properties b/features/org.eclipse.wst.server_tests.feature/build.properties
index fe0cb5c..150d89e 100644
--- a/features/org.eclipse.wst.server_tests.feature/build.properties
+++ b/features/org.eclipse.wst.server_tests.feature/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
+# Copyright (c) 2005, 2007 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/features/org.eclipse.wst.server_tests.feature/feature.properties b/features/org.eclipse.wst.server_tests.feature/feature.properties
index 800ce35..3b3151b 100644
--- a/features/org.eclipse.wst.server_tests.feature/feature.properties
+++ b/features/org.eclipse.wst.server_tests.feature/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
+# 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
@@ -28,9 +30,11 @@
 copyright=\
 Copyright (c) 2006 IBM Corporation 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\
     IBM Corporation - initial API and implementation\n
diff --git a/features/org.eclipse.wst.server_tests.feature/feature.xml b/features/org.eclipse.wst.server_tests.feature/feature.xml
index 1e7f825..bb51ec7 100644
--- a/features/org.eclipse.wst.server_tests.feature/feature.xml
+++ b/features/org.eclipse.wst.server_tests.feature/feature.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>

+<!--

+    Copyright (c) 2005, 2019 IBM Corporation and others.

+    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

+

+    Contributors:

+        IBM Corporation - initial API and implementation

+ -->
+
 <feature

       id="org.eclipse.wst.server_tests.feature"

       label="%featureName"

diff --git a/features/org.eclipse.wst.server_tests.feature/pom.xml b/features/org.eclipse.wst.server_tests.feature/pom.xml
index 14ea0ec..5b4520f 100644
--- a/features/org.eclipse.wst.server_tests.feature/pom.xml
+++ b/features/org.eclipse.wst.server_tests.feature/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

-  Copyright (c) 2012, 2013 Eclipse Foundation and others.

+  Copyright (c) 2012, 2016 Eclipse Foundation and others.

   All rights reserved. This program and the accompanying materials

   are made available under the terms of the Eclipse Distribution License v1.0

   which accompanies this distribution, and is available at

@@ -8,7 +8,7 @@
  

   Contributors:

     Thanh Ha (Eclipse Foundation) - initial implementation

--->

+-->
 

 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"

     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

diff --git a/features/org.eclipse.wst.server_ui.feature/build.properties b/features/org.eclipse.wst.server_ui.feature/build.properties
index fe0cb5c..150d89e 100644
--- a/features/org.eclipse.wst.server_ui.feature/build.properties
+++ b/features/org.eclipse.wst.server_ui.feature/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
+# Copyright (c) 2005, 2007 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/features/org.eclipse.wst.server_ui.feature/feature.properties b/features/org.eclipse.wst.server_ui.feature/feature.properties
index 063430e..7628f93 100644
--- a/features/org.eclipse.wst.server_ui.feature/feature.properties
+++ b/features/org.eclipse.wst.server_ui.feature/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
+# 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
@@ -28,9 +30,11 @@
 copyright=\
 Copyright (c) 2006 IBM Corporation 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\
     IBM Corporation - initial API and implementation\n
diff --git a/features/org.eclipse.wst.server_ui.feature/feature.xml b/features/org.eclipse.wst.server_ui.feature/feature.xml
index d86c076..ad381b3 100644
--- a/features/org.eclipse.wst.server_ui.feature/feature.xml
+++ b/features/org.eclipse.wst.server_ui.feature/feature.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2005, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <feature
       id="org.eclipse.wst.server_ui.feature"
       label="%featureName"
diff --git a/features/org.eclipse.wst.server_ui.feature/pom.xml b/features/org.eclipse.wst.server_ui.feature/pom.xml
index 98bbf40..199ed3b 100644
--- a/features/org.eclipse.wst.server_ui.feature/pom.xml
+++ b/features/org.eclipse.wst.server_ui.feature/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2012, 2013 Eclipse Foundation and others.
+  Copyright (c) 2012, 2017 Eclipse Foundation and others.
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Distribution License v1.0
   which accompanies this distribution, and is available at
diff --git a/features/org.eclipse.wst.server_ui.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.wst.server_ui.feature/sourceTemplateFeature/build.properties
index a3cc361..d036e64 100644
--- a/features/org.eclipse.wst.server_ui.feature/sourceTemplateFeature/build.properties
+++ b/features/org.eclipse.wst.server_ui.feature/sourceTemplateFeature/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
+# Copyright (c) 2000, 2018 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/features/org.eclipse.wst.server_ui.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.wst.server_ui.feature/sourceTemplateFeature/feature.properties
index af6f31d..e526f2d 100644
--- a/features/org.eclipse.wst.server_ui.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.wst.server_ui.feature/sourceTemplateFeature/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2000, 2006 IBM Corporation and others.
+# Copyright (c) 2000, 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
@@ -28,9 +30,11 @@
 copyright=\
 Copyright (c) 2006 IBM Corporation 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\
     IBM Corporation - initial API and implementation\n
diff --git a/features/org.eclipse.wst.server_userdoc.feature/build.properties b/features/org.eclipse.wst.server_userdoc.feature/build.properties
index 7c626e2..80ef680 100644
--- a/features/org.eclipse.wst.server_userdoc.feature/build.properties
+++ b/features/org.eclipse.wst.server_userdoc.feature/build.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 2019 IBM Corporation and others.
+# 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
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 bin.includes = feature.xml,\
                eclipse_update_120.jpg,\
                feature.properties
diff --git a/features/org.eclipse.wst.server_userdoc.feature/feature.properties b/features/org.eclipse.wst.server_userdoc.feature/feature.properties
index 8246c11..452f8f0 100644
--- a/features/org.eclipse.wst.server_userdoc.feature/feature.properties
+++ b/features/org.eclipse.wst.server_userdoc.feature/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
+# 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
@@ -28,9 +30,11 @@
 copyright=\
 Copyright (c) 2006 IBM Corporation 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\
     IBM Corporation - initial API and implementation\n
diff --git a/features/org.eclipse.wst.server_userdoc.feature/feature.xml b/features/org.eclipse.wst.server_userdoc.feature/feature.xml
index 66a9e12..702bd51 100644
--- a/features/org.eclipse.wst.server_userdoc.feature/feature.xml
+++ b/features/org.eclipse.wst.server_userdoc.feature/feature.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>

+<!--

+    Copyright (c) 2005, 2019 IBM Corporation and others.

+    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

+

+    Contributors:

+        IBM Corporation - initial API and implementation

+ -->
+
 <feature

       id="org.eclipse.wst.server_userdoc.feature"

       label="%featureName"

diff --git a/features/org.eclipse.wst.server_userdoc.feature/pom.xml b/features/org.eclipse.wst.server_userdoc.feature/pom.xml
index cc50f0b..9776d67 100644
--- a/features/org.eclipse.wst.server_userdoc.feature/pom.xml
+++ b/features/org.eclipse.wst.server_userdoc.feature/pom.xml
@@ -8,7 +8,7 @@
  

   Contributors:

     Thanh Ha (Eclipse Foundation) - initial implementation

--->

+-->
 

 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"

     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

diff --git a/plugins/org.eclipse.jst.server.core/about.html b/plugins/org.eclipse.jst.server.core/about.html
index 2199df3..454947c 100644
--- a/plugins/org.eclipse.jst.server.core/about.html
+++ b/plugins/org.eclipse.jst.server.core/about.html
@@ -18,7 +18,7 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/plugins/org.eclipse.jst.server.core/build.properties b/plugins/org.eclipse.jst.server.core/build.properties
index 40ca4c9..c4ba474 100644
--- a/plugins/org.eclipse.jst.server.core/build.properties
+++ b/plugins/org.eclipse.jst.server.core/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2004, 2007 IBM Corporation and others.
+# Copyright (c) 2004, 2008 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/plugin.properties b/plugins/org.eclipse.jst.server.core/plugin.properties
index bf40b71..5d088a4 100644
--- a/plugins/org.eclipse.jst.server.core/plugin.properties
+++ b/plugins/org.eclipse.jst.server.core/plugin.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2004, 2008 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/pom.xml b/plugins/org.eclipse.jst.server.core/pom.xml
index 489d011..0ee6c79 100644
--- a/plugins/org.eclipse.jst.server.core/pom.xml
+++ b/plugins/org.eclipse.jst.server.core/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

-  Copyright (c) 2012, 2013 Eclipse Foundation and others.

+  Copyright (c) 2012, 2016 Eclipse Foundation and others.

   All rights reserved. This program and the accompanying materials

   are made available under the terms of the Eclipse Distribution License v1.0

   which accompanies this distribution, and is available at

@@ -8,7 +8,7 @@
  

   Contributors:

     Thanh Ha (Eclipse Foundation) - initial implementation

--->

+-->
 

 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"

     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

diff --git a/plugins/org.eclipse.jst.server.core/schema/internalRuntimeComponentProviders.exsd b/plugins/org.eclipse.jst.server.core/schema/internalRuntimeComponentProviders.exsd
index cf481bd..84c601b 100644
--- a/plugins/org.eclipse.jst.server.core/schema/internalRuntimeComponentProviders.exsd
+++ b/plugins/org.eclipse.jst.server.core/schema/internalRuntimeComponentProviders.exsd
@@ -127,9 +127,9 @@
       <documentation>
          Copyright (c) 2006 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+&lt;a href=&quot;https://www.eclipse.org/legal/epl-2.0/&quot;&gt;https://www.eclipse.org/legal/epl-2.0/&lt;/a&gt;
       </documentation>
    </annotation>
 
diff --git a/plugins/org.eclipse.jst.server.core/schema/runtimeClasspathProviders.exsd b/plugins/org.eclipse.jst.server.core/schema/runtimeClasspathProviders.exsd
index 90de0c1..b32b181 100644
--- a/plugins/org.eclipse.jst.server.core/schema/runtimeClasspathProviders.exsd
+++ b/plugins/org.eclipse.jst.server.core/schema/runtimeClasspathProviders.exsd
@@ -124,11 +124,11 @@
          <meta.section type="copyright"/>
       </appInfo>
       <documentation>
-         Copyright (c) 2000, 2005 IBM Corporation and others.&lt;br&gt;
+         Copyright (c) 2000, 2006 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+&lt;a href=&quot;https://www.eclipse.org/legal/epl-2.0/&quot;&gt;https://www.eclipse.org/legal/epl-2.0/&lt;/a&gt;
       </documentation>
    </annotation>
 
diff --git a/plugins/org.eclipse.jst.server.core/schema/runtimeFacetMappings.exsd b/plugins/org.eclipse.jst.server.core/schema/runtimeFacetMappings.exsd
index 94d332e..39fb451 100644
--- a/plugins/org.eclipse.jst.server.core/schema/runtimeFacetMappings.exsd
+++ b/plugins/org.eclipse.jst.server.core/schema/runtimeFacetMappings.exsd
@@ -128,11 +128,11 @@
          <meta.section type="copyright"/>
       </appInfo>
       <documentation>
-         Copyright (c) 2000, 2005 IBM Corporation and others.&lt;br&gt;
+         Copyright (c) 2000, 2006 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+&lt;a href=&quot;https://www.eclipse.org/legal/epl-2.0/&quot;&gt;https://www.eclipse.org/legal/epl-2.0/&lt;/a&gt;
       </documentation>
    </annotation>
 
diff --git a/plugins/org.eclipse.jst.server.core/schema/serverProfilers.exsd b/plugins/org.eclipse.jst.server.core/schema/serverProfilers.exsd
index 4d0b485..6962bba 100644
--- a/plugins/org.eclipse.jst.server.core/schema/serverProfilers.exsd
+++ b/plugins/org.eclipse.jst.server.core/schema/serverProfilers.exsd
@@ -123,11 +123,11 @@
          <meta.section type="copyright"/>
       </appInfo>
       <documentation>
-         Copyright (c) 2006 IBM Corporation and others.&lt;br&gt;
+         Copyright (c) 2006, 2007 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+&lt;a href=&quot;https://www.eclipse.org/legal/epl-2.0/&quot;&gt;https://www.eclipse.org/legal/epl-2.0/&lt;/a&gt;
       </documentation>
    </annotation>
 
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/ClasspathRuntimeTargetHandler.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/ClasspathRuntimeTargetHandler.java
index e6bb015..041327b 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/ClasspathRuntimeTargetHandler.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/ClasspathRuntimeTargetHandler.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2003, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/EJBBean.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/EJBBean.java
index 7e67faa..d93cea8 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/EJBBean.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/EJBBean.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2003, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/FacetUtil.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/FacetUtil.java
index 201dc78..f83b69e 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/FacetUtil.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/FacetUtil.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IApplicationClientModule.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IApplicationClientModule.java
index 03570e1..ea15e9f 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IApplicationClientModule.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IApplicationClientModule.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2003, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IConnectorModule.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IConnectorModule.java
index d836725..33401fe 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IConnectorModule.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IConnectorModule.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2003, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IEJBModule.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IEJBModule.java
index f610656..5518385 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IEJBModule.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IEJBModule.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2003, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IEnterpriseApplication.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IEnterpriseApplication.java
index 7ea1d77..75efefb 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IEnterpriseApplication.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IEnterpriseApplication.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2003, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IJ2EEModule.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IJ2EEModule.java
index b4d974b..24ee1ce 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IJ2EEModule.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IJ2EEModule.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2003, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IJavaRuntime.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IJavaRuntime.java
index 6a51693..3d42a02 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IJavaRuntime.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IJavaRuntime.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IJavaRuntimeWorkingCopy.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IJavaRuntimeWorkingCopy.java
index ec15ccc..472db3d 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IJavaRuntimeWorkingCopy.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IJavaRuntimeWorkingCopy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IUtilityModule.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IUtilityModule.java
index f013f69..b45daa0 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IUtilityModule.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IUtilityModule.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2003, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IWebFragmentModule.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IWebFragmentModule.java
index 074e33b..2d8d255 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IWebFragmentModule.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IWebFragmentModule.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 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/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IWebModule.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IWebModule.java
index a98c859..5080cbc 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IWebModule.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IWebModule.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2003, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/JndiLaunchable.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/JndiLaunchable.java
index db5304c..0338c5b 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/JndiLaunchable.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/JndiLaunchable.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2003, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/JndiObject.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/JndiObject.java
index f02e922..b7df874 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/JndiObject.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/JndiObject.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2003, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/PublishUtil.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/PublishUtil.java
index 12f2899..b1750ab 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/PublishUtil.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/PublishUtil.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2003, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/RuntimeClasspathProviderDelegate.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/RuntimeClasspathProviderDelegate.java
index 9639ec8..cbadc7b 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/RuntimeClasspathProviderDelegate.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/RuntimeClasspathProviderDelegate.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2011 IBM Corporation and others.
+ * Copyright (c) 2003, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/ServerProfilerDelegate.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/ServerProfilerDelegate.java
index 86f0dc8..cb12082 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/ServerProfilerDelegate.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/ServerProfilerDelegate.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/Servlet.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/Servlet.java
index b3cc4dc..bd43d9a 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/Servlet.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/Servlet.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2003, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/GenericRuntime.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/GenericRuntime.java
index 264fcaa..525b3c5 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/GenericRuntime.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/GenericRuntime.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2003, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/GenericRuntimeClasspathProvider.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/GenericRuntimeClasspathProvider.java
index 862bb64..f7891a9 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/GenericRuntimeClasspathProvider.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/GenericRuntimeClasspathProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2003, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/GenericRuntimeUtil.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/GenericRuntimeUtil.java
index d5fbb11..4f4af32 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/GenericRuntimeUtil.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/GenericRuntimeUtil.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2003, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/IGenericRuntime.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/IGenericRuntime.java
index 9a4bd31..c1b49f7 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/IGenericRuntime.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/IGenericRuntime.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2003, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/IGenericRuntimeWorkingCopy.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/IGenericRuntimeWorkingCopy.java
index 36c1965..95725ee 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/IGenericRuntimeWorkingCopy.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/IGenericRuntimeWorkingCopy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2003, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/IMemento.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/IMemento.java
index 8c0d1f1..3fb94e6 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/IMemento.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/IMemento.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2003, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/J2EELaunchableClient.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/J2EELaunchableClient.java
index 4b30dda..b0eb0fa 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/J2EELaunchableClient.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/J2EELaunchableClient.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/J2EEUtil.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/J2EEUtil.java
index 2bbf8e9..d64f4d7 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/J2EEUtil.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/J2EEUtil.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2003, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/JRERuntimeComponentProvider.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/JRERuntimeComponentProvider.java
index 89afad8..4748977 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/JRERuntimeComponentProvider.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/JRERuntimeComponentProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2007,2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/JavaServerPlugin.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/JavaServerPlugin.java
index 51ba745..e2318a4 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/JavaServerPlugin.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/JavaServerPlugin.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2003, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/LaunchConfigurationUtil.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/LaunchConfigurationUtil.java
index 2ffe168..4320876 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/LaunchConfigurationUtil.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/LaunchConfigurationUtil.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2003, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/Messages.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/Messages.java
index 2230290..89f8e49 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/Messages.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/Messages.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2009 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *    IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/Messages.properties b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/Messages.properties
index b616914..22a5e3b 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/Messages.properties
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/Messages.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2004, 2009 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/ProfilerPreferences.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/ProfilerPreferences.java
index 5ec2786..ecd5dcf 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/ProfilerPreferences.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/ProfilerPreferences.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/ProgressUtil.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/ProgressUtil.java
index 61d99d6..ea1e234 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/ProgressUtil.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/ProgressUtil.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2003, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/RuntimeClasspathContainer.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/RuntimeClasspathContainer.java
index bd0c9bc..18d6f0e 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/RuntimeClasspathContainer.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/RuntimeClasspathContainer.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2003, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/RuntimeClasspathContainerInitializer.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/RuntimeClasspathContainerInitializer.java
index c7b9a13..70a64ba 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/RuntimeClasspathContainerInitializer.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/RuntimeClasspathContainerInitializer.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2003, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *    IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/RuntimeClasspathProvider.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/RuntimeClasspathProvider.java
index c581153..c5880c5 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/RuntimeClasspathProvider.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/RuntimeClasspathProvider.java
@@ -1,9 +1,11 @@
 /******************************************************************************
  * Copyright (c) 2005, 2011 BEA Systems, 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:
  *    Konstantin Komissarchik - initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/RuntimeClasspathProviderWrapper.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/RuntimeClasspathProviderWrapper.java
index c992736..570695f 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/RuntimeClasspathProviderWrapper.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/RuntimeClasspathProviderWrapper.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/RuntimeComponentProviderDelegate.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/RuntimeComponentProviderDelegate.java
index 968e4dd..37d75c8 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/RuntimeComponentProviderDelegate.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/RuntimeComponentProviderDelegate.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/RuntimeComponentProviderWrapper.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/RuntimeComponentProviderWrapper.java
index edb13aa..e5e2227 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/RuntimeComponentProviderWrapper.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/RuntimeComponentProviderWrapper.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/RuntimeFacetMapping.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/RuntimeFacetMapping.java
index 72cd045..2c9381a 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/RuntimeFacetMapping.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/RuntimeFacetMapping.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/ServerProfiler.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/ServerProfiler.java
index 1f0a3c3..562b0b4 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/ServerProfiler.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/ServerProfiler.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/Trace.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/Trace.java
index ef97d15..e71122f 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/Trace.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/Trace.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2003, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/XMLMemento.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/XMLMemento.java
index 119f14d..ec9d24a 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/XMLMemento.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/XMLMemento.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2003, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/package.xml b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/package.xml
index b4c0529..e19ea7d 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/package.xml
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/package.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2005, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <html>
 <head>
 	<!--  Escape to the root of your source folder  -->
diff --git a/plugins/org.eclipse.jst.server.generic.core/about.html b/plugins/org.eclipse.jst.server.generic.core/about.html
index 2199df3..454947c 100644
--- a/plugins/org.eclipse.jst.server.generic.core/about.html
+++ b/plugins/org.eclipse.jst.server.generic.core/about.html
@@ -18,7 +18,7 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/plugins/org.eclipse.jst.server.generic.core/build.properties b/plugins/org.eclipse.jst.server.generic.core/build.properties
index 78df72c..57f1a70 100644
--- a/plugins/org.eclipse.jst.server.generic.core/build.properties
+++ b/plugins/org.eclipse.jst.server.generic.core/build.properties
@@ -1,8 +1,10 @@
 ##################################################################################################
-# Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
-# accompanying materials are made available under the terms of the Eclipse Public License v1.0
+# Copyright (c) 2005, 2009 Eteration A.S. and Gorkem Ercan. 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
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors: Gorkem Ercan - initial API and implementation
 #               
diff --git a/plugins/org.eclipse.jst.server.generic.core/plugin.properties b/plugins/org.eclipse.jst.server.generic.core/plugin.properties
index 71d7ea3..3146329 100644
--- a/plugins/org.eclipse.jst.server.generic.core/plugin.properties
+++ b/plugins/org.eclipse.jst.server.generic.core/plugin.properties
@@ -1,8 +1,10 @@
 ##################################################################################################
-# Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
-# accompanying materials are made available under the terms of the Eclipse Public License v1.0
+# Copyright (c) 2005, 2006 Eteration A.S. and Gorkem Ercan. 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
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors: Gorkem Ercan - initial API and implementation
 #               
diff --git a/plugins/org.eclipse.jst.server.generic.core/pom.xml b/plugins/org.eclipse.jst.server.generic.core/pom.xml
index 8294ef0..cef20b8 100644
--- a/plugins/org.eclipse.jst.server.generic.core/pom.xml
+++ b/plugins/org.eclipse.jst.server.generic.core/pom.xml
@@ -8,7 +8,7 @@
  

   Contributors:

     Thanh Ha (Eclipse Foundation) - initial implementation

--->

+-->
 

 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"

     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

diff --git a/plugins/org.eclipse.jst.server.generic.core/schema/genericpublisher.exsd b/plugins/org.eclipse.jst.server.generic.core/schema/genericpublisher.exsd
index 810ac40..68fb664 100644
--- a/plugins/org.eclipse.jst.server.generic.core/schema/genericpublisher.exsd
+++ b/plugins/org.eclipse.jst.server.generic.core/schema/genericpublisher.exsd
@@ -108,8 +108,8 @@
          <meta.section type="copyright"/>
       </appInfo>
       <documentation>
-         Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. 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
-&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+         Copyright (c) 2005, 2006 Eteration A.S. and Gorkem Ercan. 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
+&lt;a href=&quot;https://www.eclipse.org/legal/epl-2.0/&quot;&gt;https://www.eclipse.org/legal/epl-2.0/&lt;/a&gt;
       </documentation>
    </annotation>
 
diff --git a/plugins/org.eclipse.jst.server.generic.core/schema/runtimedefinition.exsd b/plugins/org.eclipse.jst.server.generic.core/schema/runtimedefinition.exsd
index 93ed0ef..8a78071 100644
--- a/plugins/org.eclipse.jst.server.generic.core/schema/runtimedefinition.exsd
+++ b/plugins/org.eclipse.jst.server.generic.core/schema/runtimedefinition.exsd
@@ -112,8 +112,8 @@
          <meta.section type="copyright"/>
       </appInfo>
       <documentation>
-         Copyright (c) 2006 Cape Clear Software. 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
-&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+         Copyright (c) 2006 Cape Clear Software. 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
+&lt;a href=&quot;https://www.eclipse.org/legal/epl-2.0/&quot;&gt;https://www.eclipse.org/legal/epl-2.0/&lt;/a&gt;
       </documentation>
    </annotation>
 
diff --git a/plugins/org.eclipse.jst.server.generic.core/schema/serverdefinition.exsd b/plugins/org.eclipse.jst.server.generic.core/schema/serverdefinition.exsd
index 99331f8..471c739 100644
--- a/plugins/org.eclipse.jst.server.generic.core/schema/serverdefinition.exsd
+++ b/plugins/org.eclipse.jst.server.generic.core/schema/serverdefinition.exsd
@@ -113,8 +113,8 @@
          <meta.section type="copyright"/>
       </appInfo>
       <documentation>
-         Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. 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
-&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+         Copyright (c) 2005, 2006 Eteration A.S. and Gorkem Ercan. 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
+&lt;a href=&quot;https://www.eclipse.org/legal/epl-2.0/&quot;&gt;https://www.eclipse.org/legal/epl-2.0/&lt;/a&gt;
 
       </documentation>
    </annotation>
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/CorePlugin.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/CorePlugin.java
index f5cb0ef..88348e0 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/CorePlugin.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/CorePlugin.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * Copyright (c) 2005, 2006 Eteration A.S. and Gorkem Ercan. 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
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/ExternalDebugLaunchConfigurationDelegate.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/ExternalDebugLaunchConfigurationDelegate.java
index 5b344b9..6271d2d 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/ExternalDebugLaunchConfigurationDelegate.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/ExternalDebugLaunchConfigurationDelegate.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * Copyright (c) 2000, 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/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/ExternalLaunchConfigurationDelegate.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/ExternalLaunchConfigurationDelegate.java
index 2f5be9c..c8b8c81 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/ExternalLaunchConfigurationDelegate.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/ExternalLaunchConfigurationDelegate.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2005 BEA Systems, Inc. 
+ * Copyright (c) 2005, 2010 BEA Systems, 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:
  *    rfrost@bea.com
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/ExternalServerBehaviour.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/ExternalServerBehaviour.java
index 0521a19..81c7345 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/ExternalServerBehaviour.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/ExternalServerBehaviour.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2005 BEA Systems, Inc. 
+ * Copyright (c) 2005, 2009 BEA Systems, 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:
  *    rfrost@bea.com - initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericPublisher.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericPublisher.java
index faa8789..13d7587 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericPublisher.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericPublisher.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * Copyright (c) 2005, 2006 Eteration A.S. and Gorkem Ercan. 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
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServer.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServer.java
index 515c53d..0092fc2 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServer.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServer.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * Copyright (c) 2005, 2010 Eteration A.S. and Gorkem Ercan. 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
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerBehaviour.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerBehaviour.java
index a15a10f..101a1c6 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerBehaviour.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerBehaviour.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * Copyright (c) 2005, 2010 Eteration A.S. and Gorkem Ercan. 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
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerCoreMessages.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerCoreMessages.java
index 92fc4f3..3ebe256 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerCoreMessages.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerCoreMessages.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * Copyright (c) 2005, 2007 Eteration A.S. and Gorkem Ercan. 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
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerCoreMessages.properties b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerCoreMessages.properties
index dee685c..73ac0bd 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerCoreMessages.properties
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerCoreMessages.properties
@@ -1,8 +1,10 @@
 ###############################################################################
-# Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
-# accompanying materials are made available under the terms of the Eclipse Public License v1.0
+# Copyright (c) 2005, 2007 Eteration A.S. and Gorkem Ercan. 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
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors: Gorkem Ercan - initial API and implementation
 #               
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerLaunchConfigurationDelegate.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerLaunchConfigurationDelegate.java
index d067476..35ea076 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerLaunchConfigurationDelegate.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerLaunchConfigurationDelegate.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * Copyright (c) 2005, 2010 Eteration A.S. and Gorkem Ercan. 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
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerLaunchableAdapterDelegate.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerLaunchableAdapterDelegate.java
index 426eecb..43550f1 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerLaunchableAdapterDelegate.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerLaunchableAdapterDelegate.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * Copyright (c) 2005, 2006 Eteration A.S. and Gorkem Ercan. 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
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerRuntime.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerRuntime.java
index 488ef76..586371c 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerRuntime.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerRuntime.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * Copyright (c) 2005, 2010 Eteration A.S. and Gorkem Ercan. 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
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerRuntimeTargetHandler.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerRuntimeTargetHandler.java
index d00a1e0..299a124 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerRuntimeTargetHandler.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerRuntimeTargetHandler.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * Copyright (c) 2005, 2007 Eteration A.S. and Gorkem Ercan. 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
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerSourcePathComputerDelegate.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerSourcePathComputerDelegate.java
index 9bb4a62..457b20a 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerSourcePathComputerDelegate.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerSourcePathComputerDelegate.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * Copyright (c) 2005, 2010 Eteration A.S. and Gorkem Ercan. 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
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/PingThread.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/PingThread.java
index f8629a2..a05a019 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/PingThread.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/PingThread.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * Copyright (c) 2005, 2009 Eteration A.S. and Gorkem Ercan. 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
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/PublishManager.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/PublishManager.java
index 00272fe..ee9dd3b 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/PublishManager.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/PublishManager.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * Copyright (c) 2005, 2006 Eteration A.S. and Gorkem Ercan. 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
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/ServerTypeDefinitionManager.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/ServerTypeDefinitionManager.java
index e5b9fa2..b700ffb 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/ServerTypeDefinitionManager.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/ServerTypeDefinitionManager.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * Copyright (c) 2005, 2010 Eteration A.S. and Gorkem Ercan. 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
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/ServerTypeDefinitionUtil.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/ServerTypeDefinitionUtil.java
index fa562cd..4ed56e4 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/ServerTypeDefinitionUtil.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/ServerTypeDefinitionUtil.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * Copyright (c) 2005, 2010 Eteration A.S. and Gorkem Ercan. 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
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/Trace.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/Trace.java
index 843cd61..287d144 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/Trace.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/Trace.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005, 2009 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/publishers/AbstractModuleAssembler.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/publishers/AbstractModuleAssembler.java
index 4f4df26..d606002 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/publishers/AbstractModuleAssembler.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/publishers/AbstractModuleAssembler.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005, 2009 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/publishers/AntPublisher.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/publishers/AntPublisher.java
index 3e34add..d062613 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/publishers/AntPublisher.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/publishers/AntPublisher.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005, 2013 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/publishers/DefaultModuleAssembler.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/publishers/DefaultModuleAssembler.java
index 193ede8..034d1cb 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/publishers/DefaultModuleAssembler.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/publishers/DefaultModuleAssembler.java
@@ -1,9 +1,11 @@
 /***************************************************************************************************
  * Copyright (c) 2005, 2007 Eteration A.S. and Gorkem Ercan.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation 
  **************************************************************************************************/
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/publishers/EarModuleAssembler.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/publishers/EarModuleAssembler.java
index 1638307..147d810 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/publishers/EarModuleAssembler.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/publishers/EarModuleAssembler.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2009, 2010 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/publishers/ModulePackager.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/publishers/ModulePackager.java
index 83c1272..16c9373 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/publishers/ModulePackager.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/publishers/ModulePackager.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
-* Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
-* accompanying materials are made available under the terms of the Eclipse Public License v1.0
+* Copyright (c) 2005, 2009 Eteration A.S. and Gorkem Ercan. 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
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
 * 
 * Contributors: Gorkem Ercan - initial API and implementation
 *               
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/publishers/WarModuleAssembler.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/publishers/WarModuleAssembler.java
index 9899347..8193e2d 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/publishers/WarModuleAssembler.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/publishers/WarModuleAssembler.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005, 2010 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/util/ExtensionPointUtil.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/util/ExtensionPointUtil.java
index 0bf71ed..1426857 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/util/ExtensionPointUtil.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/util/ExtensionPointUtil.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * Copyright (c) 2005, 2010 Eteration A.S. and Gorkem Ercan. 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
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/util/FileUtil.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/util/FileUtil.java
index b61051a..c246633 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/util/FileUtil.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/util/FileUtil.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * Copyright (c) 2005, 2007 Eteration A.S. and Gorkem Ercan. 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
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/util/ServerRuntimeMergeUtil.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/util/ServerRuntimeMergeUtil.java
index 30db9e7..e23c1b1 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/util/ServerRuntimeMergeUtil.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/util/ServerRuntimeMergeUtil.java
@@ -1,8 +1,10 @@
 /**
- * Copyright (c) 2006 Cape Clear Software. All rights reserved.
+ * Copyright (c) 2006, 2010 Cape Clear Software. 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
+ * 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
  */
 package org.eclipse.jst.server.generic.internal.core.util;
 
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/files/DirectoryScanner.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/files/DirectoryScanner.java
index 736f31e..20d77bc 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/files/DirectoryScanner.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/files/DirectoryScanner.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
- * Copyright (c) 2007 Eteration A.S.  All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * Copyright (c) 2007, 2010 Eteration A.S.  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
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Naci Dai
  *               
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/ServerTypePackage.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/ServerTypePackage.java
index bfd4a4c..d2e2d06 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/ServerTypePackage.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/ServerTypePackage.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2019 IBM Corporation and others.
+ * 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
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 /**
  * <copyright>
  * </copyright>
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/ArchiveTypeImpl.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/ArchiveTypeImpl.java
index 25f6d5a..aea82fc 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/ArchiveTypeImpl.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/ArchiveTypeImpl.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005-2007 Eteration A.S. and Gorkem Ercan All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan
  * Contributors: Naci Dai
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/ArgumentPairImpl.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/ArgumentPairImpl.java
index 4bafdbd..0abb016 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/ArgumentPairImpl.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/ArgumentPairImpl.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005-2007 Eteration A.S. and Gorkem Ercan All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan
  * Contributors: Naci Dai
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/ClasspathImpl.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/ClasspathImpl.java
index 9a8213f..14c3f8d 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/ClasspathImpl.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/ClasspathImpl.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
- * Copyright (c) 2005-2007 Eteration A.S. and Gorkem Ercan All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * Copyright (c) 2005-2010 Eteration A.S. and Gorkem Ercan 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
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan
  * Contributors: Naci Dai
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/ExcludeTypeImpl.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/ExcludeTypeImpl.java
index 12a0b0f..cedd230 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/ExcludeTypeImpl.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/ExcludeTypeImpl.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005-2007 Eteration A.S. and Gorkem Ercan All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan
  * Contributors: Naci Dai
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/ExternalImpl.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/ExternalImpl.java
index 693e80f..9f386b3 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/ExternalImpl.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/ExternalImpl.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005-2007 Eteration A.S. and Gorkem Ercan All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan
  * Contributors: Naci Dai
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/FilesetTypeImpl.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/FilesetTypeImpl.java
index 6f30766..e71818d 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/FilesetTypeImpl.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/FilesetTypeImpl.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
- * Copyright (c) 2005-2007 Eteration A.S. and Gorkem Ercan All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * Copyright (c) 2005-2010 Eteration A.S. and Gorkem Ercan 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
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan
  * Contributors: Naci Dai
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/IncludeTypeImpl.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/IncludeTypeImpl.java
index d2f1386..4597700 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/IncludeTypeImpl.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/IncludeTypeImpl.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005-2007 Eteration A.S. and Gorkem Ercan All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan
  * Contributors: Naci Dai
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/JndiConnectionImpl.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/JndiConnectionImpl.java
index 8c78122..685a11d 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/JndiConnectionImpl.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/JndiConnectionImpl.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
- * Copyright (c) 2005-2007 Eteration A.S. and Gorkem Ercan All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * Copyright (c) 2005-2010 Eteration A.S. and Gorkem Ercan 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
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan
  * Contributors: Naci Dai
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/LaunchConfigurationImpl.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/LaunchConfigurationImpl.java
index ebb7ea3..aa00c73 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/LaunchConfigurationImpl.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/LaunchConfigurationImpl.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
- * Copyright (c) 2005-2007 Eteration A.S. and Gorkem Ercan All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * Copyright (c) 2005-2010 Eteration A.S. and Gorkem Ercan 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
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan
  * Contributors: Naci Dai
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/ModuleImpl.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/ModuleImpl.java
index 9a7c3a2..8f452fc 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/ModuleImpl.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/ModuleImpl.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005-2007 Eteration A.S. and Gorkem Ercan All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan
  * Contributors: Naci Dai
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/PortImpl.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/PortImpl.java
index 013a618..458275f 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/PortImpl.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/PortImpl.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005-2007 Eteration A.S. and Gorkem Ercan All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan
  * Contributors: Naci Dai
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/ProjectImpl.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/ProjectImpl.java
index 6601a40..7cd14c6 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/ProjectImpl.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/ProjectImpl.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005-2007 Eteration A.S. and Gorkem Ercan All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan
  * Contributors: Naci Dai
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/PropertyImpl.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/PropertyImpl.java
index 3e539e0..5e080eb 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/PropertyImpl.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/PropertyImpl.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005-2007 Eteration A.S. and Gorkem Ercan All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan
  * Contributors: Naci Dai
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/PublisherDataImpl.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/PublisherDataImpl.java
index e427afa..77f966c 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/PublisherDataImpl.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/PublisherDataImpl.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005-2007 Eteration A.S. and Gorkem Ercan All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan
  * Contributors: Naci Dai
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/PublisherImpl.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/PublisherImpl.java
index e9d752c..b9f282b 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/PublisherImpl.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/PublisherImpl.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
- * Copyright (c) 2005-2007 Eteration A.S. and Gorkem Ercan All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * Copyright (c) 2005-2010 Eteration A.S. and Gorkem Ercan 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
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan
  * Contributors: Naci Dai
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/ServerRuntimeImpl.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/ServerRuntimeImpl.java
index de4c7a7..b10c5a2 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/ServerRuntimeImpl.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/ServerRuntimeImpl.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
- * Copyright (c) 2005-2007 Eteration A.S. and Gorkem Ercan All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * Copyright (c) 2005-2010 Eteration A.S. and Gorkem Ercan 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
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan
  * Contributors: Naci Dai
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/ServerTypeFactoryImpl.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/ServerTypeFactoryImpl.java
index 6fc6beb..17ec5b2 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/ServerTypeFactoryImpl.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/ServerTypeFactoryImpl.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005-2007 Eteration A.S. and Gorkem Ercan All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan
  * Contributors: Naci Dai
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/ServerTypePackageImpl.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/ServerTypePackageImpl.java
index 2d83128..bb74717 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/ServerTypePackageImpl.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/impl/ServerTypePackageImpl.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005-2007 Eteration A.S. and Gorkem Ercan All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan
  * Contributors: Naci Dai
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/util/ServerTypeAdapterFactory.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/util/ServerTypeAdapterFactory.java
index 28a86a5..1de676c 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/util/ServerTypeAdapterFactory.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/util/ServerTypeAdapterFactory.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005-2007 Eteration A.S. and Gorkem Ercan All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan
  * Contributors: Naci Dai
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/util/ServerTypeResourceFactoryImpl.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/util/ServerTypeResourceFactoryImpl.java
index 6b499b6..d96198e 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/util/ServerTypeResourceFactoryImpl.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/util/ServerTypeResourceFactoryImpl.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005-2007 Eteration A.S. and Gorkem Ercan All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan
  * Contributors: Naci Dai
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/util/ServerTypeResourceImpl.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/util/ServerTypeResourceImpl.java
index 0556327..46376f0 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/util/ServerTypeResourceImpl.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/util/ServerTypeResourceImpl.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005-2007 Eteration A.S. and Gorkem Ercan All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan
  * Contributors: Naci Dai
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/util/ServerTypeSwitch.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/util/ServerTypeSwitch.java
index f5933e7..0d5a40b 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/util/ServerTypeSwitch.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/util/ServerTypeSwitch.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005-2007 Eteration A.S. and Gorkem Ercan All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan
  * Contributors: Naci Dai
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/util/ServerTypeXMLProcessor.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/util/ServerTypeXMLProcessor.java
index 7977881..19fbe35 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/util/ServerTypeXMLProcessor.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/servertype/definition/util/ServerTypeXMLProcessor.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
- * Copyright (c) 2005-2007 Eteration A.S. and Gorkem Ercan All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * Copyright (c) 2005-2010 Eteration A.S. and Gorkem Ercan 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
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan
  * Contributors: Naci Dai
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/Resolver.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/Resolver.java
index eb36864..86bccfa 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/Resolver.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/Resolver.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * Copyright (c) 2005, 2010 Eteration A.S. and Gorkem Ercan. 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
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/XMLUtils.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/XMLUtils.java
index 135044f..df6f349 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/XMLUtils.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/XMLUtils.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
- * Copyright (c) 2005,2009 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * Copyright (c) 2005,2010 Eteration A.S. and Gorkem Ercan. 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
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/ArchiveType.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/ArchiveType.java
index dc9acb3..c920070 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/ArchiveType.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/ArchiveType.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005-2007 Eteration A.S. and Gorkem Ercan All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan
  * Contributors: Naci Dai
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/ArgumentPair.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/ArgumentPair.java
index 932c9cd..b60b39e 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/ArgumentPair.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/ArgumentPair.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005-2007 Eteration A.S. and Gorkem Ercan All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan
  * Contributors: Naci Dai
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/Classpath.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/Classpath.java
index 6e4931e..a6faeba 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/Classpath.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/Classpath.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005-2007 Eteration A.S. and Gorkem Ercan All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan
  * Contributors: Naci Dai
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/ExcludeType.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/ExcludeType.java
index a6f0144..4a8b163 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/ExcludeType.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/ExcludeType.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005-2007 Eteration A.S. and Gorkem Ercan All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan
  * Contributors: Naci Dai
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/External.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/External.java
index fcb9a43..0cf0b49 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/External.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/External.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005-2007 Eteration A.S. and Gorkem Ercan All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan
  * Contributors: Naci Dai
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/FilesetType.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/FilesetType.java
index f87a912..c3a4b29 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/FilesetType.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/FilesetType.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005-2007 Eteration A.S. and Gorkem Ercan All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan
  * Contributors: Naci Dai
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/IncludeType.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/IncludeType.java
index a823df0..0685ab7 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/IncludeType.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/IncludeType.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005-2007 Eteration A.S. and Gorkem Ercan All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan
  * Contributors: Naci Dai
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/JndiConnection.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/JndiConnection.java
index 67dc6b5..0d3385c 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/JndiConnection.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/JndiConnection.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005-2007 Eteration A.S. and Gorkem Ercan All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan
  * Contributors: Naci Dai
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/LaunchConfiguration.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/LaunchConfiguration.java
index a1f63cd..59e0084 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/LaunchConfiguration.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/LaunchConfiguration.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005-2007 Eteration A.S. and Gorkem Ercan All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan
  * Contributors: Naci Dai
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/Module.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/Module.java
index 93b8538..5139fbd 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/Module.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/Module.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005-2007 Eteration A.S. and Gorkem Ercan All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan
  * Contributors: Naci Dai
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/Port.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/Port.java
index e926b9d..440dbd5 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/Port.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/Port.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005-2007 Eteration A.S. and Gorkem Ercan All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan
  * Contributors: Naci Dai
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/Project.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/Project.java
index 4e2dc0b..a11293c 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/Project.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/Project.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005-2007 Eteration A.S. and Gorkem Ercan All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan
  * Contributors: Naci Dai
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/Property.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/Property.java
index b000aff..39e7d6b 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/Property.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/Property.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005-2007 Eteration A.S. and Gorkem Ercan All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan
  * Contributors: Naci Dai
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/Publisher.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/Publisher.java
index a8025c7..9b2ace4 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/Publisher.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/Publisher.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005-2007 Eteration A.S. and Gorkem Ercan All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan
  * Contributors: Naci Dai
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/PublisherData.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/PublisherData.java
index 37ff32b..66ea7b7 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/PublisherData.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/PublisherData.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005-2007 Eteration A.S. and Gorkem Ercan All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan
  * Contributors: Naci Dai
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/ServerRuntime.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/ServerRuntime.java
index dda7edb..6368f91 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/ServerRuntime.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/ServerRuntime.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005-2007 Eteration A.S. and Gorkem Ercan All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan
  * Contributors: Naci Dai
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/ServerTypeFactory.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/ServerTypeFactory.java
index e1be923..d8f969d 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/ServerTypeFactory.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/servertype/definition/ServerTypeFactory.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005-2007 Eteration A.S. and Gorkem Ercan All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan
  * Contributors: Naci Dai
diff --git a/plugins/org.eclipse.jst.server.generic.jboss/about.html b/plugins/org.eclipse.jst.server.generic.jboss/about.html
index 2199df3..454947c 100644
--- a/plugins/org.eclipse.jst.server.generic.jboss/about.html
+++ b/plugins/org.eclipse.jst.server.generic.jboss/about.html
@@ -18,7 +18,7 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/plugins/org.eclipse.jst.server.generic.jboss/build.properties b/plugins/org.eclipse.jst.server.generic.jboss/build.properties
index 6271748..1ae58a3 100644
--- a/plugins/org.eclipse.jst.server.generic.jboss/build.properties
+++ b/plugins/org.eclipse.jst.server.generic.jboss/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2005, 2006 Eteration A.S. and Gorkem Ercan.
+# Copyright (c) 2005, 2009 Eteration A.S. and Gorkem Ercan.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors: Gorkem Ercan - initial API and implementation
 ###############################################################################
diff --git a/plugins/org.eclipse.jst.server.generic.jboss/buildfiles/jboss323.xml b/plugins/org.eclipse.jst.server.generic.jboss/buildfiles/jboss323.xml
index 6dbf60f..c823b73 100644
--- a/plugins/org.eclipse.jst.server.generic.jboss/buildfiles/jboss323.xml
+++ b/plugins/org.eclipse.jst.server.generic.jboss/buildfiles/jboss323.xml
@@ -1,3 +1,15 @@
+<!--
+    Copyright (c) 2006, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
 <project name="deployextension"  default="deploy.j2ee.web"  basedir=".">
 	<property name="pause.deploy" value="10"/>
 	<property name="pause.undeploy" value="5"/>
diff --git a/plugins/org.eclipse.jst.server.generic.jboss/plugin.properties b/plugins/org.eclipse.jst.server.generic.jboss/plugin.properties
index 39ca5b8..219dd14 100644
--- a/plugins/org.eclipse.jst.server.generic.jboss/plugin.properties
+++ b/plugins/org.eclipse.jst.server.generic.jboss/plugin.properties
@@ -1,8 +1,10 @@
 ##################################################################################################
-# Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
-# accompanying materials are made available under the terms of the Eclipse Public License v1.0
+# Copyright (c) 2005, 2007 Eteration A.S. and Gorkem Ercan. 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
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors: Gorkem Ercan - initial API and implementation
 #               
diff --git a/plugins/org.eclipse.jst.server.generic.jboss/pom.xml b/plugins/org.eclipse.jst.server.generic.jboss/pom.xml
index 6b43877..3f750f2 100644
--- a/plugins/org.eclipse.jst.server.generic.jboss/pom.xml
+++ b/plugins/org.eclipse.jst.server.generic.jboss/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2012, 2013 Eclipse Foundation and others.
+  Copyright (c) 2012, 2014 Eclipse Foundation and others.
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Distribution License v1.0
   which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.jst.server.generic.jonas/about.html b/plugins/org.eclipse.jst.server.generic.jonas/about.html
index 2199df3..454947c 100644
--- a/plugins/org.eclipse.jst.server.generic.jonas/about.html
+++ b/plugins/org.eclipse.jst.server.generic.jonas/about.html
@@ -18,7 +18,7 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/plugins/org.eclipse.jst.server.generic.jonas/build.properties b/plugins/org.eclipse.jst.server.generic.jonas/build.properties
index 179f110..777dedc 100644
--- a/plugins/org.eclipse.jst.server.generic.jonas/build.properties
+++ b/plugins/org.eclipse.jst.server.generic.jonas/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2005, 2006 Eteration A.S. and Gorkem Ercan.
+# Copyright (c) 2005, 2009 Eteration A.S. and Gorkem Ercan.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors: Gorkem Ercan - initial API and implementation
 ###############################################################################
diff --git a/plugins/org.eclipse.jst.server.generic.jonas/buildfiles/jonas.xml b/plugins/org.eclipse.jst.server.generic.jonas/buildfiles/jonas.xml
index df582a1..88098bf 100644
--- a/plugins/org.eclipse.jst.server.generic.jonas/buildfiles/jonas.xml
+++ b/plugins/org.eclipse.jst.server.generic.jonas/buildfiles/jonas.xml
@@ -1,3 +1,15 @@
+<!--
+    Copyright (c) 2006, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
 <project name="deployextension"  default="deploy.j2ee.web"  basedir=".">
 
 	<property name="jonas.root" value="${jonasRoot}"/>
diff --git a/plugins/org.eclipse.jst.server.generic.jonas/plugin.properties b/plugins/org.eclipse.jst.server.generic.jonas/plugin.properties
index 8c5467e..26f09b9 100644
--- a/plugins/org.eclipse.jst.server.generic.jonas/plugin.properties
+++ b/plugins/org.eclipse.jst.server.generic.jonas/plugin.properties
@@ -1,8 +1,10 @@
 ##################################################################################################
-# Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
-# accompanying materials are made available under the terms of the Eclipse Public License v1.0
+# Copyright (c) 2005, 2006 Eteration A.S. and Gorkem Ercan. 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
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors: Gorkem Ercan - initial API and implementation
 #               
diff --git a/plugins/org.eclipse.jst.server.generic.jonas/pom.xml b/plugins/org.eclipse.jst.server.generic.jonas/pom.xml
index e5d4c9f..4d92819 100644
--- a/plugins/org.eclipse.jst.server.generic.jonas/pom.xml
+++ b/plugins/org.eclipse.jst.server.generic.jonas/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2012, 2013 Eclipse Foundation and others.
+  Copyright (c) 2012, 2014 Eclipse Foundation and others.
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Distribution License v1.0
   which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.jst.server.generic.oc4j/about.html b/plugins/org.eclipse.jst.server.generic.oc4j/about.html
index 2199df3..454947c 100644
--- a/plugins/org.eclipse.jst.server.generic.oc4j/about.html
+++ b/plugins/org.eclipse.jst.server.generic.oc4j/about.html
@@ -18,7 +18,7 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/plugins/org.eclipse.jst.server.generic.oc4j/build.properties b/plugins/org.eclipse.jst.server.generic.oc4j/build.properties
index ca37d55..6170216 100644
--- a/plugins/org.eclipse.jst.server.generic.oc4j/build.properties
+++ b/plugins/org.eclipse.jst.server.generic.oc4j/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2005, 2006 Eteration A.S. and Gorkem Ercan.
+# Copyright (c) 2005, 2009 Eteration A.S. and Gorkem Ercan.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors: Gorkem Ercan - initial API and implementation
 ###############################################################################
diff --git a/plugins/org.eclipse.jst.server.generic.oc4j/buildfiles/oracle.10.1.3.xml b/plugins/org.eclipse.jst.server.generic.oc4j/buildfiles/oracle.10.1.3.xml
index 33e460c..f29f5b8 100644
--- a/plugins/org.eclipse.jst.server.generic.oc4j/buildfiles/oracle.10.1.3.xml
+++ b/plugins/org.eclipse.jst.server.generic.oc4j/buildfiles/oracle.10.1.3.xml
@@ -1,3 +1,15 @@
+<!--
+    Copyright (c) 2006, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
 <project name="publish"  basedir="." xmlns:oracle="antlib:oracle">
 	<import file="oracle/ant-oracle.xml"/>
 		
diff --git a/plugins/org.eclipse.jst.server.generic.oc4j/buildfiles/oracle/ant-oracle.1013dp4.xml b/plugins/org.eclipse.jst.server.generic.oc4j/buildfiles/oracle/ant-oracle.1013dp4.xml
index cfe8599..7d84ede 100644
--- a/plugins/org.eclipse.jst.server.generic.oc4j/buildfiles/oracle/ant-oracle.1013dp4.xml
+++ b/plugins/org.eclipse.jst.server.generic.oc4j/buildfiles/oracle/ant-oracle.1013dp4.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
+<!--
+    Copyright (c) 2006, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <project name="anttasks">
 
     <!--This file has been modified for use by the Oracle Eclipse WTP plugin. 	-->
diff --git a/plugins/org.eclipse.jst.server.generic.oc4j/buildfiles/oracle/ant-oracle.xml b/plugins/org.eclipse.jst.server.generic.oc4j/buildfiles/oracle/ant-oracle.xml
index 8178083..664021f 100644
--- a/plugins/org.eclipse.jst.server.generic.oc4j/buildfiles/oracle/ant-oracle.xml
+++ b/plugins/org.eclipse.jst.server.generic.oc4j/buildfiles/oracle/ant-oracle.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
+<!--
+    Copyright (c) 2006, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <project name="anttasks">
 
     <!--This file has been modified for use by the Oracle Eclipse WTP plugin. 	-->    
diff --git a/plugins/org.eclipse.jst.server.generic.oc4j/plugin.properties b/plugins/org.eclipse.jst.server.generic.oc4j/plugin.properties
index d4200fa..1203585 100644
--- a/plugins/org.eclipse.jst.server.generic.oc4j/plugin.properties
+++ b/plugins/org.eclipse.jst.server.generic.oc4j/plugin.properties
@@ -1,8 +1,10 @@
 ##################################################################################################
 # Copyright (c) 2005, 2009 Eteration A.S. and Gorkem Ercan in collaboration of others. All rights reserved. This program and the
-# accompanying materials are made available under the terms of the Eclipse Public License v1.0
+# accompanying materials are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors: Gorkem Ercan - initial API and implementation
 # 				Angel Vera - corrections
diff --git a/plugins/org.eclipse.jst.server.generic.oc4j/pom.xml b/plugins/org.eclipse.jst.server.generic.oc4j/pom.xml
index 6625db2..52e12e6 100644
--- a/plugins/org.eclipse.jst.server.generic.oc4j/pom.xml
+++ b/plugins/org.eclipse.jst.server.generic.oc4j/pom.xml
@@ -8,7 +8,7 @@
  

   Contributors:

     Thanh Ha (Eclipse Foundation) - initial implementation

--->

+-->
 

 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"

     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

diff --git a/plugins/org.eclipse.jst.server.generic.ui/about.html b/plugins/org.eclipse.jst.server.generic.ui/about.html
index 2199df3..454947c 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/about.html
+++ b/plugins/org.eclipse.jst.server.generic.ui/about.html
@@ -18,7 +18,7 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/plugins/org.eclipse.jst.server.generic.ui/build.properties b/plugins/org.eclipse.jst.server.generic.ui/build.properties
index a237ec7..e4101ca 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/build.properties
+++ b/plugins/org.eclipse.jst.server.generic.ui/build.properties
@@ -1,8 +1,10 @@
 ##################################################################################################
-# Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
-# accompanying materials are made available under the terms of the Eclipse Public License v1.0
+# Copyright (c) 2005, 2009 Eteration A.S. and Gorkem Ercan. 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
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors: Gorkem Ercan - initial API and implementation
 #               
diff --git a/plugins/org.eclipse.jst.server.generic.ui/plugin.properties b/plugins/org.eclipse.jst.server.generic.ui/plugin.properties
index a105be1..e0c4062 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/plugin.properties
+++ b/plugins/org.eclipse.jst.server.generic.ui/plugin.properties
@@ -1,8 +1,10 @@
 ##################################################################################################
 # Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
-# accompanying materials are made available under the terms of the Eclipse Public License v1.0
+# accompanying materials are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors: Gorkem Ercan - initial API and implementation
 #               
diff --git a/plugins/org.eclipse.jst.server.generic.ui/pom.xml b/plugins/org.eclipse.jst.server.generic.ui/pom.xml
index 53407ea..40b9e29 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/pom.xml
+++ b/plugins/org.eclipse.jst.server.generic.ui/pom.xml
@@ -8,7 +8,7 @@
  

   Contributors:

     Thanh Ha (Eclipse Foundation) - initial implementation

--->

+-->
 

 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"

     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/AntPublisherPropertyTester.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/AntPublisherPropertyTester.java
index 324b647..916c2e8 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/AntPublisherPropertyTester.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/AntPublisherPropertyTester.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2007 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ExternalLaunchConfigurationTabGroup.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ExternalLaunchConfigurationTabGroup.java
index 748cbb7..0556b1a 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ExternalLaunchConfigurationTabGroup.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ExternalLaunchConfigurationTabGroup.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * Copyright (c) 2005, 2007 Eteration A.S. and Gorkem Ercan. 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
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericLaunchConfigurationTabGroup.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericLaunchConfigurationTabGroup.java
index aeeae67..e7a70d2 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericLaunchConfigurationTabGroup.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericLaunchConfigurationTabGroup.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * Copyright (c) 2005, 2007 Eteration A.S. and Gorkem Ercan. 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
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerComposite.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerComposite.java
index 699369b..164f47c 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerComposite.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerComposite.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerCompositeDecorator.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerCompositeDecorator.java
index 2f238c6..afcd277 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerCompositeDecorator.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerCompositeDecorator.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * Copyright (c) 2005, 2006 Eteration A.S. and Gorkem Ercan. 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
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerRuntimeWizardFragment.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerRuntimeWizardFragment.java
index 841589d..2465883 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerRuntimeWizardFragment.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerRuntimeWizardFragment.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * Copyright (c) 2005, 2007 Eteration A.S. and Gorkem Ercan. 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
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerUIMessages.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerUIMessages.java
index 751d7ef..80b7966 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerUIMessages.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerUIMessages.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * Copyright (c) 2005, 2007 Eteration A.S. and Gorkem Ercan. 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
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerUIMessages.properties b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerUIMessages.properties
index fff2dc0..50bd409 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerUIMessages.properties
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerUIMessages.properties
@@ -3,10 +3,12 @@
 AntPublisherSectionHeading=Ant Publisher Properties
 ButtonBrowseForBuildFile=Browse...
 ##################################################################################################
-# Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
-# accompanying materials are made available under the terms of the Eclipse Public License v1.0
+# Copyright (c) 2005, 2007 Eteration A.S. and Gorkem Ercan. 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
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors: Gorkem Ercan - initial API and implementation
 #               
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerWizardFragment.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerWizardFragment.java
index 59f3940..b7c2b24 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerWizardFragment.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerWizardFragment.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * Copyright (c) 2005, 2009 Eteration A.S. and Gorkem Ercan. 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
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericUiPlugin.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericUiPlugin.java
index d56c219..bff10e4 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericUiPlugin.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericUiPlugin.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * Copyright (c) 2005, 2006 Eteration A.S. and Gorkem Ercan. 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
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/InstallableRuntimeDecorator.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/InstallableRuntimeDecorator.java
index e25a35d..e14d149 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/InstallableRuntimeDecorator.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/InstallableRuntimeDecorator.java
@@ -1,9 +1,11 @@
 /***************************************************************************************************
  * Copyright (c) 2005, 2007 Eteration A.S. and Gorkem Ercan.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation 
  **************************************************************************************************/
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/JRESelectDecorator.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/JRESelectDecorator.java
index 4675518..c53dc50 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/JRESelectDecorator.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/JRESelectDecorator.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * Copyright (c) 2005, 2007 Eteration A.S. and Gorkem Ercan. 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
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/SWTUtil.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/SWTUtil.java
index 925ab61..ee0c660 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/SWTUtil.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/SWTUtil.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005, 2009 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerDefinitionTypeAwareWizardFragment.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerDefinitionTypeAwareWizardFragment.java
index 1132884..0086d9e 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerDefinitionTypeAwareWizardFragment.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerDefinitionTypeAwareWizardFragment.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * Copyright (c) 2005, 2006 Eteration A.S. and Gorkem Ercan. 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
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerTypeDefinitionDecorator.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerTypeDefinitionDecorator.java
index 70bcdf4..22f37f9 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerTypeDefinitionDecorator.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerTypeDefinitionDecorator.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * Copyright (c) 2005, 2007 Eteration A.S. and Gorkem Ercan. 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
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerTypeDefinitionRuntimeDecorator.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerTypeDefinitionRuntimeDecorator.java
index 012c929..95332fa 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerTypeDefinitionRuntimeDecorator.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerTypeDefinitionRuntimeDecorator.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * Copyright (c) 2005, 2007 Eteration A.S. and Gorkem Ercan. 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
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerTypeDefinitionServerDecorator.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerTypeDefinitionServerDecorator.java
index 71a8ca9..34fa262 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerTypeDefinitionServerDecorator.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerTypeDefinitionServerDecorator.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * Copyright (c) 2005, 2006 Eteration A.S. and Gorkem Ercan. 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
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/editor/AntBuildFileSelectionEditorSection.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/editor/AntBuildFileSelectionEditorSection.java
index 44c9f73..6c8e90a 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/editor/AntBuildFileSelectionEditorSection.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/editor/AntBuildFileSelectionEditorSection.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2007,2017 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/editor/ServerPropertiesEditorSection.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/editor/ServerPropertiesEditorSection.java
index 8d6a892..d34814a 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/editor/ServerPropertiesEditorSection.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/editor/ServerPropertiesEditorSection.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2007,2017 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/editor/UpdateServerPropertyOperation.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/editor/UpdateServerPropertyOperation.java
index e67743a..8703f41 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/editor/UpdateServerPropertyOperation.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/editor/UpdateServerPropertyOperation.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2007 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.pde/about.html b/plugins/org.eclipse.jst.server.pde/about.html
index 4ec5989..cb79af8 100644
--- a/plugins/org.eclipse.jst.server.pde/about.html
+++ b/plugins/org.eclipse.jst.server.pde/about.html
@@ -18,7 +18,7 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/plugins/org.eclipse.jst.server.pde/build.properties b/plugins/org.eclipse.jst.server.pde/build.properties
index 1393183..5f05e20 100644
--- a/plugins/org.eclipse.jst.server.pde/build.properties
+++ b/plugins/org.eclipse.jst.server.pde/build.properties
@@ -1,8 +1,10 @@
 ##################################################################################################
 # Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
-# accompanying materials are made available under the terms of the Eclipse Public License v1.0
+# accompanying materials are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors: Gorkem Ercan - initial API and implementation
 #               
diff --git a/plugins/org.eclipse.jst.server.pde/build.xml b/plugins/org.eclipse.jst.server.pde/build.xml
index 4f086d4..cb7392c 100644
--- a/plugins/org.eclipse.jst.server.pde/build.xml
+++ b/plugins/org.eclipse.jst.server.pde/build.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2005, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <project name="org.eclipse.jst.server.generic.pde" default="build.jars" basedir=".">
 
 	<property name="basews" value="${ws}"/>
diff --git a/plugins/org.eclipse.jst.server.pde/plugin.properties b/plugins/org.eclipse.jst.server.pde/plugin.properties
index 4959a56..f21af03 100644
--- a/plugins/org.eclipse.jst.server.pde/plugin.properties
+++ b/plugins/org.eclipse.jst.server.pde/plugin.properties
@@ -1,8 +1,10 @@
 ##################################################################################################
 # Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
-# accompanying materials are made available under the terms of the Eclipse Public License v1.0
+# accompanying materials are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors: Gorkem Ercan - initial API and implementation
 #               
diff --git a/plugins/org.eclipse.jst.server.pde/pom.xml b/plugins/org.eclipse.jst.server.pde/pom.xml
index 8d458fc..9628da7 100644
--- a/plugins/org.eclipse.jst.server.pde/pom.xml
+++ b/plugins/org.eclipse.jst.server.pde/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

-  Copyright (c) 2012, 2013 Eclipse Foundation and others.

+  Copyright (c) 2012, 2018 Eclipse Foundation and others.

   All rights reserved. This program and the accompanying materials

   are made available under the terms of the Eclipse Distribution License v1.0

   which accompanies this distribution, and is available at

@@ -8,7 +8,7 @@
  

   Contributors:

     Thanh Ha (Eclipse Foundation) - initial implementation

--->

+-->
 

 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"

     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

diff --git a/plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/ServerPdePlugin.java b/plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/ServerPdePlugin.java
index c1d8770..f752331 100644
--- a/plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/ServerPdePlugin.java
+++ b/plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/ServerPdePlugin.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/GenericServerPluginNewWizard.java b/plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/GenericServerPluginNewWizard.java
index 0cda4ac..9e50388 100644
--- a/plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/GenericServerPluginNewWizard.java
+++ b/plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/GenericServerPluginNewWizard.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/GenericServerTemplate.java b/plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/GenericServerTemplate.java
index 922ac38..e50c3f5 100644
--- a/plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/GenericServerTemplate.java
+++ b/plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/GenericServerTemplate.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/Messages.java b/plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/Messages.java
index 2f357ea..1cc3742 100644
--- a/plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/Messages.java
+++ b/plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/Messages.java
@@ -1,8 +1,10 @@
 /***************************************************************************************************
  * Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Gorkem Ercan - initial API and implementation
  *               
diff --git a/plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/messages.properties b/plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/messages.properties
index 5890ce9..8bdceaa 100644
--- a/plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/messages.properties
+++ b/plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/messages.properties
@@ -1,8 +1,10 @@
 ##################################################################################################
 # Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the
-# accompanying materials are made available under the terms of the Eclipse Public License v1.0
+# accompanying materials are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors: Gorkem Ercan - initial API and implementation
 #               
diff --git a/plugins/org.eclipse.jst.server.pde/templates_3.0/genericserver/buildfiles/$server_name$.xml b/plugins/org.eclipse.jst.server.pde/templates_3.0/genericserver/buildfiles/$server_name$.xml
index f720ca4..d58bf3c 100644
--- a/plugins/org.eclipse.jst.server.pde/templates_3.0/genericserver/buildfiles/$server_name$.xml
+++ b/plugins/org.eclipse.jst.server.pde/templates_3.0/genericserver/buildfiles/$server_name$.xml
@@ -1,3 +1,15 @@
+<!--
+    Copyright (c) 2005, 2019 IBM Corporation and others.
+    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
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
 <project name="deployextension"  default="deploy.j2ee.web"  basedir=".">
 	<target name="deploy.j2ee.web">
 		<jar destfile="${project.working.dir}/${module.name}.war"> 
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/about.html b/plugins/org.eclipse.jst.server.preview.adapter/about.html
index 2199df3..454947c 100644
--- a/plugins/org.eclipse.jst.server.preview.adapter/about.html
+++ b/plugins/org.eclipse.jst.server.preview.adapter/about.html
@@ -18,7 +18,7 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/build.properties b/plugins/org.eclipse.jst.server.preview.adapter/build.properties
index 2af08b5..e91bdec 100644
--- a/plugins/org.eclipse.jst.server.preview.adapter/build.properties
+++ b/plugins/org.eclipse.jst.server.preview.adapter/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2007 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/plugin.properties b/plugins/org.eclipse.jst.server.preview.adapter/plugin.properties
index 7740776..37db99d 100644
--- a/plugins/org.eclipse.jst.server.preview.adapter/plugin.properties
+++ b/plugins/org.eclipse.jst.server.preview.adapter/plugin.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2007 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/pom.xml b/plugins/org.eclipse.jst.server.preview.adapter/pom.xml
index 0499625..86436e9 100644
--- a/plugins/org.eclipse.jst.server.preview.adapter/pom.xml
+++ b/plugins/org.eclipse.jst.server.preview.adapter/pom.xml
@@ -8,7 +8,7 @@
  

   Contributors:

     Thanh Ha (Eclipse Foundation) - initial implementation

--->

+-->
 

 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"

     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

diff --git a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/IMemento.java b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/IMemento.java
index 9e6a2d6..bb60e94 100644
--- a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/IMemento.java
+++ b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/IMemento.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2003, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/Messages.java b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/Messages.java
index f6833cd..9844fcf 100644
--- a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/Messages.java
+++ b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/Messages.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2009 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *    IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/Messages.properties b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/Messages.properties
index e329bfb..d4360dd 100644
--- a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/Messages.properties
+++ b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/Messages.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2007, 2009 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/PreviewPlugin.java b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/PreviewPlugin.java
index 6020f2c..e447cf0 100644
--- a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/PreviewPlugin.java
+++ b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/PreviewPlugin.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/ProgressUtil.java b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/ProgressUtil.java
index e42adf2..ecd5102 100644
--- a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/ProgressUtil.java
+++ b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/ProgressUtil.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/Trace.java b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/Trace.java
index 29b7081..0249a44 100644
--- a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/Trace.java
+++ b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/Trace.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/XMLMemento.java b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/XMLMemento.java
index 61a932b..735b94a 100644
--- a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/XMLMemento.java
+++ b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/XMLMemento.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PingThread.java b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PingThread.java
index e03d835..c2a0b21 100644
--- a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PingThread.java
+++ b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PingThread.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2007, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewLaunchConfigurationDelegate.java b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewLaunchConfigurationDelegate.java
index d3c892a..b6b04b2 100644
--- a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewLaunchConfigurationDelegate.java
+++ b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewLaunchConfigurationDelegate.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2018 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewLaunchableAdapterDelegate.java b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewLaunchableAdapterDelegate.java
index c074d8c..93350e9 100644
--- a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewLaunchableAdapterDelegate.java
+++ b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewLaunchableAdapterDelegate.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewRuntime.java b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewRuntime.java
index 0c3bfc9..099e09d 100644
--- a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewRuntime.java
+++ b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewRuntime.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewRuntimeClasspathProvider.java b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewRuntimeClasspathProvider.java
index 990694d..fd46ad4 100644
--- a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewRuntimeClasspathProvider.java
+++ b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewRuntimeClasspathProvider.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2018 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewServer.java b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewServer.java
index a5169ce..f63b9e5 100644
--- a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewServer.java
+++ b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewServer.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewServerBehaviour.java b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewServerBehaviour.java
index 722b601..a1a18cb 100644
--- a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewServerBehaviour.java
+++ b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewServerBehaviour.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2018 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewSourcePathComputerDelegate.java b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewSourcePathComputerDelegate.java
index b6615d0..8f1fa0f 100644
--- a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewSourcePathComputerDelegate.java
+++ b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewSourcePathComputerDelegate.java
@@ -1,9 +1,11 @@
 /**********************************************************************
  * Copyright (c) 2007, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *    IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewStartup.java b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewStartup.java
index 627f528..c3a49ea 100644
--- a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewStartup.java
+++ b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewStartup.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/ui/PreviewLaunchConfigurationTabGroup.java b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/ui/PreviewLaunchConfigurationTabGroup.java
index bf3730d..b43dc4a 100644
--- a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/ui/PreviewLaunchConfigurationTabGroup.java
+++ b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/ui/PreviewLaunchConfigurationTabGroup.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/about.html b/plugins/org.eclipse.jst.server.tomcat.core/about.html
index 2199df3..454947c 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/about.html
+++ b/plugins/org.eclipse.jst.server.tomcat.core/about.html
@@ -18,7 +18,7 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/build.properties b/plugins/org.eclipse.jst.server.tomcat.core/build.properties
index dd202d4..0e3bf87 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/build.properties
+++ b/plugins/org.eclipse.jst.server.tomcat.core/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2004, 2010 IBM Corporation and others.
+# Copyright (c) 2004, 2011 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/plugin.properties b/plugins/org.eclipse.jst.server.tomcat.core/plugin.properties
index f20c5a4..681b9f7 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/plugin.properties
+++ b/plugins/org.eclipse.jst.server.tomcat.core/plugin.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2004, 2016 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/pom.xml b/plugins/org.eclipse.jst.server.tomcat.core/pom.xml
index 811cd8a..e735a42 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/pom.xml
+++ b/plugins/org.eclipse.jst.server.tomcat.core/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2012, 2016 Eclipse Foundation and others.
+  Copyright (c) 2012, 2018 Eclipse Foundation and others.
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Distribution License v1.0
   which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/CatalinaPropertiesUtil.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/CatalinaPropertiesUtil.java
index 4c96c47..5951861 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/CatalinaPropertiesUtil.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/CatalinaPropertiesUtil.java
@@ -1,9 +1,11 @@
 /**********************************************************************
  * Copyright (c) 2007, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *    Igor Fedorenko & Fabrizio Giustina - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ClassDetector.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ClassDetector.java
index 2ff8737..92b22c4 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ClassDetector.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ClassDetector.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ConfigurationResourceListener.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ConfigurationResourceListener.java
index 2474b4a..84649bd 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ConfigurationResourceListener.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ConfigurationResourceListener.java
@@ -1,9 +1,11 @@
 /**********************************************************************
  * Copyright (c) 2011 SAS Institute, 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:
  *    SAS Institute, Inc - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/FileUtil.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/FileUtil.java
index d0301e4..f3455bd 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/FileUtil.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/FileUtil.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2003, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/IMimeMapping.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/IMimeMapping.java
index ee5946f..1fd24b4 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/IMimeMapping.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/IMimeMapping.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ITomcatConfiguration.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ITomcatConfiguration.java
index b9bada1..42fd14d 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ITomcatConfiguration.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ITomcatConfiguration.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ITomcatConfigurationWorkingCopy.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ITomcatConfigurationWorkingCopy.java
index 510d77e..c7b6876 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ITomcatConfigurationWorkingCopy.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ITomcatConfigurationWorkingCopy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ITomcatRuntime.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ITomcatRuntime.java
index 884151c..c31a6b8 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ITomcatRuntime.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ITomcatRuntime.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2004, 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/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ITomcatRuntimeWorkingCopy.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ITomcatRuntimeWorkingCopy.java
index b5e9394..a1adce1 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ITomcatRuntimeWorkingCopy.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ITomcatRuntimeWorkingCopy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ITomcatServer.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ITomcatServer.java
index af255f4..aa652fa 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ITomcatServer.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ITomcatServer.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2012 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *    IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ITomcatServerBehaviour.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ITomcatServerBehaviour.java
index eba573b..2a7e180 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ITomcatServerBehaviour.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ITomcatServerBehaviour.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ITomcatServerWorkingCopy.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ITomcatServerWorkingCopy.java
index 39829a2..d4b23c1 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ITomcatServerWorkingCopy.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ITomcatServerWorkingCopy.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2012 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *    IBM Corporation - Initial API and implementation
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ITomcatVersionHandler.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ITomcatVersionHandler.java
index 7d85b26..b7b7492 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ITomcatVersionHandler.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ITomcatVersionHandler.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2011 IBM Corporation and others.
+ * Copyright (c) 2003, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html