526469: Move the Virgo Tooling to the new EPL v2.0 

Changes:
- replaces Java source header with EPL 2.0 header
- replace MANIFES.MF and plugin.xml header with EPL 2.0 header
- Change about.html, license.html etc. etc. 
- Change branding
- Build against Oxygen
- Change feature to include some more plug-ins from runtime or Orbit
  to simplify installation for end user
diff --git a/org.eclipse.virgo.ide.bundlor.core/about.html b/org.eclipse.virgo.ide.bundlor.core/about.html
index 2abb573..164f781 100644
--- a/org.eclipse.virgo.ide.bundlor.core/about.html
+++ b/org.eclipse.virgo.ide.bundlor.core/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>April 13, 2012</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.virgo.ide.bundlor.core/plugin.xml b/org.eclipse.virgo.ide.bundlor.core/plugin.xml
index a168423..0c25da1 100644
--- a/org.eclipse.virgo.ide.bundlor.core/plugin.xml
+++ b/org.eclipse.virgo.ide.bundlor.core/plugin.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.2"?>
 <!--
-/*******************************************************************************
- * Copyright (c) 2007, 2012 SpringSource
- * 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:
- *     SpringSource - initial API and implementation
- *******************************************************************************/
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc. and others.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 -->
 <plugin>
    
diff --git a/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/BundlorCorePlugin.java b/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/BundlorCorePlugin.java
index d37d09f..abb874f 100644
--- a/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/BundlorCorePlugin.java
+++ b/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/BundlorCorePlugin.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009 - 2013 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009 - 2013 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.bundlor.internal.core;
 
diff --git a/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/BundlorProjectBuilder.java b/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/BundlorProjectBuilder.java
index 24769ea..19a20b5 100644
--- a/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/BundlorProjectBuilder.java
+++ b/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/BundlorProjectBuilder.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009 - 2013 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009 - 2013 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.bundlor.internal.core;
 
diff --git a/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/IncrementalPartialManifestManager.java b/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/IncrementalPartialManifestManager.java
index c243092..6945963 100644
--- a/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/IncrementalPartialManifestManager.java
+++ b/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/IncrementalPartialManifestManager.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.bundlor.internal.core;
 
diff --git a/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/IncrementalReadablePartialManifest.java b/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/IncrementalReadablePartialManifest.java
index 498e7b1..75f91c4 100644
--- a/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/IncrementalReadablePartialManifest.java
+++ b/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/IncrementalReadablePartialManifest.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2010 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.bundlor.internal.core;
 
diff --git a/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/ManifestGeneratorFactory.java b/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/ManifestGeneratorFactory.java
index 5c97f77..335fd6d 100644
--- a/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/ManifestGeneratorFactory.java
+++ b/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/ManifestGeneratorFactory.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.bundlor.internal.core;
 
diff --git a/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/asm/ArtefactAnalyserClassVisitor.java b/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/asm/ArtefactAnalyserClassVisitor.java
index b502fe1..7000ee6 100644
--- a/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/asm/ArtefactAnalyserClassVisitor.java
+++ b/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/asm/ArtefactAnalyserClassVisitor.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2010 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2010 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.bundlor.internal.core.asm;
 
diff --git a/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/asm/ArtefactAnalyserFieldVisitor.java b/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/asm/ArtefactAnalyserFieldVisitor.java
index 559fdee..36e0c45 100644
--- a/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/asm/ArtefactAnalyserFieldVisitor.java
+++ b/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/asm/ArtefactAnalyserFieldVisitor.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2010 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2010 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.bundlor.internal.core.asm;
 
diff --git a/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/asm/ArtefactAnalyserMethodVisitor.java b/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/asm/ArtefactAnalyserMethodVisitor.java
index 9c08452..657cf84 100644
--- a/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/asm/ArtefactAnalyserMethodVisitor.java
+++ b/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/asm/ArtefactAnalyserMethodVisitor.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2010 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2010 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.bundlor.internal.core.asm;
 
diff --git a/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/asm/ExtensibleAsmTypeArtefactAnalyser.java b/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/asm/ExtensibleAsmTypeArtefactAnalyser.java
index 62e251c..9cf28e7 100644
--- a/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/asm/ExtensibleAsmTypeArtefactAnalyser.java
+++ b/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/asm/ExtensibleAsmTypeArtefactAnalyser.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2010 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2010 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.bundlor.internal.core.asm;
 
diff --git a/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/asm/VisitorUtils.java b/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/asm/VisitorUtils.java
index 61b8874..8a2f3fc 100644
--- a/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/asm/VisitorUtils.java
+++ b/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/asm/VisitorUtils.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2010 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2010 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.bundlor.internal.core.asm;
 
diff --git a/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/maven/MavenPropertiesSource.java b/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/maven/MavenPropertiesSource.java
index 9890798..9ca039b 100644
--- a/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/maven/MavenPropertiesSource.java
+++ b/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/maven/MavenPropertiesSource.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009 - 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009 - 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.bundlor.internal.core.maven;
 
diff --git a/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/maven/MavenPropertiesSourceFactory.java b/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/maven/MavenPropertiesSourceFactory.java
index 9ee2224..4ab8067 100644
--- a/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/maven/MavenPropertiesSourceFactory.java
+++ b/org.eclipse.virgo.ide.bundlor.core/src/org/eclipse/virgo/ide/bundlor/internal/core/maven/MavenPropertiesSourceFactory.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009 - 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009 - 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.bundlor.internal.core.maven;
 
diff --git a/org.eclipse.virgo.ide.bundlor.jdt.core/about.html b/org.eclipse.virgo.ide.bundlor.jdt.core/about.html
index 2abb573..164f781 100644
--- a/org.eclipse.virgo.ide.bundlor.jdt.core/about.html
+++ b/org.eclipse.virgo.ide.bundlor.jdt.core/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>April 13, 2012</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.virgo.ide.bundlor.jdt.core/src/org/eclipse/virgo/ide/bundlor/jdt/core/ArtifactAnalyserTypeVisitor.java b/org.eclipse.virgo.ide.bundlor.jdt.core/src/org/eclipse/virgo/ide/bundlor/jdt/core/ArtifactAnalyserTypeVisitor.java
index 9de2ece..5832cab 100644
--- a/org.eclipse.virgo.ide.bundlor.jdt.core/src/org/eclipse/virgo/ide/bundlor/jdt/core/ArtifactAnalyserTypeVisitor.java
+++ b/org.eclipse.virgo.ide.bundlor.jdt.core/src/org/eclipse/virgo/ide/bundlor/jdt/core/ArtifactAnalyserTypeVisitor.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.bundlor.jdt.core;
 
diff --git a/org.eclipse.virgo.ide.bundlor.jdt.core/src/org/eclipse/virgo/ide/bundlor/jdt/core/AstTypeArtifactAnalyser.java b/org.eclipse.virgo.ide.bundlor.jdt.core/src/org/eclipse/virgo/ide/bundlor/jdt/core/AstTypeArtifactAnalyser.java
index c24853c..cb80826 100644
--- a/org.eclipse.virgo.ide.bundlor.jdt.core/src/org/eclipse/virgo/ide/bundlor/jdt/core/AstTypeArtifactAnalyser.java
+++ b/org.eclipse.virgo.ide.bundlor.jdt.core/src/org/eclipse/virgo/ide/bundlor/jdt/core/AstTypeArtifactAnalyser.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.bundlor.jdt.core;
 
diff --git a/org.eclipse.virgo.ide.bundlor.ui/about.html b/org.eclipse.virgo.ide.bundlor.ui/about.html
index 2abb573..164f781 100644
--- a/org.eclipse.virgo.ide.bundlor.ui/about.html
+++ b/org.eclipse.virgo.ide.bundlor.ui/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>April 13, 2012</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.virgo.ide.bundlor.ui/plugin.xml b/org.eclipse.virgo.ide.bundlor.ui/plugin.xml
index 8f69523..06a140c 100644
--- a/org.eclipse.virgo.ide.bundlor.ui/plugin.xml
+++ b/org.eclipse.virgo.ide.bundlor.ui/plugin.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.2"?>
 <!--
-/*******************************************************************************
- * Copyright (c) 2007, 2012 SpringSource
- * 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:
- *     SpringSource - initial API and implementation
- *******************************************************************************/
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc. and others.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 -->
 <plugin>
 	
diff --git a/org.eclipse.virgo.ide.bundlor.ui/src/org/eclipse/virgo/ide/bundlor/ui/BundlorUiPlugin.java b/org.eclipse.virgo.ide.bundlor.ui/src/org/eclipse/virgo/ide/bundlor/ui/BundlorUiPlugin.java
index f92d496..dedbe57 100644
--- a/org.eclipse.virgo.ide.bundlor.ui/src/org/eclipse/virgo/ide/bundlor/ui/BundlorUiPlugin.java
+++ b/org.eclipse.virgo.ide.bundlor.ui/src/org/eclipse/virgo/ide/bundlor/ui/BundlorUiPlugin.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.bundlor.ui;
 
diff --git a/org.eclipse.virgo.ide.bundlor.ui/src/org/eclipse/virgo/ide/bundlor/ui/internal/actions/AutomaticRunBundlorActionDelegate.java b/org.eclipse.virgo.ide.bundlor.ui/src/org/eclipse/virgo/ide/bundlor/ui/internal/actions/AutomaticRunBundlorActionDelegate.java
index 2ac423f..3997cfc 100644
--- a/org.eclipse.virgo.ide.bundlor.ui/src/org/eclipse/virgo/ide/bundlor/ui/internal/actions/AutomaticRunBundlorActionDelegate.java
+++ b/org.eclipse.virgo.ide.bundlor.ui/src/org/eclipse/virgo/ide/bundlor/ui/internal/actions/AutomaticRunBundlorActionDelegate.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009 - 2013 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009 - 2013 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.bundlor.ui.internal.actions;
 
diff --git a/org.eclipse.virgo.ide.bundlor.ui/src/org/eclipse/virgo/ide/bundlor/ui/internal/actions/BundlorStatePropertyTester.java b/org.eclipse.virgo.ide.bundlor.ui/src/org/eclipse/virgo/ide/bundlor/ui/internal/actions/BundlorStatePropertyTester.java
index d30c87f..8d9985e 100644
--- a/org.eclipse.virgo.ide.bundlor.ui/src/org/eclipse/virgo/ide/bundlor/ui/internal/actions/BundlorStatePropertyTester.java
+++ b/org.eclipse.virgo.ide.bundlor.ui/src/org/eclipse/virgo/ide/bundlor/ui/internal/actions/BundlorStatePropertyTester.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.bundlor.ui.internal.actions;
 
diff --git a/org.eclipse.virgo.ide.bundlor.ui/src/org/eclipse/virgo/ide/bundlor/ui/internal/actions/RunBundlorActionDelegate.java b/org.eclipse.virgo.ide.bundlor.ui/src/org/eclipse/virgo/ide/bundlor/ui/internal/actions/RunBundlorActionDelegate.java
index 4707ed7..15b8a1f 100644
--- a/org.eclipse.virgo.ide.bundlor.ui/src/org/eclipse/virgo/ide/bundlor/ui/internal/actions/RunBundlorActionDelegate.java
+++ b/org.eclipse.virgo.ide.bundlor.ui/src/org/eclipse/virgo/ide/bundlor/ui/internal/actions/RunBundlorActionDelegate.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.bundlor.ui.internal.actions;
 
diff --git a/org.eclipse.virgo.ide.bundlor.ui/src/org/eclipse/virgo/ide/bundlor/ui/internal/properties/BundlorPreferencePage.java b/org.eclipse.virgo.ide.bundlor.ui/src/org/eclipse/virgo/ide/bundlor/ui/internal/properties/BundlorPreferencePage.java
index a075c5d..f033f3e 100644
--- a/org.eclipse.virgo.ide.bundlor.ui/src/org/eclipse/virgo/ide/bundlor/ui/internal/properties/BundlorPreferencePage.java
+++ b/org.eclipse.virgo.ide.bundlor.ui/src/org/eclipse/virgo/ide/bundlor/ui/internal/properties/BundlorPreferencePage.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009 - 2013 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009 - 2013 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.bundlor.ui.internal.properties;
 
diff --git a/org.eclipse.virgo.ide.bundlor.ui/src/org/eclipse/virgo/ide/bundlor/ui/internal/properties/BundlorPropertiesPathDialog.java b/org.eclipse.virgo.ide.bundlor.ui/src/org/eclipse/virgo/ide/bundlor/ui/internal/properties/BundlorPropertiesPathDialog.java
index 7e0456b..c3302dd 100644
--- a/org.eclipse.virgo.ide.bundlor.ui/src/org/eclipse/virgo/ide/bundlor/ui/internal/properties/BundlorPropertiesPathDialog.java
+++ b/org.eclipse.virgo.ide.bundlor.ui/src/org/eclipse/virgo/ide/bundlor/ui/internal/properties/BundlorPropertiesPathDialog.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
+/*********************************************************************
  * Copyright (c) 2013 Eclipse Foundation
- * 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:
- *     Tasktop Technologies - initial implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.bundlor.ui.internal.properties;
 
diff --git a/org.eclipse.virgo.ide.doc/META-INF/MANIFEST.MF b/org.eclipse.virgo.ide.doc/META-INF/MANIFEST.MF
index 9a9cafe..6a5c83f 100644
--- a/org.eclipse.virgo.ide.doc/META-INF/MANIFEST.MF
+++ b/org.eclipse.virgo.ide.doc/META-INF/MANIFEST.MF
@@ -7,3 +7,4 @@
  org.eclipse.help,
  org.eclipse.help.ui
 Bundle-Vendor: %providerName
+Bundle-Localization: plugin
diff --git a/org.eclipse.virgo.ide.doc/about.html b/org.eclipse.virgo.ide.doc/about.html
index 2abb573..164f781 100644
--- a/org.eclipse.virgo.ide.doc/about.html
+++ b/org.eclipse.virgo.ide.doc/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>April 13, 2012</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.virgo.ide.doc/bundlor/pr01.html b/org.eclipse.virgo.ide.doc/bundlor/pr01.html
index 42fb4b5..27c81fb 100644
--- a/org.eclipse.virgo.ide.doc/bundlor/pr01.html
+++ b/org.eclipse.virgo.ide.doc/bundlor/pr01.html
@@ -1,6 +1,6 @@
 <html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Copyright</title><meta content="DocBook XSL Stylesheets V1.76.0" name="generator"><link rel="home" href="index.html" title="Bundlor User Guide"><link rel="up" href="index.html" title="Bundlor User Guide"><link rel="prev" href="index.html" title="Bundlor User Guide"><link rel="next" href="pr02.html" title="License"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table summary="Navigation header" width="100%"><tr><td align="left" width="20%"><a accesskey="p" href="index.html">Prev</a>&nbsp;</td><th align="center" width="60%">&nbsp;</th><td align="right" width="20%">&nbsp;<a accesskey="n" href="pr02.html">Next</a></td></tr></table><hr></div><div class="preface" title="Copyright"><div class="titlepage"><div><div><h2 class="title"><a name="copyright"></a>Copyright</h2></div></div></div><p>
 		Copyright 2008-2012, VMware Inc.
 	</p><p>
-		Licensed Under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL").  
-		A copy of the EPL is available at <a class="ulink" href="http://www.eclipse.org/legal/epl-v10.html" target="_top">http://www.eclipse.org/legal/epl-v10.html</a>.
+		Licensed Under the terms and conditions of the Eclipse Public License Version 2.0 ("EPL").  
+		A copy of the EPL is available at <a class="ulink" href="http://www.eclipse.org/legal/epl-v20.html" target="_top">http://www.eclipse.org/legal/epl-v20.html</a>.
 	</p></div><div class="navfooter"><hr><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="index.html">Prev</a>&nbsp;</td><td align="center" width="20%">&nbsp;</td><td align="right" width="40%">&nbsp;<a accesskey="n" href="pr02.html">Next</a></td></tr><tr><td valign="top" align="left" width="40%">&nbsp;</td><td align="center" width="20%"><a accesskey="h" href="index.html">Home</a></td><td valign="top" align="right" width="40%">&nbsp;</td></tr></table></div></body></html>
\ No newline at end of file
diff --git a/org.eclipse.virgo.ide.doc/greenpages/index.html b/org.eclipse.virgo.ide.doc/greenpages/index.html
index e210cc1..20100ce 100644
--- a/org.eclipse.virgo.ide.doc/greenpages/index.html
+++ b/org.eclipse.virgo.ide.doc/greenpages/index.html
@@ -2,12 +2,12 @@
             Copyright &copy; 2011 VMware Inc.
             </p><div class="mediaobject"><img src="images/virgo-logo-small.png"></div><p>
         </p><p>
-            All rights reserved. This document is made available under the terms of the Eclipse Public License v1.0
+            All rights reserved. This document is made available under the terms of the Eclipse Public License v2.0
 			 which is available at
-			 <a class="ulink" href="http://www.eclipse.org/legal/epl-v10.html" target="_top">http://www.eclipse.org/legal/epl-v10.html</a>.
-        </p><p>Java, Sun, and Sun Microsystems
+			 <a class="ulink" href="http://www.eclipse.org/legal/epl-v20.html" target="_top">http://www.eclipse.org/legal/epl-v20.html</a>.
+        </p><p>Java, Oracle
             are trademarks or registered
-            trademarks of Sun Microsystems, Inc. in the United
+            trademarks of Oracle, Inc. in the United
             States and other countries.
         </p><p>OSGi is a trademark or a registered trademark of the OSGi Alliance in
             the United States, other countries, or both.
diff --git a/org.eclipse.virgo.ide.doc/plugin.properties b/org.eclipse.virgo.ide.doc/plugin.properties
index 21abc48..5c68b74 100644
--- a/org.eclipse.virgo.ide.doc/plugin.properties
+++ b/org.eclipse.virgo.ide.doc/plugin.properties
@@ -1,3 +1,3 @@
-pluginName=Virgo Tooling and Runtime Documentation 

-providerName=Eclipse.org - Virgo

-bundle.version=3.5.0

+pluginName=Virgo Tooling and Runtime Documentation 
+providerName=Eclipse.org - Virgo
+
diff --git a/org.eclipse.virgo.ide.eclipse.feature/about.html b/org.eclipse.virgo.ide.eclipse.feature/about.html
index 2abb573..164f781 100644
--- a/org.eclipse.virgo.ide.eclipse.feature/about.html
+++ b/org.eclipse.virgo.ide.eclipse.feature/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>April 13, 2012</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.virgo.ide.eclipse.feature/build.properties b/org.eclipse.virgo.ide.eclipse.feature/build.properties
index 1997d9c..ab0a5f9 100644
--- a/org.eclipse.virgo.ide.eclipse.feature/build.properties
+++ b/org.eclipse.virgo.ide.eclipse.feature/build.properties
@@ -1,8 +1,8 @@
 bin.includes = feature.xml,\
                license.html,\
-               epl-v10.html,\
+               epl-v20.html,\
                feature.properties
 src.includes = license.html,\
                feature.xml,\
-               epl-v10.html,\
+               epl-v20.html,\
                feature.properties
diff --git a/org.eclipse.virgo.ide.eclipse.feature/epl-v10.html b/org.eclipse.virgo.ide.eclipse.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/org.eclipse.virgo.ide.eclipse.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/org.eclipse.virgo.ide.eclipse.feature/epl-v20.html b/org.eclipse.virgo.ide.eclipse.feature/epl-v20.html
new file mode 100644
index 0000000..4b95323
--- /dev/null
+++ b/org.eclipse.virgo.ide.eclipse.feature/epl-v20.html
@@ -0,0 +1,299 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <title>Eclipse Public License - Version 2.0</title>
+    <style type="text/css">
+      body {
+        margin: 1.5em 3em;
+      }
+      h1{
+        font-size:1.5em;
+      }
+      h2{
+        font-size:1em;
+        margin-bottom:0.5em;
+        margin-top:1em;
+      }
+      p {
+        margin-top:  0.5em;
+        margin-bottom: 0.5em;
+      }
+      ul, ol{
+        list-style-type:none;
+      }
+    </style>
+  </head>
+  <body>
+    <h1>Eclipse Public License - v 2.0</h1>
+    <p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+      PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION
+      OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+    </p>
+    <h2 id="definitions">1. DEFINITIONS</h2>
+    <p>“Contribution” means:</p>
+    <ul>
+      <li>a) in the case of the initial Contributor, the initial content
+        Distributed under this Agreement, and
+      </li>
+      <li>
+        b) in the case of each subsequent Contributor:
+        <ul>
+          <li>i) changes to the Program, and</li>
+          <li>ii) additions to the Program;</li>
+        </ul>
+        where such changes and/or additions to the Program originate from
+        and are Distributed by that particular Contributor. A Contribution
+        “originates” from a Contributor if it was added to the Program by such
+        Contributor itself or anyone acting on such Contributor's behalf.
+        Contributions do not include changes or additions to the Program that
+        are not Modified Works.
+      </li>
+    </ul>
+    <p>“Contributor” means any person or entity that Distributes the Program.</p>
+    <p>“Licensed Patents” mean patent claims licensable by a Contributor which
+      are necessarily infringed by the use or sale of its Contribution alone
+      or when combined with the Program.
+    </p>
+    <p>“Program” means the Contributions Distributed in accordance with this
+      Agreement.
+    </p>
+    <p>“Recipient” means anyone who receives the Program under this Agreement
+      or any Secondary License (as applicable), including Contributors.
+    </p>
+    <p>“Derivative Works” shall mean any work, whether in Source Code or other
+      form, that is based on (or derived from) the Program and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship.
+    </p>
+    <p>“Modified Works” shall mean any work in Source Code or other form that
+      results from an addition to, deletion from, or modification of the
+      contents of the Program, including, for purposes of clarity any new file
+      in Source Code form that contains any contents of the Program. Modified
+      Works shall not include works that contain only declarations, interfaces,
+      types, classes, structures, or files of the Program solely in each case
+      in order to link to, bind by name, or subclass the Program or Modified
+      Works thereof.
+    </p>
+    <p>“Distribute” means the acts of a) distributing or b) making available
+      in any manner that enables the transfer of a copy.
+    </p>
+    <p>“Source Code” means the form of a Program preferred for making
+      modifications, including but not limited to software source code,
+      documentation source, and configuration files.
+    </p>
+    <p>“Secondary License” means either the GNU General Public License,
+      Version 2.0, or any later versions of that license, including any
+      exceptions or additional permissions as identified by the initial
+      Contributor.
+    </p>
+    <h2 id="grant-of-rights">2. GRANT OF RIGHTS</h2>
+    <ul>
+      <li>a) Subject to the terms of this Agreement, each Contributor hereby
+        grants Recipient a non-exclusive, worldwide, royalty-free copyright
+        license to reproduce, prepare Derivative Works of, publicly display,
+        publicly perform, Distribute and sublicense the Contribution of such
+        Contributor, if any, and such Derivative Works.
+      </li>
+      <li>b) Subject to the terms of this Agreement, each Contributor hereby
+        grants Recipient a non-exclusive, worldwide, royalty-free patent
+        license under Licensed Patents to make, use, sell, offer to sell,
+        import and otherwise transfer the Contribution of such Contributor,
+        if any, in Source Code or other form. This patent license shall
+        apply to the combination of the Contribution and the Program if,
+        at the time the Contribution is added by the Contributor, such
+        addition of the Contribution causes such combination to be covered
+        by the Licensed Patents. The patent license shall not apply to any
+        other combinations which include the Contribution. No hardware per
+        se is licensed hereunder.
+      </li>
+      <li>c) Recipient understands that although each Contributor grants the
+        licenses to its Contributions set forth herein, no assurances are
+        provided by any Contributor that the Program does not infringe the
+        patent or other intellectual property rights of any other entity.
+        Each Contributor disclaims any liability to Recipient for claims
+        brought by any other entity based on infringement of intellectual
+        property rights or otherwise. As a condition to exercising the rights
+        and licenses granted hereunder, each Recipient hereby assumes sole
+        responsibility to secure any other intellectual property rights needed,
+        if any. For example, if a third party patent license is required to
+        allow Recipient to Distribute the Program, it is Recipient's
+        responsibility to acquire that license before distributing the Program.
+      </li>
+      <li>d) Each Contributor represents that to its knowledge it has sufficient
+        copyright rights in its Contribution, if any, to grant the copyright
+        license set forth in this Agreement.
+      </li>
+      <li>e) Notwithstanding the terms of any Secondary License, no Contributor
+        makes additional grants to any Recipient (other than those set forth
+        in this Agreement) as a result of such Recipient's receipt of the
+        Program under the terms of a Secondary License (if permitted under
+        the terms of Section 3).
+      </li>
+    </ul>
+    <h2 id="requirements">3. REQUIREMENTS</h2>
+    <p>3.1 If a Contributor Distributes the Program in any form, then:</p>
+    <ul>
+      <li>a) the Program must also be made available as Source Code, in
+        accordance with section 3.2, and the Contributor must accompany
+        the Program with a statement that the Source Code for the Program
+        is available under this Agreement, and informs Recipients how to
+        obtain it in a reasonable manner on or through a medium customarily
+        used for software exchange; and
+      </li>
+      <li>
+        b) the Contributor may Distribute the Program under a license
+        different than this Agreement, provided that such license:
+        <ul>
+          <li>i) effectively disclaims on behalf of all other Contributors all
+            warranties and conditions, express and implied, including warranties
+            or conditions of title and non-infringement, and implied warranties
+            or conditions of merchantability and fitness for a particular purpose;
+          </li>
+          <li>ii) effectively excludes on behalf of all other Contributors all
+            liability for damages, including direct, indirect, special, incidental
+            and consequential damages, such as lost profits;
+          </li>
+          <li>iii) does not attempt to limit or alter the recipients' rights in the
+            Source Code under section 3.2; and
+          </li>
+          <li>iv) requires any subsequent distribution of the Program by any party
+            to be under a license that satisfies the requirements of this section 3.
+          </li>
+        </ul>
+      </li>
+    </ul>
+    <p>3.2 When the Program is Distributed as Source Code:</p>
+    <ul>
+      <li>a) it must be made available under this Agreement, or if the Program (i)
+        is combined with other material in a separate file or files made available
+        under a Secondary License, and (ii) the initial Contributor attached to
+        the Source Code the notice described in Exhibit A of this Agreement,
+        then the Program may be made available under the terms of such
+        Secondary Licenses, and
+      </li>
+      <li>b) a copy of this Agreement must be included with each copy of the Program.</li>
+    </ul>
+    <p>3.3 Contributors may not remove or alter any copyright, patent, trademark,
+      attribution notices, disclaimers of warranty, or limitations of liability
+      (‘notices’) contained within the Program from any copy of the Program which
+      they Distribute, provided that Contributors may add their own appropriate
+      notices.
+    </p>
+    <h2 id="commercial-distribution">4. COMMERCIAL DISTRIBUTION</h2>
+    <p>Commercial distributors of software may accept certain responsibilities
+      with respect to end users, business partners and the like. While this
+      license is intended to facilitate the commercial use of the Program, the
+      Contributor who includes the Program in a commercial product offering should
+      do so in a manner which does not create potential liability for other
+      Contributors. Therefore, if a Contributor includes the Program in a
+      commercial product offering, such Contributor (“Commercial Contributor”)
+      hereby agrees to defend and indemnify every other Contributor
+      (“Indemnified Contributor”) against any losses, damages and costs
+      (collectively “Losses”) arising from claims, lawsuits and other legal actions
+      brought by a third party against the Indemnified Contributor to the extent
+      caused by the acts or omissions of such Commercial Contributor in connection
+      with its distribution of the Program in a commercial product offering.
+      The obligations in this section do not apply to any claims or Losses relating
+      to any actual or alleged intellectual property infringement. In order to
+      qualify, an Indemnified Contributor must: a) promptly notify the
+      Commercial Contributor in writing of such claim, and b) allow the Commercial
+      Contributor to control, and cooperate with the Commercial Contributor in,
+      the defense and any related settlement negotiations. The Indemnified
+      Contributor may participate in any such claim at its own expense.
+    </p>
+    <p>For example, a Contributor might include the Program
+      in a commercial product offering, Product X. That Contributor is then a
+      Commercial Contributor. If that Commercial Contributor then makes performance
+      claims, or offers warranties related to Product X, those performance claims
+      and warranties are such Commercial Contributor's responsibility alone.
+      Under this section, the Commercial Contributor would have to defend claims
+      against the other Contributors related to those performance claims and
+      warranties, and if a court requires any other Contributor to pay any damages
+      as a result, the Commercial Contributor must pay those damages.
+    </p>
+    <h2 id="warranty">5. NO WARRANTY</h2>
+    <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
+      BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN “AS IS” BASIS, WITHOUT
+      WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
+      WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+      MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is
+      solely responsible for determining the appropriateness of using and
+      distributing the Program and assumes all risks associated with its
+      exercise of rights under this Agreement, including but not limited to the
+      risks and costs of program errors, compliance with applicable laws, damage
+      to or loss of data, programs or equipment, and unavailability or
+      interruption of operations.
+    </p>
+    <h2 id="disclaimer">6. DISCLAIMER OF LIABILITY</h2>
+    <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
+      BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY
+      LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+      OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS),
+      HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+      LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+      OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
+      GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+    </p>
+    <h2 id="general">7. GENERAL</h2>
+    <p>If any provision of this Agreement is invalid or unenforceable under
+      applicable law, it shall not affect the validity or enforceability of the
+      remainder of the terms of this Agreement, and without further action by the
+      parties hereto, such provision shall be reformed to the minimum extent
+      necessary to make such provision valid and enforceable.
+    </p>
+    <p>If Recipient institutes patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Program itself
+      (excluding combinations of the Program with other software or hardware)
+      infringes such Recipient's patent(s), then such Recipient's rights granted
+      under Section 2(b) shall terminate as of the date such litigation is filed.
+    </p>
+    <p>All Recipient's rights under this Agreement shall terminate if it fails to
+      comply with any of the material terms or conditions of this Agreement and
+      does not cure such failure in a reasonable period of time after becoming
+      aware of such noncompliance. If all Recipient's rights under this Agreement
+      terminate, Recipient agrees to cease use and distribution of the Program
+      as soon as reasonably practicable. However, Recipient's obligations under
+      this Agreement and any licenses granted by Recipient relating to the
+      Program shall continue and survive.
+    </p>
+    <p>Everyone is permitted to copy and distribute copies of this Agreement,
+      but in order to avoid inconsistency the Agreement is copyrighted and may
+      only be modified in the following manner. The Agreement Steward reserves
+      the right to publish new versions (including revisions) of this Agreement
+      from time to time. No one other than the Agreement Steward has the right
+      to modify this Agreement. The Eclipse Foundation is the initial Agreement
+      Steward. The Eclipse Foundation may assign the responsibility to serve as
+      the Agreement Steward to a suitable separate entity. Each new version of
+      the Agreement will be given a distinguishing version number. The Program
+      (including Contributions) may always be Distributed subject to the version
+      of the Agreement under which it was received. In addition, after a new
+      version of the Agreement is published, Contributor may elect to Distribute
+      the Program (including its Contributions) under the new version.
+    </p>
+    <p>Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+      receives no rights or licenses to the intellectual property of any
+      Contributor under this Agreement, whether expressly, by implication,
+      estoppel or otherwise. All rights in the Program not expressly granted
+      under this Agreement are reserved. Nothing in this Agreement is intended
+      to be enforceable by any entity that is not a Contributor or Recipient.
+      No third-party beneficiary rights are created under this Agreement.
+    </p>
+    <h2 id="exhibit-a">Exhibit A – Form of Secondary Licenses Notice</h2>
+    <p>“This Source Code may also be made available under the following 
+    	Secondary Licenses when the conditions for such availability set forth 
+    	in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+    	version(s), and exceptions or additional permissions here}.”
+    </p>
+    <blockquote>
+      <p>Simply including a copy of this Agreement, including this Exhibit A
+        is not sufficient to license the Source Code under Secondary Licenses.
+      </p>
+      <p>If it is not possible or desirable to put the notice in a particular file,
+        then You may include the notice in a location (such as a LICENSE file in a
+        relevant directory) where a recipient would be likely to look for
+        such a notice.
+      </p>
+      <p>You may add additional accurate notices of copyright ownership.</p>
+    </blockquote>
+  
+</body></html>
\ No newline at end of file
diff --git a/org.eclipse.virgo.ide.eclipse.feature/feature.properties b/org.eclipse.virgo.ide.eclipse.feature/feature.properties
index ed28375..78ff8fb 100644
--- a/org.eclipse.virgo.ide.eclipse.feature/feature.properties
+++ b/org.eclipse.virgo.ide.eclipse.feature/feature.properties
@@ -16,137 +16,155 @@
 
 # "copyright" property - text of the Copyright
 copyright=\
-Copyright (c) 2007-2012 SpringSource and others.  All rights reserved.
+Copyright (c) 2007-2018 SpringSource and others.  All rights reserved.
 
 ################ end of copyright property ####################################
-
-licenseUrl=epl-v10.html
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
 
 # "license" property - text of the "Feature Update License"
 # should be plain text version of license agreement pointed to be "licenseURL"
 license=\
 Eclipse Foundation Software User Agreement\n\
-February 1, 2011\n\
+\n\
+November 22, 2017\n\
 \n\
 Usage Of Content\n\
 \n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION\n\
+AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF\n\
+THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE\n\
+TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED\n\
+BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\
+AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY\n\
+APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU\n\
+MAY NOT USE THE CONTENT.\n\
 \n\
 Applicable Licenses\n\
 \n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
+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 License\n\
+Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also\n\
+available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,\n\
+"Program" will mean the Content.\n\
 \n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
+Content includes, but is not limited to, source code, object code, documentation\n\
+and other files maintained in the Eclipse Foundation source code repository\n\
+("Repository") in software modules ("Modules") and made available as\n\
+downloadable archives ("Downloads").\n\
 \n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+-   Content may be structured and packaged into modules to facilitate\n\
+    delivering, extending, and upgrading the Content. Typical modules may\n\
+    include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and\n\
+    features ("Features").\n\
+-   Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\
+    (Javaâ\u201E¢ ARchive) in a directory named "plugins".\n\
+-   A Feature is a bundle of one or more Plug-ins and/or Fragments and\n\
+    associated material. Each Feature may be packaged as a sub-directory in a\n\
+    directory named "features". Within a Feature, files named "feature.xml" may\n\
+    contain a list of the names and version numbers of the Plug-ins and/or\n\
+    Fragments associated with that Feature.\n\
+-   Features may also include other Features ("Included Features"). Within a\n\
+    Feature, files named "feature.xml" may contain a list of the names and\n\
+    version numbers of Included Features.\n\
 \n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
+The terms and conditions governing Plug-ins and Fragments should be contained in\n\
+files named "about.html" ("Abouts"). The terms and conditions governing Features\n\
+and Included Features should be contained in files named "license.html"\n\
+("Feature Licenses"). Abouts and Feature Licenses may be located in any\n\
+directory of a Download or Module including, but not limited to the following\n\
+locations:\n\
 \n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
+-   The top-level (root) directory\n\
+-   Plug-in and Fragment directories\n\
+-   Inside Plug-ins and Fragments packaged as JARs\n\
+-   Sub-directories of the directory named "src" of certain Plug-ins\n\
+-   Feature directories\n\
 \n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using\n\
+the Provisioning Technology (as defined below), you must agree to a license\n\
+("Feature Update License") during the installation process. If the Feature\n\
+contains Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform you\n\
+where you can locate them. Feature Update Licenses may be found in the "license"\n\
+property of files named "feature.properties" found within a Feature. Such\n\
+Abouts, Feature Licenses, and Feature Update Licenses contain the terms and\n\
+conditions (or references to such terms and conditions) that govern your use of\n\
+the associated Content in that directory.\n\
 \n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL\n\
+OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE\n\
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
 \n\
-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+-   Eclipse Public License Version 1.0 (available at\n\
+    http://www.eclipse.org/legal/epl-v10.html)\n\
+-   Eclipse Distribution License Version 1.0 (available at\n\
+    http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+-   Common Public License Version 1.0 (available at\n\
+    http://www.eclipse.org/legal/cpl-v10.html)\n\
+-   Apache Software License 1.1 (available at\n\
+    http://www.apache.org/licenses/LICENSE)\n\
+-   Apache Software License 2.0 (available at\n\
+    http://www.apache.org/licenses/LICENSE-2.0)\n\
+-   Mozilla Public License Version 1.1 (available at\n\
+    http://www.mozilla.org/MPL/MPL-1.1.html)\n\
 \n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO\n\
+USE OF THE CONTENT. If no About, Feature License, or Feature Update License is\n\
+provided, please contact the Eclipse Foundation to determine what terms and\n\
+conditions govern that particular Content.\n\
 \n\
-\n\Use of Provisioning Technology\n\
+Use of Provisioning Technology\n\
 \n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
+The Eclipse Foundation makes available provisioning software, examples of which\n\
+include, but are not limited to, p2 and the Eclipse Update Manager\n\
+("Provisioning Technology") for the purpose of allowing users to install\n\
+software, documentation, information and/or other materials (collectively\n\
+"Installable Software"). This capability is provided with the intent of allowing\n\
+such users to install, extend and update Eclipse-based products. Information\n\
+about packaging Installable Software is available at\n\
 http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
 \n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
+You may use Provisioning Technology to allow other parties to install\n\
+Installable Software. You shall be responsible for enabling the applicable\n\
+license agreements relating to the Installable Software to be presented to, and\n\
+accepted by, the users of the Provisioning Technology in accordance with the\n\
+Specification. By using Provisioning Technology in such a manner and making it\n\
+available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the\n\
+following:\n\
 \n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
+1.  A series of actions may occur ("Provisioning Process") in which a user may\n\
+    execute the Provisioning Technology on a machine ("Target Machine") with the\n\
+    intent of installing, extending or updating the functionality of an\n\
+    Eclipse-based product.\n\
+2.  During the Provisioning Process, the Provisioning Technology may cause third\n\
+    party Installable Software or a portion thereof to be accessed and copied to\n\
+    the Target Machine.\n\
+3.  Pursuant to the Specification, you will provide to the user the terms and\n\
+    conditions that govern the use of the Installable Software ("Installable\n\
+    Software Agreement") and such Installable Software Agreement shall be\n\
+    accessed from the Target Machine in accordance with the Specification. Such\n\
+    Installable Software Agreement must inform the user of the terms and\n\
+    conditions that govern the Installable Software and must solicit acceptance\n\
+    by the end user in the manner prescribed in such Installable\n\
+    Software Agreement. Upon such indication of agreement by the user, the\n\
+    provisioning Technology will complete installation of the\n\
+    Installable Software.\n\
 \n\
 Cryptography\n\
 \n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
+Content may contain encryption software. The country in which you are currently\n\
+may have restrictions on the import, possession, and use, and/or re-export to\n\
+another country, of encryption software. BEFORE using any encryption software,\n\
+please check the country's laws, regulations and policies concerning the import,\n\
+possession, or use, and re-export of encryption software, to see if this is\n\
+permitted.\n\
 \n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the\n\
+United States, other countries, or both.\n
 ########### end of license property ##########################################
+
diff --git a/org.eclipse.virgo.ide.eclipse.feature/feature.xml b/org.eclipse.virgo.ide.eclipse.feature/feature.xml
index 27be78d..e92fa4d 100644
--- a/org.eclipse.virgo.ide.eclipse.feature/feature.xml
+++ b/org.eclipse.virgo.ide.eclipse.feature/feature.xml
@@ -5,7 +5,7 @@
       version="1.5.1.qualifier"
       provider-name="%providerName">
 
-   <license url="http://www.eclipse.org/legal/epl-v10.html">
+   <license url="http://www.eclipse.org/legal/epl-v20.html">
       Eclipse Public License - v 1.0
 THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS
 ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
@@ -204,6 +204,23 @@
 litigation.
    </license>
 
+   <requires>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.ui.forms"/>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.core.resources"/>
+      <import plugin="org.eclipse.core.filesystem"/>
+      <import plugin="org.eclipse.jdt.ui"/>
+      <import plugin="org.eclipse.jdt.core"/>
+      <import plugin="org.eclipse.jdt.launching"/>
+      <import plugin="org.eclipse.pde.ui"/>
+      <import plugin="org.eclipse.wst.web"/>
+      <import plugin="org.eclipse.wst.web.ui"/>
+      <import plugin="org.eclipse.wst.common.frameworks.ui"/>
+      <import plugin="org.eclipse.wst.common.modulecore"/>
+   </requires>
+
    <plugin
          id="org.eclipse.virgo.ide.eclipse"
          download-size="0"
diff --git a/org.eclipse.virgo.ide.eclipse.feature/license.html b/org.eclipse.virgo.ide.eclipse.feature/license.html
index 98b25ac..6554028 100644
--- a/org.eclipse.virgo.ide.eclipse.feature/license.html
+++ b/org.eclipse.virgo.ide.eclipse.feature/license.html
@@ -1,108 +1,181 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--?xml version="1.0" encoding="ISO-8859-1" ?-->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
 <title>Eclipse Foundation Software User Agreement</title>
 </head>
 
 <body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>February 1, 2011</p>
+	<h2>Eclipse Foundation Software User Agreement</h2>
+	<p>November 22, 2017</p>
 
-<h3>Usage Of Content</h3>
+	<h3>Usage Of Content</h3>
 
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+	<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION,
+		INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+		(COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY
+		THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+		CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
+		BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS
+		GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY
+		APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
+		BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS
+		AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
+		AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT
+		USE THE CONTENT.</p>
 
-<h3>Applicable Licenses</h3>
+	<h3>Applicable Licenses</h3>
 
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  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>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>
+		Unless otherwise indicated, all Content made available by the Eclipse
+		Foundation is provided to you under the terms and conditions of the
+		Eclipse Public License Version 2.0 ("EPL"). A copy of the
+		EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-2.0">http://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 Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+	<p>Content includes, but is not limited to, source code, object
+		code, documentation and other files maintained in the Eclipse
+		Foundation source code repository ("Repository") in software
+		modules ("Modules") and made available as downloadable
+		archives ("Downloads").</p>
 
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
+	<ul>
+		<li>Content may be structured and packaged into modules to
+			facilitate delivering, extending, and upgrading the Content. Typical
+			modules may include plug-ins ("Plug-ins"), plug-in
+			fragments ("Fragments"), and features
+			("Features").</li>
+		<li>Each Plug-in or Fragment may be packaged as a sub-directory
+			or JAR (Java™ ARchive) in a directory named
+			"plugins".</li>
+		<li>A Feature is a bundle of one or more Plug-ins and/or
+			Fragments and associated material. Each Feature may be packaged as a
+			sub-directory in a directory named "features". Within a
+			Feature, files named "feature.xml" may contain a list of
+			the names and version numbers of the Plug-ins and/or Fragments
+			associated with that Feature.</li>
+		<li>Features may also include other Features ("Included
+			Features"). Within a Feature, files named
+			"feature.xml" may contain a list of the names and version
+			numbers of Included Features.</li>
+	</ul>
 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
+	<p>The terms and conditions governing Plug-ins and Fragments should
+		be contained in files named "about.html"
+		("Abouts"). The terms and conditions governing Features and
+		Included Features should be contained in files named
+		"license.html" ("Feature Licenses"). Abouts and
+		Feature Licenses may be located in any directory of a Download or
+		Module including, but not limited to the following locations:</p>
 
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
+	<ul>
+		<li>The top-level (root) directory</li>
+		<li>Plug-in and Fragment directories</li>
+		<li>Inside Plug-ins and Fragments packaged as JARs</li>
+		<li>Sub-directories of the directory named "src" of
+			certain Plug-ins</li>
+		<li>Feature directories</li>
+	</ul>
 
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
+	<p>Note: if a Feature made available by the Eclipse Foundation is
+		installed using the Provisioning Technology (as defined below), you
+		must agree to a license ("Feature Update License") during
+		the installation process. If the Feature contains Included Features,
+		the Feature Update License should either provide you with the terms
+		and conditions governing the Included Features or inform you where you
+		can locate them. Feature Update Licenses may be found in the
+		"license" property of files named
+		"feature.properties" found within a Feature. Such Abouts,
+		Feature Licenses, and Feature Update Licenses contain the terms and
+		conditions (or references to such terms and conditions) that govern
+		your use of the associated Content in that directory.</p>
 
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+	<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY
+		REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND
+		CONDITIONS. SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT
+		ARE NOT LIMITED TO):</p>
 
-<ul>
-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
+	<ul>
+		<li>Eclipse Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>)
+		</li>
+		<li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)
+		</li>
+		<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)
+		</li>
+		<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)
+		</li>
+		<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)
+		</li>
+		<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)
+		</li>
+	</ul>
 
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+	<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND
+		CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License,
+		or Feature Update License is provided, please contact the Eclipse
+		Foundation to determine what terms and conditions govern that
+		particular Content.</p>
 
 
-<h3>Use of Provisioning Technology</h3>
+	<h3>Use of Provisioning Technology</h3>
 
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
+	<p>
+		The Eclipse Foundation makes available provisioning software, examples
+		of which include, but are not limited to, p2 and the Eclipse Update
+		Manager ("Provisioning Technology") for the purpose of
+		allowing users to install software, documentation, information and/or
+		other materials (collectively "Installable Software"). This
+		capability is provided with the intent of allowing such users to
+		install, extend and update Eclipse-based products. Information about
+		packaging Installable Software is available at <a href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+		("Specification").
+	</p>
 
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+	<p>You may use Provisioning Technology to allow other parties to
+		install Installable Software. You shall be responsible for enabling
+		the applicable license agreements relating to the Installable Software
+		to be presented to, and accepted by, the users of the Provisioning
+		Technology in accordance with the Specification. By using Provisioning
+		Technology in such a manner and making it available in accordance with
+		the Specification, you further acknowledge your agreement to, and the
+		acquisition of all necessary rights to permit the following:</p>
 
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
+	<ol>
+		<li>A series of actions may occur ("Provisioning
+			Process") in which a user may execute the Provisioning
+			Technology on a machine ("Target Machine") with the intent
+			of installing, extending or updating the functionality of an
+			Eclipse-based product.</li>
+		<li>During the Provisioning Process, the Provisioning Technology
+			may cause third party Installable Software or a portion thereof to be
+			accessed and copied to the Target Machine.</li>
+		<li>Pursuant to the Specification, you will provide to the user
+			the terms and conditions that govern the use of the Installable
+			Software ("Installable Software Agreement") and such
+			Installable Software Agreement shall be accessed from the Target
+			Machine in accordance with the Specification. Such Installable
+			Software Agreement must inform the user of the terms and conditions
+			that govern the Installable Software and must solicit acceptance by
+			the end user in the manner prescribed in such Installable Software
+			Agreement. Upon such indication of agreement by the user, the
+			provisioning Technology will complete installation of the Installable
+			Software.</li>
+	</ol>
 
-<h3>Cryptography</h3>
+	<h3>Cryptography</h3>
 
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+	<p>Content may contain encryption software. The country in which
+		you are currently may have restrictions on the import, possession, and
+		use, and/or re-export to another country, of encryption software.
+		BEFORE using any encryption software, please check the country's laws,
+		regulations and policies concerning the import, possession, or use,
+		and re-export of encryption software, to see if this is permitted.</p>
 
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
\ No newline at end of file
+	<p>
+		<small>Java and all Java-based trademarks are trademarks of
+			Oracle Corporation in the United States, other countries, or both.</small>
+	</p>
+
+
+</body></html>
\ No newline at end of file
diff --git a/org.eclipse.virgo.ide.eclipse/about.html b/org.eclipse.virgo.ide.eclipse/about.html
index 2abb573..164f781 100644
--- a/org.eclipse.virgo.ide.eclipse/about.html
+++ b/org.eclipse.virgo.ide.eclipse/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>April 13, 2012</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/EclipseUiPlugin.java b/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/EclipseUiPlugin.java
index 63392bc..3863b9b 100644
--- a/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/EclipseUiPlugin.java
+++ b/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/EclipseUiPlugin.java
@@ -1,3 +1,12 @@
+/*********************************************************************
+ * Copyright (c) 2003, 2007 IBM Corporation and others.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.eclipse;
 
diff --git a/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/editors/AbstractParXmlEditorPage.java b/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/editors/AbstractParXmlEditorPage.java
index 4430790..091eab7 100644
--- a/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/editors/AbstractParXmlEditorPage.java
+++ b/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/editors/AbstractParXmlEditorPage.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
+/*********************************************************************
  * 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
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
  *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.eclipse.editors;
 
diff --git a/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/editors/AbstractPdeFormPage.java b/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/editors/AbstractPdeFormPage.java
index 18f9d61..a43d009 100644
--- a/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/editors/AbstractPdeFormPage.java
+++ b/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/editors/AbstractPdeFormPage.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
+/*********************************************************************
  * 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
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
  *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.eclipse.editors;
 
diff --git a/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/editors/DependenciesSection.java b/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/editors/DependenciesSection.java
index f494ca5..170f4c6 100644
--- a/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/editors/DependenciesSection.java
+++ b/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/editors/DependenciesSection.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
+/*********************************************************************
  * 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
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
  *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.eclipse.editors;
 
diff --git a/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/wizards/AbstractNewParProjectWizard.java b/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/wizards/AbstractNewParProjectWizard.java
index 6abb92a..6f63839 100644
--- a/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/wizards/AbstractNewParProjectWizard.java
+++ b/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/wizards/AbstractNewParProjectWizard.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
+/*********************************************************************
  * 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
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
  *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.eclipse.wizards;
 
diff --git a/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/wizards/NewJavaProjectWizardConstants.java b/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/wizards/NewJavaProjectWizardConstants.java
index 84753ab..96d4931 100644
--- a/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/wizards/NewJavaProjectWizardConstants.java
+++ b/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/wizards/NewJavaProjectWizardConstants.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
+/*********************************************************************
  * 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
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
  *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.eclipse.wizards;
 
diff --git a/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/wizards/NewJavaProjectWizardPageOneCOPY.java b/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/wizards/NewJavaProjectWizardPageOneCOPY.java
index e756c62..4050666 100644
--- a/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/wizards/NewJavaProjectWizardPageOneCOPY.java
+++ b/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/wizards/NewJavaProjectWizardPageOneCOPY.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
+/*********************************************************************
  * 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
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
  *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.eclipse.wizards;
 
diff --git a/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/wizards/NewJavaProjectWizardPageTwoCOPY.java b/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/wizards/NewJavaProjectWizardPageTwoCOPY.java
index 2cb5eb8..a4a5c5d 100644
--- a/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/wizards/NewJavaProjectWizardPageTwoCOPY.java
+++ b/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/wizards/NewJavaProjectWizardPageTwoCOPY.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
+/*********************************************************************
  * 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
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
  *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.eclipse.wizards;
 
diff --git a/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/wizards/PdeMessageStrings.java b/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/wizards/PdeMessageStrings.java
index 9dc3bdb..fc6c9d2 100644
--- a/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/wizards/PdeMessageStrings.java
+++ b/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/wizards/PdeMessageStrings.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
+/*********************************************************************
  * 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
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
  *
- * Contributors:
- * IBM - Initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.eclipse.wizards;
 
diff --git a/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/wizards/ProjectContentPage.java b/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/wizards/ProjectContentPage.java
index 8ccf754..e4033e6 100644
--- a/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/wizards/ProjectContentPage.java
+++ b/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/wizards/ProjectContentPage.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
+/*********************************************************************
  * 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
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
  *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.eclipse.wizards;
 
diff --git a/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/wizards/RuntimeConfigurationPage.java b/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/wizards/RuntimeConfigurationPage.java
index 0768d8d..7eb2824 100644
--- a/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/wizards/RuntimeConfigurationPage.java
+++ b/org.eclipse.virgo.ide.eclipse/src/org/eclipse/virgo/ide/eclipse/wizards/RuntimeConfigurationPage.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
+/*********************************************************************
  * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
  *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.eclipse.wizards;
 
diff --git a/org.eclipse.virgo.ide.export.tests/about.html b/org.eclipse.virgo.ide.export.tests/about.html
index 2abb573..164f781 100644
--- a/org.eclipse.virgo.ide.export.tests/about.html
+++ b/org.eclipse.virgo.ide.export.tests/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>April 13, 2012</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.virgo.ide.export.tests/src/org/eclipse/virgo/ide/export/tests/BundleExportTestCase.java b/org.eclipse.virgo.ide.export.tests/src/org/eclipse/virgo/ide/export/tests/BundleExportTestCase.java
index 8165c6c..7c9dfb5 100644
--- a/org.eclipse.virgo.ide.export.tests/src/org/eclipse/virgo/ide/export/tests/BundleExportTestCase.java
+++ b/org.eclipse.virgo.ide.export.tests/src/org/eclipse/virgo/ide/export/tests/BundleExportTestCase.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2010 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.export.tests;
 
diff --git a/org.eclipse.virgo.ide.export.tests/src/org/eclipse/virgo/ide/export/tests/ParExportTestCase.java b/org.eclipse.virgo.ide.export.tests/src/org/eclipse/virgo/ide/export/tests/ParExportTestCase.java
index 38d7deb..d945224 100644
--- a/org.eclipse.virgo.ide.export.tests/src/org/eclipse/virgo/ide/export/tests/ParExportTestCase.java
+++ b/org.eclipse.virgo.ide.export.tests/src/org/eclipse/virgo/ide/export/tests/ParExportTestCase.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.export.tests;
 
diff --git a/org.eclipse.virgo.ide.export.tests/workspace/bundlor-test/src/com/springsource/Foo.java b/org.eclipse.virgo.ide.export.tests/workspace/bundlor-test/src/com/springsource/Foo.java
index 8b028a0..0217140 100644
--- a/org.eclipse.virgo.ide.export.tests/workspace/bundlor-test/src/com/springsource/Foo.java
+++ b/org.eclipse.virgo.ide.export.tests/workspace/bundlor-test/src/com/springsource/Foo.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc. and others.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 package com.springsource;
 
 /**
diff --git a/org.eclipse.virgo.ide.export.tests/workspace/bundlor-test/src1/com/springsource/bar/Bar.java b/org.eclipse.virgo.ide.export.tests/workspace/bundlor-test/src1/com/springsource/bar/Bar.java
index 59e6727..fbab3f9 100644
--- a/org.eclipse.virgo.ide.export.tests/workspace/bundlor-test/src1/com/springsource/bar/Bar.java
+++ b/org.eclipse.virgo.ide.export.tests/workspace/bundlor-test/src1/com/springsource/bar/Bar.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc. and others.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 package com.springsource.bar;
 
 /**
diff --git a/org.eclipse.virgo.ide.export/about.html b/org.eclipse.virgo.ide.export/about.html
index 2abb573..164f781 100644
--- a/org.eclipse.virgo.ide.export/about.html
+++ b/org.eclipse.virgo.ide.export/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>April 13, 2012</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.virgo.ide.export/src/org/eclipse/virgo/ide/export/AbstractProjectExportWizardPage.java b/org.eclipse.virgo.ide.export/src/org/eclipse/virgo/ide/export/AbstractProjectExportWizardPage.java
index c76bd82..0531cbb 100755
--- a/org.eclipse.virgo.ide.export/src/org/eclipse/virgo/ide/export/AbstractProjectExportWizardPage.java
+++ b/org.eclipse.virgo.ide.export/src/org/eclipse/virgo/ide/export/AbstractProjectExportWizardPage.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.export;
 
diff --git a/org.eclipse.virgo.ide.export/src/org/eclipse/virgo/ide/export/BundleExportUtils.java b/org.eclipse.virgo.ide.export/src/org/eclipse/virgo/ide/export/BundleExportUtils.java
index 466af0c..479cf5a 100755
--- a/org.eclipse.virgo.ide.export/src/org/eclipse/virgo/ide/export/BundleExportUtils.java
+++ b/org.eclipse.virgo.ide.export/src/org/eclipse/virgo/ide/export/BundleExportUtils.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.export;
 
diff --git a/org.eclipse.virgo.ide.export/src/org/eclipse/virgo/ide/export/BundleExportWizard.java b/org.eclipse.virgo.ide.export/src/org/eclipse/virgo/ide/export/BundleExportWizard.java
index 5439657..7fd51a2 100755
--- a/org.eclipse.virgo.ide.export/src/org/eclipse/virgo/ide/export/BundleExportWizard.java
+++ b/org.eclipse.virgo.ide.export/src/org/eclipse/virgo/ide/export/BundleExportWizard.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.export;
 
diff --git a/org.eclipse.virgo.ide.export/src/org/eclipse/virgo/ide/export/BundleExportWizardPage.java b/org.eclipse.virgo.ide.export/src/org/eclipse/virgo/ide/export/BundleExportWizardPage.java
index 8b572ba..c933cfb 100755
--- a/org.eclipse.virgo.ide.export/src/org/eclipse/virgo/ide/export/BundleExportWizardPage.java
+++ b/org.eclipse.virgo.ide.export/src/org/eclipse/virgo/ide/export/BundleExportWizardPage.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.export;
 
diff --git a/org.eclipse.virgo.ide.export/src/org/eclipse/virgo/ide/export/ParExportWizard.java b/org.eclipse.virgo.ide.export/src/org/eclipse/virgo/ide/export/ParExportWizard.java
index 3d2b205..5814c1f 100755
--- a/org.eclipse.virgo.ide.export/src/org/eclipse/virgo/ide/export/ParExportWizard.java
+++ b/org.eclipse.virgo.ide.export/src/org/eclipse/virgo/ide/export/ParExportWizard.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.export;
 
diff --git a/org.eclipse.virgo.ide.export/src/org/eclipse/virgo/ide/export/ParExportWizardPage.java b/org.eclipse.virgo.ide.export/src/org/eclipse/virgo/ide/export/ParExportWizardPage.java
index d7e45ca..e1e1340 100755
--- a/org.eclipse.virgo.ide.export/src/org/eclipse/virgo/ide/export/ParExportWizardPage.java
+++ b/org.eclipse.virgo.ide.export/src/org/eclipse/virgo/ide/export/ParExportWizardPage.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.export;
 
diff --git a/org.eclipse.virgo.ide.export/src/org/eclipse/virgo/ide/export/ServerExportPlugin.java b/org.eclipse.virgo.ide.export/src/org/eclipse/virgo/ide/export/ServerExportPlugin.java
index cc663dc..0284431 100755
--- a/org.eclipse.virgo.ide.export/src/org/eclipse/virgo/ide/export/ServerExportPlugin.java
+++ b/org.eclipse.virgo.ide.export/src/org/eclipse/virgo/ide/export/ServerExportPlugin.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.export;
 
diff --git a/org.eclipse.virgo.ide.facet.core/about.html b/org.eclipse.virgo.ide.facet.core/about.html
index 2abb573..164f781 100644
--- a/org.eclipse.virgo.ide.facet.core/about.html
+++ b/org.eclipse.virgo.ide.facet.core/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>April 13, 2012</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.virgo.ide.facet.core/plugin.xml b/org.eclipse.virgo.ide.facet.core/plugin.xml
index a8a97e7..689483a 100644
--- a/org.eclipse.virgo.ide.facet.core/plugin.xml
+++ b/org.eclipse.virgo.ide.facet.core/plugin.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.3"?>
 <!--
-/*******************************************************************************
- * Copyright (c) 2007, 2010 SpringSource
- * 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:
- *     SpringSource - initial API and implementation
- *******************************************************************************/
+/*********************************************************************
+ * Copyright (c) 2015 GianMaria Romanato
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 -->
 <plugin>
 	
diff --git a/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/core/AbstractOperation.java b/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/core/AbstractOperation.java
index cf79afb..5a05554 100644
--- a/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/core/AbstractOperation.java
+++ b/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/core/AbstractOperation.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- *  Copyright (c) 2016 GianMaria Romanato
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2016 GianMaria Romanato
  *
- *  Contributors:
- *     GianMaria Romanato - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.facet.core;
 
diff --git a/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/core/BundleFacetInstallDataModelProvider.java b/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/core/BundleFacetInstallDataModelProvider.java
index 8d1267c..8bab5be 100644
--- a/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/core/BundleFacetInstallDataModelProvider.java
+++ b/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/core/BundleFacetInstallDataModelProvider.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2011 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.facet.core;
 
diff --git a/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/core/BundleFacetInstallDelegate.java b/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/core/BundleFacetInstallDelegate.java
index 5e6c68f..53b66f6 100644
--- a/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/core/BundleFacetInstallDelegate.java
+++ b/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/core/BundleFacetInstallDelegate.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.facet.core;
 
diff --git a/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/core/BundleFacetUninstallDelegate.java b/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/core/BundleFacetUninstallDelegate.java
index 0935305..9c69fdd 100644
--- a/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/core/BundleFacetUninstallDelegate.java
+++ b/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/core/BundleFacetUninstallDelegate.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.facet.core;
 
diff --git a/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/core/CreatePlanProjectOperation.java b/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/core/CreatePlanProjectOperation.java
index f16308c..577a434 100644
--- a/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/core/CreatePlanProjectOperation.java
+++ b/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/core/CreatePlanProjectOperation.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- *  Copyright (c) 2016 GianMaria Romanato
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2016 GianMaria Romanato
  *
- *  Contributors:
- *     GianMaria Romanato - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.facet.core;
 
diff --git a/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/core/FacetCorePlugin.java b/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/core/FacetCorePlugin.java
index 87ecb91..d136ca1 100644
--- a/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/core/FacetCorePlugin.java
+++ b/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/core/FacetCorePlugin.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2010 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.facet.core;
 
diff --git a/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/core/FacetUtils.java b/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/core/FacetUtils.java
index 3662eba..1fbf35a 100644
--- a/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/core/FacetUtils.java
+++ b/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/core/FacetUtils.java
@@ -1,14 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009 - 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009 - 2012 SpringSource, a division of VMware, Inc. and others.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *     GianMaria Romanato - add utilities for management of nested plans
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.facet.core;
 
diff --git a/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/core/ParFacetInstallDelegate.java b/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/core/ParFacetInstallDelegate.java
index 71d799d..feb271b 100644
--- a/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/core/ParFacetInstallDelegate.java
+++ b/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/core/ParFacetInstallDelegate.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.facet.core;
 
diff --git a/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/core/PlanFacetInstallDelegate.java b/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/core/PlanFacetInstallDelegate.java
index 94964a1..d0c447b 100644
--- a/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/core/PlanFacetInstallDelegate.java
+++ b/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/core/PlanFacetInstallDelegate.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2010 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2010 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.facet.core;
 
diff --git a/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/core/ServerNature.java b/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/core/ServerNature.java
index 6a64a80..e15a1f8 100644
--- a/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/core/ServerNature.java
+++ b/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/core/ServerNature.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.facet.core;
 
diff --git a/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/internal/core/Artifact.java b/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/internal/core/Artifact.java
index 087b55e..862fa5a 100644
--- a/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/internal/core/Artifact.java
+++ b/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/internal/core/Artifact.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- *  Copyright (c) 2016 GianMaria Romanato
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2016 GianMaria Romanato
  *
- *  Contributors:
- *     GianMaria Romanato - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.facet.internal.core;
 
diff --git a/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/internal/core/BundleReference.java b/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/internal/core/BundleReference.java
index 2656beb..0673b5f 100644
--- a/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/internal/core/BundleReference.java
+++ b/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/internal/core/BundleReference.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- *  Copyright (c) 2016 GianMaria Romanato
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2016 GianMaria Romanato
  *
- *  Contributors:
- *     GianMaria Romanato - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.facet.internal.core;
 
diff --git a/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/internal/core/Plan.java b/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/internal/core/Plan.java
index a8641ff..68785f7 100644
--- a/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/internal/core/Plan.java
+++ b/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/internal/core/Plan.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- *  Copyright (c) 2016 GianMaria Romanato
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2016 GianMaria Romanato
  *
- *  Contributors:
- *     GianMaria Romanato - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.facet.internal.core;
 
diff --git a/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/internal/core/PlanReader.java b/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/internal/core/PlanReader.java
index 85fac12..b618ac6 100644
--- a/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/internal/core/PlanReader.java
+++ b/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/internal/core/PlanReader.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- *  Copyright (c) 2016 GianMaria Romanato
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2016 GianMaria Romanato
  *
- *  Contributors:
- *     GianMaria Romanato - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.facet.internal.core;
 
diff --git a/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/internal/core/PlanReference.java b/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/internal/core/PlanReference.java
index 511b3e7..c77462d 100644
--- a/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/internal/core/PlanReference.java
+++ b/org.eclipse.virgo.ide.facet.core/src/org/eclipse/virgo/ide/facet/internal/core/PlanReference.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- *  Copyright (c) 2016 GianMaria Romanato
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2016 GianMaria Romanato
  *
- *  Contributors:
- *     GianMaria Romanato - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.facet.internal.core;
 
diff --git a/org.eclipse.virgo.ide.feature/about.html b/org.eclipse.virgo.ide.feature/about.html
index 2abb573..164f781 100644
--- a/org.eclipse.virgo.ide.feature/about.html
+++ b/org.eclipse.virgo.ide.feature/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>April 13, 2012</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.virgo.ide.feature/build.properties b/org.eclipse.virgo.ide.feature/build.properties
index 74f5553..fd8580c 100644
--- a/org.eclipse.virgo.ide.feature/build.properties
+++ b/org.eclipse.virgo.ide.feature/build.properties
@@ -1,10 +1,10 @@
 bin.includes = feature.xml,\
                feature.properties,\
                about.html,\
-               epl-v10.html,\
+               epl-v20.html,\
                license.html
 src.includes = feature.xml,\
                feature.properties,\
                about.html,\
-               epl-v10.html,\
+               epl-v20.html,\
                license.html
diff --git a/org.eclipse.virgo.ide.feature/epl-v10.html b/org.eclipse.virgo.ide.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/org.eclipse.virgo.ide.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/org.eclipse.virgo.ide.feature/epl-v20.html b/org.eclipse.virgo.ide.feature/epl-v20.html
new file mode 100644
index 0000000..4b95323
--- /dev/null
+++ b/org.eclipse.virgo.ide.feature/epl-v20.html
@@ -0,0 +1,299 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <title>Eclipse Public License - Version 2.0</title>
+    <style type="text/css">
+      body {
+        margin: 1.5em 3em;
+      }
+      h1{
+        font-size:1.5em;
+      }
+      h2{
+        font-size:1em;
+        margin-bottom:0.5em;
+        margin-top:1em;
+      }
+      p {
+        margin-top:  0.5em;
+        margin-bottom: 0.5em;
+      }
+      ul, ol{
+        list-style-type:none;
+      }
+    </style>
+  </head>
+  <body>
+    <h1>Eclipse Public License - v 2.0</h1>
+    <p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+      PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION
+      OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+    </p>
+    <h2 id="definitions">1. DEFINITIONS</h2>
+    <p>“Contribution” means:</p>
+    <ul>
+      <li>a) in the case of the initial Contributor, the initial content
+        Distributed under this Agreement, and
+      </li>
+      <li>
+        b) in the case of each subsequent Contributor:
+        <ul>
+          <li>i) changes to the Program, and</li>
+          <li>ii) additions to the Program;</li>
+        </ul>
+        where such changes and/or additions to the Program originate from
+        and are Distributed by that particular Contributor. A Contribution
+        “originates” from a Contributor if it was added to the Program by such
+        Contributor itself or anyone acting on such Contributor's behalf.
+        Contributions do not include changes or additions to the Program that
+        are not Modified Works.
+      </li>
+    </ul>
+    <p>“Contributor” means any person or entity that Distributes the Program.</p>
+    <p>“Licensed Patents” mean patent claims licensable by a Contributor which
+      are necessarily infringed by the use or sale of its Contribution alone
+      or when combined with the Program.
+    </p>
+    <p>“Program” means the Contributions Distributed in accordance with this
+      Agreement.
+    </p>
+    <p>“Recipient” means anyone who receives the Program under this Agreement
+      or any Secondary License (as applicable), including Contributors.
+    </p>
+    <p>“Derivative Works” shall mean any work, whether in Source Code or other
+      form, that is based on (or derived from) the Program and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship.
+    </p>
+    <p>“Modified Works” shall mean any work in Source Code or other form that
+      results from an addition to, deletion from, or modification of the
+      contents of the Program, including, for purposes of clarity any new file
+      in Source Code form that contains any contents of the Program. Modified
+      Works shall not include works that contain only declarations, interfaces,
+      types, classes, structures, or files of the Program solely in each case
+      in order to link to, bind by name, or subclass the Program or Modified
+      Works thereof.
+    </p>
+    <p>“Distribute” means the acts of a) distributing or b) making available
+      in any manner that enables the transfer of a copy.
+    </p>
+    <p>“Source Code” means the form of a Program preferred for making
+      modifications, including but not limited to software source code,
+      documentation source, and configuration files.
+    </p>
+    <p>“Secondary License” means either the GNU General Public License,
+      Version 2.0, or any later versions of that license, including any
+      exceptions or additional permissions as identified by the initial
+      Contributor.
+    </p>
+    <h2 id="grant-of-rights">2. GRANT OF RIGHTS</h2>
+    <ul>
+      <li>a) Subject to the terms of this Agreement, each Contributor hereby
+        grants Recipient a non-exclusive, worldwide, royalty-free copyright
+        license to reproduce, prepare Derivative Works of, publicly display,
+        publicly perform, Distribute and sublicense the Contribution of such
+        Contributor, if any, and such Derivative Works.
+      </li>
+      <li>b) Subject to the terms of this Agreement, each Contributor hereby
+        grants Recipient a non-exclusive, worldwide, royalty-free patent
+        license under Licensed Patents to make, use, sell, offer to sell,
+        import and otherwise transfer the Contribution of such Contributor,
+        if any, in Source Code or other form. This patent license shall
+        apply to the combination of the Contribution and the Program if,
+        at the time the Contribution is added by the Contributor, such
+        addition of the Contribution causes such combination to be covered
+        by the Licensed Patents. The patent license shall not apply to any
+        other combinations which include the Contribution. No hardware per
+        se is licensed hereunder.
+      </li>
+      <li>c) Recipient understands that although each Contributor grants the
+        licenses to its Contributions set forth herein, no assurances are
+        provided by any Contributor that the Program does not infringe the
+        patent or other intellectual property rights of any other entity.
+        Each Contributor disclaims any liability to Recipient for claims
+        brought by any other entity based on infringement of intellectual
+        property rights or otherwise. As a condition to exercising the rights
+        and licenses granted hereunder, each Recipient hereby assumes sole
+        responsibility to secure any other intellectual property rights needed,
+        if any. For example, if a third party patent license is required to
+        allow Recipient to Distribute the Program, it is Recipient's
+        responsibility to acquire that license before distributing the Program.
+      </li>
+      <li>d) Each Contributor represents that to its knowledge it has sufficient
+        copyright rights in its Contribution, if any, to grant the copyright
+        license set forth in this Agreement.
+      </li>
+      <li>e) Notwithstanding the terms of any Secondary License, no Contributor
+        makes additional grants to any Recipient (other than those set forth
+        in this Agreement) as a result of such Recipient's receipt of the
+        Program under the terms of a Secondary License (if permitted under
+        the terms of Section 3).
+      </li>
+    </ul>
+    <h2 id="requirements">3. REQUIREMENTS</h2>
+    <p>3.1 If a Contributor Distributes the Program in any form, then:</p>
+    <ul>
+      <li>a) the Program must also be made available as Source Code, in
+        accordance with section 3.2, and the Contributor must accompany
+        the Program with a statement that the Source Code for the Program
+        is available under this Agreement, and informs Recipients how to
+        obtain it in a reasonable manner on or through a medium customarily
+        used for software exchange; and
+      </li>
+      <li>
+        b) the Contributor may Distribute the Program under a license
+        different than this Agreement, provided that such license:
+        <ul>
+          <li>i) effectively disclaims on behalf of all other Contributors all
+            warranties and conditions, express and implied, including warranties
+            or conditions of title and non-infringement, and implied warranties
+            or conditions of merchantability and fitness for a particular purpose;
+          </li>
+          <li>ii) effectively excludes on behalf of all other Contributors all
+            liability for damages, including direct, indirect, special, incidental
+            and consequential damages, such as lost profits;
+          </li>
+          <li>iii) does not attempt to limit or alter the recipients' rights in the
+            Source Code under section 3.2; and
+          </li>
+          <li>iv) requires any subsequent distribution of the Program by any party
+            to be under a license that satisfies the requirements of this section 3.
+          </li>
+        </ul>
+      </li>
+    </ul>
+    <p>3.2 When the Program is Distributed as Source Code:</p>
+    <ul>
+      <li>a) it must be made available under this Agreement, or if the Program (i)
+        is combined with other material in a separate file or files made available
+        under a Secondary License, and (ii) the initial Contributor attached to
+        the Source Code the notice described in Exhibit A of this Agreement,
+        then the Program may be made available under the terms of such
+        Secondary Licenses, and
+      </li>
+      <li>b) a copy of this Agreement must be included with each copy of the Program.</li>
+    </ul>
+    <p>3.3 Contributors may not remove or alter any copyright, patent, trademark,
+      attribution notices, disclaimers of warranty, or limitations of liability
+      (‘notices’) contained within the Program from any copy of the Program which
+      they Distribute, provided that Contributors may add their own appropriate
+      notices.
+    </p>
+    <h2 id="commercial-distribution">4. COMMERCIAL DISTRIBUTION</h2>
+    <p>Commercial distributors of software may accept certain responsibilities
+      with respect to end users, business partners and the like. While this
+      license is intended to facilitate the commercial use of the Program, the
+      Contributor who includes the Program in a commercial product offering should
+      do so in a manner which does not create potential liability for other
+      Contributors. Therefore, if a Contributor includes the Program in a
+      commercial product offering, such Contributor (“Commercial Contributor”)
+      hereby agrees to defend and indemnify every other Contributor
+      (“Indemnified Contributor”) against any losses, damages and costs
+      (collectively “Losses”) arising from claims, lawsuits and other legal actions
+      brought by a third party against the Indemnified Contributor to the extent
+      caused by the acts or omissions of such Commercial Contributor in connection
+      with its distribution of the Program in a commercial product offering.
+      The obligations in this section do not apply to any claims or Losses relating
+      to any actual or alleged intellectual property infringement. In order to
+      qualify, an Indemnified Contributor must: a) promptly notify the
+      Commercial Contributor in writing of such claim, and b) allow the Commercial
+      Contributor to control, and cooperate with the Commercial Contributor in,
+      the defense and any related settlement negotiations. The Indemnified
+      Contributor may participate in any such claim at its own expense.
+    </p>
+    <p>For example, a Contributor might include the Program
+      in a commercial product offering, Product X. That Contributor is then a
+      Commercial Contributor. If that Commercial Contributor then makes performance
+      claims, or offers warranties related to Product X, those performance claims
+      and warranties are such Commercial Contributor's responsibility alone.
+      Under this section, the Commercial Contributor would have to defend claims
+      against the other Contributors related to those performance claims and
+      warranties, and if a court requires any other Contributor to pay any damages
+      as a result, the Commercial Contributor must pay those damages.
+    </p>
+    <h2 id="warranty">5. NO WARRANTY</h2>
+    <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
+      BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN “AS IS” BASIS, WITHOUT
+      WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
+      WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+      MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is
+      solely responsible for determining the appropriateness of using and
+      distributing the Program and assumes all risks associated with its
+      exercise of rights under this Agreement, including but not limited to the
+      risks and costs of program errors, compliance with applicable laws, damage
+      to or loss of data, programs or equipment, and unavailability or
+      interruption of operations.
+    </p>
+    <h2 id="disclaimer">6. DISCLAIMER OF LIABILITY</h2>
+    <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
+      BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY
+      LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+      OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS),
+      HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+      LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+      OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
+      GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+    </p>
+    <h2 id="general">7. GENERAL</h2>
+    <p>If any provision of this Agreement is invalid or unenforceable under
+      applicable law, it shall not affect the validity or enforceability of the
+      remainder of the terms of this Agreement, and without further action by the
+      parties hereto, such provision shall be reformed to the minimum extent
+      necessary to make such provision valid and enforceable.
+    </p>
+    <p>If Recipient institutes patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Program itself
+      (excluding combinations of the Program with other software or hardware)
+      infringes such Recipient's patent(s), then such Recipient's rights granted
+      under Section 2(b) shall terminate as of the date such litigation is filed.
+    </p>
+    <p>All Recipient's rights under this Agreement shall terminate if it fails to
+      comply with any of the material terms or conditions of this Agreement and
+      does not cure such failure in a reasonable period of time after becoming
+      aware of such noncompliance. If all Recipient's rights under this Agreement
+      terminate, Recipient agrees to cease use and distribution of the Program
+      as soon as reasonably practicable. However, Recipient's obligations under
+      this Agreement and any licenses granted by Recipient relating to the
+      Program shall continue and survive.
+    </p>
+    <p>Everyone is permitted to copy and distribute copies of this Agreement,
+      but in order to avoid inconsistency the Agreement is copyrighted and may
+      only be modified in the following manner. The Agreement Steward reserves
+      the right to publish new versions (including revisions) of this Agreement
+      from time to time. No one other than the Agreement Steward has the right
+      to modify this Agreement. The Eclipse Foundation is the initial Agreement
+      Steward. The Eclipse Foundation may assign the responsibility to serve as
+      the Agreement Steward to a suitable separate entity. Each new version of
+      the Agreement will be given a distinguishing version number. The Program
+      (including Contributions) may always be Distributed subject to the version
+      of the Agreement under which it was received. In addition, after a new
+      version of the Agreement is published, Contributor may elect to Distribute
+      the Program (including its Contributions) under the new version.
+    </p>
+    <p>Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+      receives no rights or licenses to the intellectual property of any
+      Contributor under this Agreement, whether expressly, by implication,
+      estoppel or otherwise. All rights in the Program not expressly granted
+      under this Agreement are reserved. Nothing in this Agreement is intended
+      to be enforceable by any entity that is not a Contributor or Recipient.
+      No third-party beneficiary rights are created under this Agreement.
+    </p>
+    <h2 id="exhibit-a">Exhibit A – Form of Secondary Licenses Notice</h2>
+    <p>“This Source Code may also be made available under the following 
+    	Secondary Licenses when the conditions for such availability set forth 
+    	in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+    	version(s), and exceptions or additional permissions here}.”
+    </p>
+    <blockquote>
+      <p>Simply including a copy of this Agreement, including this Exhibit A
+        is not sufficient to license the Source Code under Secondary Licenses.
+      </p>
+      <p>If it is not possible or desirable to put the notice in a particular file,
+        then You may include the notice in a location (such as a LICENSE file in a
+        relevant directory) where a recipient would be likely to look for
+        such a notice.
+      </p>
+      <p>You may add additional accurate notices of copyright ownership.</p>
+    </blockquote>
+  
+</body></html>
\ No newline at end of file
diff --git a/org.eclipse.virgo.ide.feature/feature.properties b/org.eclipse.virgo.ide.feature/feature.properties
index d54c5aa..19a05aa 100644
--- a/org.eclipse.virgo.ide.feature/feature.properties
+++ b/org.eclipse.virgo.ide.feature/feature.properties
@@ -16,137 +16,156 @@
 
 # "copyright" property - text of the Copyright
 copyright=\
-Copyright (c) 2007-2012 SpringSource and others.  All rights reserved.
+Copyright (c) 2007-2018 SpringSource and others.  All rights reserved.
 
 ################ end of copyright property ####################################
 
-licenseUrl=epl-v10.html
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
 
 # "license" property - text of the "Feature Update License"
 # should be plain text version of license agreement pointed to be "licenseURL"
 license=\
 Eclipse Foundation Software User Agreement\n\
-February 1, 2011\n\
+\n\
+November 22, 2017\n\
 \n\
 Usage Of Content\n\
 \n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION\n\
+AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF\n\
+THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE\n\
+TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED\n\
+BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\
+AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY\n\
+APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU\n\
+MAY NOT USE THE CONTENT.\n\
 \n\
 Applicable Licenses\n\
 \n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
+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 License\n\
+Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also\n\
+available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,\n\
+"Program" will mean the Content.\n\
 \n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
+Content includes, but is not limited to, source code, object code, documentation\n\
+and other files maintained in the Eclipse Foundation source code repository\n\
+("Repository") in software modules ("Modules") and made available as\n\
+downloadable archives ("Downloads").\n\
 \n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+-   Content may be structured and packaged into modules to facilitate\n\
+    delivering, extending, and upgrading the Content. Typical modules may\n\
+    include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and\n\
+    features ("Features").\n\
+-   Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\
+    (Javaâ\u201E¢ ARchive) in a directory named "plugins".\n\
+-   A Feature is a bundle of one or more Plug-ins and/or Fragments and\n\
+    associated material. Each Feature may be packaged as a sub-directory in a\n\
+    directory named "features". Within a Feature, files named "feature.xml" may\n\
+    contain a list of the names and version numbers of the Plug-ins and/or\n\
+    Fragments associated with that Feature.\n\
+-   Features may also include other Features ("Included Features"). Within a\n\
+    Feature, files named "feature.xml" may contain a list of the names and\n\
+    version numbers of Included Features.\n\
 \n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
+The terms and conditions governing Plug-ins and Fragments should be contained in\n\
+files named "about.html" ("Abouts"). The terms and conditions governing Features\n\
+and Included Features should be contained in files named "license.html"\n\
+("Feature Licenses"). Abouts and Feature Licenses may be located in any\n\
+directory of a Download or Module including, but not limited to the following\n\
+locations:\n\
 \n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
+-   The top-level (root) directory\n\
+-   Plug-in and Fragment directories\n\
+-   Inside Plug-ins and Fragments packaged as JARs\n\
+-   Sub-directories of the directory named "src" of certain Plug-ins\n\
+-   Feature directories\n\
 \n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using\n\
+the Provisioning Technology (as defined below), you must agree to a license\n\
+("Feature Update License") during the installation process. If the Feature\n\
+contains Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform you\n\
+where you can locate them. Feature Update Licenses may be found in the "license"\n\
+property of files named "feature.properties" found within a Feature. Such\n\
+Abouts, Feature Licenses, and Feature Update Licenses contain the terms and\n\
+conditions (or references to such terms and conditions) that govern your use of\n\
+the associated Content in that directory.\n\
 \n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL\n\
+OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE\n\
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
 \n\
-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+-   Eclipse Public License Version 1.0 (available at\n\
+    http://www.eclipse.org/legal/epl-v10.html)\n\
+-   Eclipse Distribution License Version 1.0 (available at\n\
+    http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+-   Common Public License Version 1.0 (available at\n\
+    http://www.eclipse.org/legal/cpl-v10.html)\n\
+-   Apache Software License 1.1 (available at\n\
+    http://www.apache.org/licenses/LICENSE)\n\
+-   Apache Software License 2.0 (available at\n\
+    http://www.apache.org/licenses/LICENSE-2.0)\n\
+-   Mozilla Public License Version 1.1 (available at\n\
+    http://www.mozilla.org/MPL/MPL-1.1.html)\n\
 \n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO\n\
+USE OF THE CONTENT. If no About, Feature License, or Feature Update License is\n\
+provided, please contact the Eclipse Foundation to determine what terms and\n\
+conditions govern that particular Content.\n\
 \n\
-\n\Use of Provisioning Technology\n\
+Use of Provisioning Technology\n\
 \n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
+The Eclipse Foundation makes available provisioning software, examples of which\n\
+include, but are not limited to, p2 and the Eclipse Update Manager\n\
+("Provisioning Technology") for the purpose of allowing users to install\n\
+software, documentation, information and/or other materials (collectively\n\
+"Installable Software"). This capability is provided with the intent of allowing\n\
+such users to install, extend and update Eclipse-based products. Information\n\
+about packaging Installable Software is available at\n\
 http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
 \n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
+You may use Provisioning Technology to allow other parties to install\n\
+Installable Software. You shall be responsible for enabling the applicable\n\
+license agreements relating to the Installable Software to be presented to, and\n\
+accepted by, the users of the Provisioning Technology in accordance with the\n\
+Specification. By using Provisioning Technology in such a manner and making it\n\
+available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the\n\
+following:\n\
 \n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
+1.  A series of actions may occur ("Provisioning Process") in which a user may\n\
+    execute the Provisioning Technology on a machine ("Target Machine") with the\n\
+    intent of installing, extending or updating the functionality of an\n\
+    Eclipse-based product.\n\
+2.  During the Provisioning Process, the Provisioning Technology may cause third\n\
+    party Installable Software or a portion thereof to be accessed and copied to\n\
+    the Target Machine.\n\
+3.  Pursuant to the Specification, you will provide to the user the terms and\n\
+    conditions that govern the use of the Installable Software ("Installable\n\
+    Software Agreement") and such Installable Software Agreement shall be\n\
+    accessed from the Target Machine in accordance with the Specification. Such\n\
+    Installable Software Agreement must inform the user of the terms and\n\
+    conditions that govern the Installable Software and must solicit acceptance\n\
+    by the end user in the manner prescribed in such Installable\n\
+    Software Agreement. Upon such indication of agreement by the user, the\n\
+    provisioning Technology will complete installation of the\n\
+    Installable Software.\n\
 \n\
 Cryptography\n\
 \n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
+Content may contain encryption software. The country in which you are currently\n\
+may have restrictions on the import, possession, and use, and/or re-export to\n\
+another country, of encryption software. BEFORE using any encryption software,\n\
+please check the country's laws, regulations and policies concerning the import,\n\
+possession, or use, and re-export of encryption software, to see if this is\n\
+permitted.\n\
 \n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the\n\
+United States, other countries, or both.\n
 ########### end of license property ##########################################
+
diff --git a/org.eclipse.virgo.ide.feature/feature.xml b/org.eclipse.virgo.ide.feature/feature.xml
index 6cf63cc..d8acbe5 100644
--- a/org.eclipse.virgo.ide.feature/feature.xml
+++ b/org.eclipse.virgo.ide.feature/feature.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-/*******************************************************************************
- * Copyright (c) 2007, 2012 SpringSource
- * 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:
- *     SpringSource - initial API and implementation
- *******************************************************************************/
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc. and others.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 -->
 <feature
       id="org.eclipse.virgo.ide.feature"
@@ -33,23 +32,69 @@
    <requires>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.core.resources"/>
+      <import plugin="org.eclipse.jdt.core"/>
+      <import plugin="org.eclipse.jdt.launching"/>
+      <import plugin="org.eclipse.wst.common.modulecore"/>
       <import plugin="org.eclipse.wst.server.core"/>
       <import plugin="org.eclipse.jst.server.core"/>
-      <import plugin="org.eclipse.jdt.launching"/>
-      <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.jdt.core"/>
       <import plugin="org.eclipse.debug.ui"/>
       <import plugin="org.eclipse.jdt.debug.ui"/>
-      <import plugin="org.eclipse.jst.common.project.facet.core"/>
       <import plugin="org.eclipse.wst.server.ui"/>
       <import plugin="org.eclipse.wst.common.project.facet.core"/>
       <import plugin="org.eclipse.wst.common.project.facet.ui"/>
       <import plugin="org.eclipse.wst.common.frameworks"/>
       <import plugin="org.eclipse.wst.common.core"/>
-      <import plugin="org.eclipse.wst.common.modulecore"/>
       <import plugin="org.eclipse.equinox.launcher"/>
       <import plugin="org.eclipse.jface.text"/>
+      <import plugin="org.eclipse.jst.common.project.facet.core"/>
+      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.ui.forms"/>
+      <import plugin="org.eclipse.core.filesystem"/>
+      <import plugin="org.eclipse.jdt.ui"/>
+      <import plugin="org.eclipse.pde.ui"/>
+      <import plugin="org.eclipse.wst.web"/>
+      <import plugin="org.eclipse.wst.web.ui"/>
+      <import plugin="org.eclipse.wst.common.frameworks.ui"/>
+      <import plugin="org.apache.commons.logging"/>
+      <import plugin="org.eclipse.jst.common.frameworks"/>
+      <import plugin="org.eclipse.pde.core"/>
+      <import plugin="org.eclipse.core.expressions"/>
+      <import plugin="org.apache.commons.lang"/>
+      <import plugin="org.eclipse.swt"/>
+      <import plugin="org.eclipse.core.net"/>
+      <import plugin="org.apache.commons.codec"/>
+      <import plugin="org.apache.commons.httpclient"/>
+      <import plugin="org.eclipse.ui.console"/>
+      <import plugin="org.eclipse.wst.xml.core"/>
+      <import plugin="org.eclipse.wst.sse.core"/>
+      <import plugin="org.eclipse.ui.browser"/>
+      <import plugin="org.eclipse.ui.views"/>
+      <import plugin="org.eclipse.ui.navigator"/>
+      <import plugin="org.eclipse.ui.navigator.resources"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor"/>
+      <import plugin="org.eclipse.emf.edit.ui"/>
+      <import plugin="org.eclipse.wst.xml.ui"/>
+      <import plugin="org.eclipse.search"/>
+      <import plugin="org.eclipse.ui.editors"/>
+      <import plugin="org.eclipse.pde.build"/>
+      <import plugin="org.eclipse.wst.sse.ui"/>
+      <import plugin="org.eclipse.ltk.core.refactoring"/>
+      <import plugin="org.eclipse.wst.sse.ui.infopop" version="1.0.300" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jst.j2ee.web"/>
+      <import plugin="org.eclipse.jst.j2ee.core"/>
+      <import plugin="org.eclipse.emf.common"/>
+      <import plugin="org.eclipse.emf.ecore"/>
+      <import plugin="org.eclipse.core.filebuffers"/>
+      <import plugin="org.eclipse.emf.ecore.xmi"/>
+      <import plugin="org.eclipse.emf.edit"/>
+      <import plugin="org.eclipse.jface"/>
+      <import plugin="org.eclipse.ui.workbench"/>
+      <import plugin="org.eclipse.jst.j2ee"/>
+      <import plugin="org.slf4j.api"/>
+      <import plugin="org.eclipse.help"/>
+      <import plugin="org.eclipse.help.ui"/>
    </requires>
 
    <plugin
@@ -72,13 +117,13 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-         
+
    <plugin
          id="org.eclipse.virgo.ide.pde.core"
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>         
+         unpack="false"/>
 
    <plugin
          id="org.eclipse.virgo.ide.jdt.core"
@@ -227,34 +272,6 @@
          unpack="false"/>
 
    <plugin
-         id="org.slf4j.api"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="ch.qos.logback.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="ch.qos.logback.classic"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="ch.qos.logback.slf4j"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.jdom"
          download-size="0"
          install-size="0"
@@ -274,4 +291,45 @@
          install-size="0"
          version="0.0.0"/>
 
+   <plugin
+         id="org.objectweb.asm"
+         download-size="0"
+         install-size="0"
+         version="3.3.1.v201105211655"/>
+
+   <plugin
+         id="org.eclipse.virgo.util.osgi.manifest"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.json"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.libra.framework.editor.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
+   <plugin
+         id="org.eclipse.libra.framework.editor.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>  
+
+   <plugin
+         id="org.aspectj.weaver"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>    
+
 </feature>
diff --git a/org.eclipse.virgo.ide.feature/license.html b/org.eclipse.virgo.ide.feature/license.html
index 1e1b68b..6554028 100644
--- a/org.eclipse.virgo.ide.feature/license.html
+++ b/org.eclipse.virgo.ide.feature/license.html
@@ -1,51 +1,181 @@
-Eclipse Foundation Software User Agreement
+<!--?xml version="1.0" encoding="ISO-8859-1" ?-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
 
-February 1, 2011
+<body lang="EN-US">
+	<h2>Eclipse Foundation Software User Agreement</h2>
+	<p>November 22, 2017</p>
 
-Usage Of Content
+	<h3>Usage Of Content</h3>
 
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.
+	<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION,
+		INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+		(COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY
+		THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+		CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
+		BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS
+		GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY
+		APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
+		BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS
+		AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
+		AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT
+		USE THE CONTENT.</p>
 
-Applicable Licenses
+	<h3>Applicable Licenses</h3>
 
-Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content.
+	<p>
+		Unless otherwise indicated, all Content made available by the Eclipse
+		Foundation is provided to you under the terms and conditions of the
+		Eclipse Public License Version 2.0 ("EPL"). A copy of the
+		EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, "Program" will mean the Content.
+	</p>
 
-Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").
+	<p>Content includes, but is not limited to, source code, object
+		code, documentation and other files maintained in the Eclipse
+		Foundation source code repository ("Repository") in software
+		modules ("Modules") and made available as downloadable
+		archives ("Downloads").</p>
 
-Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").
-Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".
-A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins and/or Fragments associated with that Feature.
-Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.
-The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module including, but not limited to the following locations:
+	<ul>
+		<li>Content may be structured and packaged into modules to
+			facilitate delivering, extending, and upgrading the Content. Typical
+			modules may include plug-ins ("Plug-ins"), plug-in
+			fragments ("Fragments"), and features
+			("Features").</li>
+		<li>Each Plug-in or Fragment may be packaged as a sub-directory
+			or JAR (Java™ ARchive) in a directory named
+			"plugins".</li>
+		<li>A Feature is a bundle of one or more Plug-ins and/or
+			Fragments and associated material. Each Feature may be packaged as a
+			sub-directory in a directory named "features". Within a
+			Feature, files named "feature.xml" may contain a list of
+			the names and version numbers of the Plug-ins and/or Fragments
+			associated with that Feature.</li>
+		<li>Features may also include other Features ("Included
+			Features"). Within a Feature, files named
+			"feature.xml" may contain a list of the names and version
+			numbers of Included Features.</li>
+	</ul>
 
-The top-level (root) directory
-Plug-in and Fragment directories
-Inside Plug-ins and Fragments packaged as JARs
-Sub-directories of the directory named "src" of certain Plug-ins
-Feature directories
-Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in that directory.
+	<p>The terms and conditions governing Plug-ins and Fragments should
+		be contained in files named "about.html"
+		("Abouts"). The terms and conditions governing Features and
+		Included Features should be contained in files named
+		"license.html" ("Feature Licenses"). Abouts and
+		Feature Licenses may be located in any directory of a Download or
+		Module including, but not limited to the following locations:</p>
 
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
+	<ul>
+		<li>The top-level (root) directory</li>
+		<li>Plug-in and Fragment directories</li>
+		<li>Inside Plug-ins and Fragments packaged as JARs</li>
+		<li>Sub-directories of the directory named "src" of
+			certain Plug-ins</li>
+		<li>Feature directories</li>
+	</ul>
 
-Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)
-Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
-Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
-Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
-Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)
-Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
+	<p>Note: if a Feature made available by the Eclipse Foundation is
+		installed using the Provisioning Technology (as defined below), you
+		must agree to a license ("Feature Update License") during
+		the installation process. If the Feature contains Included Features,
+		the Feature Update License should either provide you with the terms
+		and conditions governing the Included Features or inform you where you
+		can locate them. Feature Update Licenses may be found in the
+		"license" property of files named
+		"feature.properties" found within a Feature. Such Abouts,
+		Feature Licenses, and Feature Update Licenses contain the terms and
+		conditions (or references to such terms and conditions) that govern
+		your use of the associated Content in that directory.</p>
 
-Use of Provisioning Technology
+	<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY
+		REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND
+		CONDITIONS. SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT
+		ARE NOT LIMITED TO):</p>
 
-The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").
+	<ul>
+		<li>Eclipse Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>)
+		</li>
+		<li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)
+		</li>
+		<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)
+		</li>
+		<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)
+		</li>
+		<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)
+		</li>
+		<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)
+		</li>
+	</ul>
 
-You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:
+	<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND
+		CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License,
+		or Feature Update License is provided, please contact the Eclipse
+		Foundation to determine what terms and conditions govern that
+		particular Content.</p>
 
-A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based product.
-During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be accessed and copied to the Target Machine.
-Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.
-Cryptography
 
-Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted.
+	<h3>Use of Provisioning Technology</h3>
 
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
\ No newline at end of file
+	<p>
+		The Eclipse Foundation makes available provisioning software, examples
+		of which include, but are not limited to, p2 and the Eclipse Update
+		Manager ("Provisioning Technology") for the purpose of
+		allowing users to install software, documentation, information and/or
+		other materials (collectively "Installable Software"). This
+		capability is provided with the intent of allowing such users to
+		install, extend and update Eclipse-based products. Information about
+		packaging Installable Software is available at <a href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+		("Specification").
+	</p>
+
+	<p>You may use Provisioning Technology to allow other parties to
+		install Installable Software. You shall be responsible for enabling
+		the applicable license agreements relating to the Installable Software
+		to be presented to, and accepted by, the users of the Provisioning
+		Technology in accordance with the Specification. By using Provisioning
+		Technology in such a manner and making it available in accordance with
+		the Specification, you further acknowledge your agreement to, and the
+		acquisition of all necessary rights to permit the following:</p>
+
+	<ol>
+		<li>A series of actions may occur ("Provisioning
+			Process") in which a user may execute the Provisioning
+			Technology on a machine ("Target Machine") with the intent
+			of installing, extending or updating the functionality of an
+			Eclipse-based product.</li>
+		<li>During the Provisioning Process, the Provisioning Technology
+			may cause third party Installable Software or a portion thereof to be
+			accessed and copied to the Target Machine.</li>
+		<li>Pursuant to the Specification, you will provide to the user
+			the terms and conditions that govern the use of the Installable
+			Software ("Installable Software Agreement") and such
+			Installable Software Agreement shall be accessed from the Target
+			Machine in accordance with the Specification. Such Installable
+			Software Agreement must inform the user of the terms and conditions
+			that govern the Installable Software and must solicit acceptance by
+			the end user in the manner prescribed in such Installable Software
+			Agreement. Upon such indication of agreement by the user, the
+			provisioning Technology will complete installation of the Installable
+			Software.</li>
+	</ol>
+
+	<h3>Cryptography</h3>
+
+	<p>Content may contain encryption software. The country in which
+		you are currently may have restrictions on the import, possession, and
+		use, and/or re-export to another country, of encryption software.
+		BEFORE using any encryption software, please check the country's laws,
+		regulations and policies concerning the import, possession, or use,
+		and re-export of encryption software, to see if this is permitted.</p>
+
+	<p>
+		<small>Java and all Java-based trademarks are trademarks of
+			Oracle Corporation in the United States, other countries, or both.</small>
+	</p>
+
+
+</body></html>
\ No newline at end of file
diff --git a/org.eclipse.virgo.ide.jdt.core/about.html b/org.eclipse.virgo.ide.jdt.core/about.html
index 2abb573..164f781 100644
--- a/org.eclipse.virgo.ide.jdt.core/about.html
+++ b/org.eclipse.virgo.ide.jdt.core/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>April 13, 2012</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.virgo.ide.jdt.core/plugin.xml b/org.eclipse.virgo.ide.jdt.core/plugin.xml
index 33b8cea..3aa3617 100644
--- a/org.eclipse.virgo.ide.jdt.core/plugin.xml
+++ b/org.eclipse.virgo.ide.jdt.core/plugin.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.3"?>
 <!--
-/*******************************************************************************
+/*********************************************************************
  * Copyright (c) 2007, 2012 SpringSource
- * 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:
- *     SpringSource - initial API and implementation
- *******************************************************************************/
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 -->
 <plugin>
 	
diff --git a/org.eclipse.virgo.ide.jdt.core/src/org/eclipse/virgo/ide/jdt/core/JdtCorePlugin.java b/org.eclipse.virgo.ide.jdt.core/src/org/eclipse/virgo/ide/jdt/core/JdtCorePlugin.java
index 22f0a2a..2dc4696 100644
--- a/org.eclipse.virgo.ide.jdt.core/src/org/eclipse/virgo/ide/jdt/core/JdtCorePlugin.java
+++ b/org.eclipse.virgo.ide.jdt.core/src/org/eclipse/virgo/ide/jdt/core/JdtCorePlugin.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.jdt.core;
 
diff --git a/org.eclipse.virgo.ide.jdt.core/src/org/eclipse/virgo/ide/jdt/core/ServerClasspathContainerPropertyTester.java b/org.eclipse.virgo.ide.jdt.core/src/org/eclipse/virgo/ide/jdt/core/ServerClasspathContainerPropertyTester.java
index 591acb9..74322ed 100644
--- a/org.eclipse.virgo.ide.jdt.core/src/org/eclipse/virgo/ide/jdt/core/ServerClasspathContainerPropertyTester.java
+++ b/org.eclipse.virgo.ide.jdt.core/src/org/eclipse/virgo/ide/jdt/core/ServerClasspathContainerPropertyTester.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.jdt.core;
 
diff --git a/org.eclipse.virgo.ide.jdt.core/src/org/eclipse/virgo/ide/jdt/internal/core/classpath/ServerClasspathContainer.java b/org.eclipse.virgo.ide.jdt.core/src/org/eclipse/virgo/ide/jdt/internal/core/classpath/ServerClasspathContainer.java
index 2e8001a..57d4924 100644
--- a/org.eclipse.virgo.ide.jdt.core/src/org/eclipse/virgo/ide/jdt/internal/core/classpath/ServerClasspathContainer.java
+++ b/org.eclipse.virgo.ide.jdt.core/src/org/eclipse/virgo/ide/jdt/internal/core/classpath/ServerClasspathContainer.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2010 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.jdt.internal.core.classpath;
 
diff --git a/org.eclipse.virgo.ide.jdt.core/src/org/eclipse/virgo/ide/jdt/internal/core/classpath/ServerClasspathContainerBundleManifestChangeListener.java b/org.eclipse.virgo.ide.jdt.core/src/org/eclipse/virgo/ide/jdt/internal/core/classpath/ServerClasspathContainerBundleManifestChangeListener.java
index 4fae137..4e850e3 100644
--- a/org.eclipse.virgo.ide.jdt.core/src/org/eclipse/virgo/ide/jdt/internal/core/classpath/ServerClasspathContainerBundleManifestChangeListener.java
+++ b/org.eclipse.virgo.ide.jdt.core/src/org/eclipse/virgo/ide/jdt/internal/core/classpath/ServerClasspathContainerBundleManifestChangeListener.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.jdt.internal.core.classpath;
 
diff --git a/org.eclipse.virgo.ide.jdt.core/src/org/eclipse/virgo/ide/jdt/internal/core/classpath/ServerClasspathContainerInitializer.java b/org.eclipse.virgo.ide.jdt.core/src/org/eclipse/virgo/ide/jdt/internal/core/classpath/ServerClasspathContainerInitializer.java
index 85c3e0d..4983e3d 100644
--- a/org.eclipse.virgo.ide.jdt.core/src/org/eclipse/virgo/ide/jdt/internal/core/classpath/ServerClasspathContainerInitializer.java
+++ b/org.eclipse.virgo.ide.jdt.core/src/org/eclipse/virgo/ide/jdt/internal/core/classpath/ServerClasspathContainerInitializer.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.jdt.internal.core.classpath;
 
diff --git a/org.eclipse.virgo.ide.jdt.core/src/org/eclipse/virgo/ide/jdt/internal/core/classpath/ServerClasspathContainerUpdateJob.java b/org.eclipse.virgo.ide.jdt.core/src/org/eclipse/virgo/ide/jdt/internal/core/classpath/ServerClasspathContainerUpdateJob.java
index 73f634e..0e33bb5 100644
--- a/org.eclipse.virgo.ide.jdt.core/src/org/eclipse/virgo/ide/jdt/internal/core/classpath/ServerClasspathContainerUpdateJob.java
+++ b/org.eclipse.virgo.ide.jdt.core/src/org/eclipse/virgo/ide/jdt/internal/core/classpath/ServerClasspathContainerUpdateJob.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2011 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2011 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.jdt.internal.core.classpath;
 
diff --git a/org.eclipse.virgo.ide.jdt.core/src/org/eclipse/virgo/ide/jdt/internal/core/classpath/ServerClasspathUtils.java b/org.eclipse.virgo.ide.jdt.core/src/org/eclipse/virgo/ide/jdt/internal/core/classpath/ServerClasspathUtils.java
index 9ba1472..7e840dd 100644
--- a/org.eclipse.virgo.ide.jdt.core/src/org/eclipse/virgo/ide/jdt/internal/core/classpath/ServerClasspathUtils.java
+++ b/org.eclipse.virgo.ide.jdt.core/src/org/eclipse/virgo/ide/jdt/internal/core/classpath/ServerClasspathUtils.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2010 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.jdt.internal.core.classpath;
 
diff --git a/org.eclipse.virgo.ide.jdt.core/src/org/eclipse/virgo/ide/jdt/internal/core/util/ClasspathUtils.java b/org.eclipse.virgo.ide.jdt.core/src/org/eclipse/virgo/ide/jdt/internal/core/util/ClasspathUtils.java
index 88f21c2..21a91bc 100644
--- a/org.eclipse.virgo.ide.jdt.core/src/org/eclipse/virgo/ide/jdt/internal/core/util/ClasspathUtils.java
+++ b/org.eclipse.virgo.ide.jdt.core/src/org/eclipse/virgo/ide/jdt/internal/core/util/ClasspathUtils.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.jdt.internal.core.util;
 
diff --git a/org.eclipse.virgo.ide.jdt.core/src/org/eclipse/virgo/ide/jdt/internal/core/util/MarkerConstants.java b/org.eclipse.virgo.ide.jdt.core/src/org/eclipse/virgo/ide/jdt/internal/core/util/MarkerConstants.java
index f9b2d0e..1a5c5d0 100644
--- a/org.eclipse.virgo.ide.jdt.core/src/org/eclipse/virgo/ide/jdt/internal/core/util/MarkerConstants.java
+++ b/org.eclipse.virgo.ide.jdt.core/src/org/eclipse/virgo/ide/jdt/internal/core/util/MarkerConstants.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.jdt.internal.core.util;
 
diff --git a/org.eclipse.virgo.ide.jdt.core/src/org/eclipse/virgo/ide/jdt/internal/core/util/MarkerUtils.java b/org.eclipse.virgo.ide.jdt.core/src/org/eclipse/virgo/ide/jdt/internal/core/util/MarkerUtils.java
index a2cbd17..0eab2a2 100644
--- a/org.eclipse.virgo.ide.jdt.core/src/org/eclipse/virgo/ide/jdt/internal/core/util/MarkerUtils.java
+++ b/org.eclipse.virgo.ide.jdt.core/src/org/eclipse/virgo/ide/jdt/internal/core/util/MarkerUtils.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.jdt.internal.core.util;
 
diff --git a/org.eclipse.virgo.ide.jdt.ui/about.html b/org.eclipse.virgo.ide.jdt.ui/about.html
index 2abb573..164f781 100644
--- a/org.eclipse.virgo.ide.jdt.ui/about.html
+++ b/org.eclipse.virgo.ide.jdt.ui/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>April 13, 2012</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.virgo.ide.jdt.ui/plugin.xml b/org.eclipse.virgo.ide.jdt.ui/plugin.xml
index f91ac87..c39111c 100644
--- a/org.eclipse.virgo.ide.jdt.ui/plugin.xml
+++ b/org.eclipse.virgo.ide.jdt.ui/plugin.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.3"?>
 <!--
-/*******************************************************************************
+/*********************************************************************
  * Copyright (c) 2007, 2012 SpringSource
- * 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:
- *     SpringSource - initial API and implementation
- *******************************************************************************/
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 -->
 <plugin>
    
diff --git a/org.eclipse.virgo.ide.jdt.ui/src/org/eclipse/virgo/ide/jdt/internal/ui/actions/EnableServerClasspathContainerActionDelegate.java b/org.eclipse.virgo.ide.jdt.ui/src/org/eclipse/virgo/ide/jdt/internal/ui/actions/EnableServerClasspathContainerActionDelegate.java
index 3cc518d..42dfe1e 100644
--- a/org.eclipse.virgo.ide.jdt.ui/src/org/eclipse/virgo/ide/jdt/internal/ui/actions/EnableServerClasspathContainerActionDelegate.java
+++ b/org.eclipse.virgo.ide.jdt.ui/src/org/eclipse/virgo/ide/jdt/internal/ui/actions/EnableServerClasspathContainerActionDelegate.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.jdt.internal.ui.actions;
 
diff --git a/org.eclipse.virgo.ide.jdt.ui/src/org/eclipse/virgo/ide/jdt/internal/ui/actions/RefreshServerClasspathContainerActionDelegate.java b/org.eclipse.virgo.ide.jdt.ui/src/org/eclipse/virgo/ide/jdt/internal/ui/actions/RefreshServerClasspathContainerActionDelegate.java
index d05383e..a85f6ca 100644
--- a/org.eclipse.virgo.ide.jdt.ui/src/org/eclipse/virgo/ide/jdt/internal/ui/actions/RefreshServerClasspathContainerActionDelegate.java
+++ b/org.eclipse.virgo.ide.jdt.ui/src/org/eclipse/virgo/ide/jdt/internal/ui/actions/RefreshServerClasspathContainerActionDelegate.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2010 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.jdt.internal.ui.actions;
 
diff --git a/org.eclipse.virgo.ide.jdt.ui/src/org/eclipse/virgo/ide/jdt/internal/ui/classpath/ServerClasspathContainerPage.java b/org.eclipse.virgo.ide.jdt.ui/src/org/eclipse/virgo/ide/jdt/internal/ui/classpath/ServerClasspathContainerPage.java
index 4d230a6..668e7a3 100644
--- a/org.eclipse.virgo.ide.jdt.ui/src/org/eclipse/virgo/ide/jdt/internal/ui/classpath/ServerClasspathContainerPage.java
+++ b/org.eclipse.virgo.ide.jdt.ui/src/org/eclipse/virgo/ide/jdt/internal/ui/classpath/ServerClasspathContainerPage.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.jdt.internal.ui.classpath;
 
diff --git a/org.eclipse.virgo.ide.jdt.ui/src/org/eclipse/virgo/ide/jdt/internal/ui/decoration/JdtClasspathContainerElementDecorator.java b/org.eclipse.virgo.ide.jdt.ui/src/org/eclipse/virgo/ide/jdt/internal/ui/decoration/JdtClasspathContainerElementDecorator.java
index 6301c23..7e66e7b 100644
--- a/org.eclipse.virgo.ide.jdt.ui/src/org/eclipse/virgo/ide/jdt/internal/ui/decoration/JdtClasspathContainerElementDecorator.java
+++ b/org.eclipse.virgo.ide.jdt.ui/src/org/eclipse/virgo/ide/jdt/internal/ui/decoration/JdtClasspathContainerElementDecorator.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.jdt.internal.ui.decoration;
 
diff --git a/org.eclipse.virgo.ide.jdt.ui/src/org/eclipse/virgo/ide/jdt/internal/ui/decoration/JdtUiImages.java b/org.eclipse.virgo.ide.jdt.ui/src/org/eclipse/virgo/ide/jdt/internal/ui/decoration/JdtUiImages.java
index cf2dc5c..0982ba5 100644
--- a/org.eclipse.virgo.ide.jdt.ui/src/org/eclipse/virgo/ide/jdt/internal/ui/decoration/JdtUiImages.java
+++ b/org.eclipse.virgo.ide.jdt.ui/src/org/eclipse/virgo/ide/jdt/internal/ui/decoration/JdtUiImages.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.jdt.internal.ui.decoration;
 
diff --git a/org.eclipse.virgo.ide.jdt.ui/src/org/eclipse/virgo/ide/jdt/internal/ui/properties/TestSourceFolderPreferencePage.java b/org.eclipse.virgo.ide.jdt.ui/src/org/eclipse/virgo/ide/jdt/internal/ui/properties/TestSourceFolderPreferencePage.java
index 919aa68..e1a78c4 100644
--- a/org.eclipse.virgo.ide.jdt.ui/src/org/eclipse/virgo/ide/jdt/internal/ui/properties/TestSourceFolderPreferencePage.java
+++ b/org.eclipse.virgo.ide.jdt.ui/src/org/eclipse/virgo/ide/jdt/internal/ui/properties/TestSourceFolderPreferencePage.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.jdt.internal.ui.properties;
 
diff --git a/org.eclipse.virgo.ide.jdt.ui/src/org/eclipse/virgo/ide/jdt/ui/JdtUiPlugin.java b/org.eclipse.virgo.ide.jdt.ui/src/org/eclipse/virgo/ide/jdt/ui/JdtUiPlugin.java
index a69f2af..f68a7ec 100644
--- a/org.eclipse.virgo.ide.jdt.ui/src/org/eclipse/virgo/ide/jdt/ui/JdtUiPlugin.java
+++ b/org.eclipse.virgo.ide.jdt.ui/src/org/eclipse/virgo/ide/jdt/ui/JdtUiPlugin.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.jdt.ui;
 
diff --git a/org.eclipse.virgo.ide.management.remote/about.html b/org.eclipse.virgo.ide.management.remote/about.html
index 2abb573..164f781 100644
--- a/org.eclipse.virgo.ide.management.remote/about.html
+++ b/org.eclipse.virgo.ide.management.remote/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>April 13, 2012</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.virgo.ide.management.remote/src/org/eclipse/virgo/ide/management/remote/Bundle.java b/org.eclipse.virgo.ide.management.remote/src/org/eclipse/virgo/ide/management/remote/Bundle.java
index 585f13d..cd8e19e 100644
--- a/org.eclipse.virgo.ide.management.remote/src/org/eclipse/virgo/ide/management/remote/Bundle.java
+++ b/org.eclipse.virgo.ide.management.remote/src/org/eclipse/virgo/ide/management/remote/Bundle.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2007, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a divison of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.management.remote;
 
diff --git a/org.eclipse.virgo.ide.management.remote/src/org/eclipse/virgo/ide/management/remote/BundleAdmin.java b/org.eclipse.virgo.ide.management.remote/src/org/eclipse/virgo/ide/management/remote/BundleAdmin.java
index acf2302..212118a 100644
--- a/org.eclipse.virgo.ide.management.remote/src/org/eclipse/virgo/ide/management/remote/BundleAdmin.java
+++ b/org.eclipse.virgo.ide.management.remote/src/org/eclipse/virgo/ide/management/remote/BundleAdmin.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2007, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a divison of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.management.remote;
 
diff --git a/org.eclipse.virgo.ide.management.remote/src/org/eclipse/virgo/ide/management/remote/PackageExport.java b/org.eclipse.virgo.ide.management.remote/src/org/eclipse/virgo/ide/management/remote/PackageExport.java
index b209793..0b27428 100644
--- a/org.eclipse.virgo.ide.management.remote/src/org/eclipse/virgo/ide/management/remote/PackageExport.java
+++ b/org.eclipse.virgo.ide.management.remote/src/org/eclipse/virgo/ide/management/remote/PackageExport.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2007, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a divison of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.management.remote;
 
diff --git a/org.eclipse.virgo.ide.management.remote/src/org/eclipse/virgo/ide/management/remote/PackageImport.java b/org.eclipse.virgo.ide.management.remote/src/org/eclipse/virgo/ide/management/remote/PackageImport.java
index 0027882..739d2ae 100644
--- a/org.eclipse.virgo.ide.management.remote/src/org/eclipse/virgo/ide/management/remote/PackageImport.java
+++ b/org.eclipse.virgo.ide.management.remote/src/org/eclipse/virgo/ide/management/remote/PackageImport.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2007, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a divison of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.management.remote;
 
diff --git a/org.eclipse.virgo.ide.management.remote/src/org/eclipse/virgo/ide/management/remote/ServiceReference.java b/org.eclipse.virgo.ide.management.remote/src/org/eclipse/virgo/ide/management/remote/ServiceReference.java
index d4720bc..b4158c8 100644
--- a/org.eclipse.virgo.ide.management.remote/src/org/eclipse/virgo/ide/management/remote/ServiceReference.java
+++ b/org.eclipse.virgo.ide.management.remote/src/org/eclipse/virgo/ide/management/remote/ServiceReference.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2007, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a divison of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.management.remote;
 
diff --git a/org.eclipse.virgo.ide.management.remote/src/org/eclipse/virgo/ide/management/remote/StandardBundleAdmin.java b/org.eclipse.virgo.ide.management.remote/src/org/eclipse/virgo/ide/management/remote/StandardBundleAdmin.java
index 10f4918..38761de 100644
--- a/org.eclipse.virgo.ide.management.remote/src/org/eclipse/virgo/ide/management/remote/StandardBundleAdmin.java
+++ b/org.eclipse.virgo.ide.management.remote/src/org/eclipse/virgo/ide/management/remote/StandardBundleAdmin.java
@@ -1,14 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2007, 2012 SpringSource, a division of VMware, Inc. and others.
  *
- * Contributors:
- *     SpringSource, a divison of VMware, Inc. - initial API and implementation
- *     SAP AG - support for new equinox console
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.management.remote;
 
diff --git a/org.eclipse.virgo.ide.manifest.core/META-INF/MANIFEST.MF b/org.eclipse.virgo.ide.manifest.core/META-INF/MANIFEST.MF
index 9668fcc..a687a3c 100644
--- a/org.eclipse.virgo.ide.manifest.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.virgo.ide.manifest.core/META-INF/MANIFEST.MF
@@ -40,8 +40,6 @@
  org.eclipse.virgo.ide.manifest.core.editor.model,
  org.eclipse.virgo.ide.manifest.internal.core,
  org.eclipse.virgo.ide.manifest.internal.core.model,
- org.eclipse.virgo.ide.manifest.internal.core.validation,
- org.eclipse.virgo.ide.manifest.internal.core.validation.rules,
  org.eclipse.virgo.ide.module.core,
  org.eclipse.virgo.kernel.osgi.provisioning.tools,
  org.eclipse.virgo.kernel.repository
diff --git a/org.eclipse.virgo.ide.manifest.core/about.html b/org.eclipse.virgo.ide.manifest.core/about.html
index 2abb573..164f781 100644
--- a/org.eclipse.virgo.ide.manifest.core/about.html
+++ b/org.eclipse.virgo.ide.manifest.core/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>April 13, 2012</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.virgo.ide.manifest.core/plugin.xml b/org.eclipse.virgo.ide.manifest.core/plugin.xml
index 9900777..c10d350 100644
--- a/org.eclipse.virgo.ide.manifest.core/plugin.xml
+++ b/org.eclipse.virgo.ide.manifest.core/plugin.xml
@@ -1,25 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.2"?>
 <!--
-/*******************************************************************************
- * Copyright (c) 2007, 2010 SpringSource
- * 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:
- *     SpringSource - initial API and implementation
- *******************************************************************************/
+/*********************************************************************
+ * Copyright (c) 2007, 2012 SpringSource
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 -->
-<plugin>

-

-	<extension point="org.eclipse.ui.editors.annotationTypes"> 

-		<type

-        markerSeverity="0"

-        markerType="org.eclipse.virgo.ide.manifest.core.dmservermanifestproblemmarker"

-        name="org.eclipse.virgo.ide.manifest.core.dmservermanifestproblemmarker.annotation"/> 

-    </extension> 

+<plugin>
+
+	<extension point="org.eclipse.ui.editors.annotationTypes"> 
+		<type
+        markerSeverity="0"
+        markerType="org.eclipse.virgo.ide.manifest.core.dmservermanifestproblemmarker"
+        name="org.eclipse.virgo.ide.manifest.core.dmservermanifestproblemmarker.annotation"/> 
+    </extension> 
 
 	<extension point="org.eclipse.core.resources.markers" id="dmservermanifestproblemmarker"
 		name="%manifestProblemMarker">
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/BundleManifestCoreMessages.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/BundleManifestCoreMessages.java
index c1e4e32..b01e4f7 100644
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/BundleManifestCoreMessages.java
+++ b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/BundleManifestCoreMessages.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.manifest.core;
 
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/BundleManifestCorePlugin.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/BundleManifestCorePlugin.java
index 92e19ad..1aff756 100644
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/BundleManifestCorePlugin.java
+++ b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/BundleManifestCorePlugin.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.manifest.core;
 
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/BundleManifestUtils.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/BundleManifestUtils.java
index f427e4d..052cdca 100644
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/BundleManifestUtils.java
+++ b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/BundleManifestUtils.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009 - 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009 - 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.manifest.core;
 
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/IBundleManifestChangeListener.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/IBundleManifestChangeListener.java
index a849bfc..c69a53f 100644
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/IBundleManifestChangeListener.java
+++ b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/IBundleManifestChangeListener.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.manifest.core;
 
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/IBundleManifestManager.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/IBundleManifestManager.java
index a750ba5..0a96511 100644
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/IBundleManifestManager.java
+++ b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/IBundleManifestManager.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.manifest.core;
 
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/IBundleManifestMangerWorkingCopy.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/IBundleManifestMangerWorkingCopy.java
index 05022aa..ef2f961 100644
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/IBundleManifestMangerWorkingCopy.java
+++ b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/IBundleManifestMangerWorkingCopy.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.manifest.core;
 
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/IHeaderConstants.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/IHeaderConstants.java
index c0223aa..055666d 100644
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/IHeaderConstants.java
+++ b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/IHeaderConstants.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.manifest.core;
 
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/dependencies/IDependencyLocator.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/dependencies/IDependencyLocator.java
index 33c9a23..75513cb 100644
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/dependencies/IDependencyLocator.java
+++ b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/dependencies/IDependencyLocator.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.manifest.core.dependencies;
 
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/editor/model/ImportBundleHeader.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/editor/model/ImportBundleHeader.java
index 599e47e..845d420 100644
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/editor/model/ImportBundleHeader.java
+++ b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/editor/model/ImportBundleHeader.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.manifest.core.editor.model;
 
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/editor/model/ImportBundleObject.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/editor/model/ImportBundleObject.java
index 71d721a..a23d43d 100644
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/editor/model/ImportBundleObject.java
+++ b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/editor/model/ImportBundleObject.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.manifest.core.editor.model;
 
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/editor/model/ImportLibraryHeader.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/editor/model/ImportLibraryHeader.java
index 39f21bb..7671e77 100644
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/editor/model/ImportLibraryHeader.java
+++ b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/editor/model/ImportLibraryHeader.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.manifest.core.editor.model;
 
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/editor/model/ImportLibraryObject.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/editor/model/ImportLibraryObject.java
index f5b186b..62beb56 100644
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/editor/model/ImportLibraryObject.java
+++ b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/editor/model/ImportLibraryObject.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.manifest.core.editor.model;
 
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/editor/model/SpringBundleModel.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/editor/model/SpringBundleModel.java
index 0486537..8b77def 100644
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/editor/model/SpringBundleModel.java
+++ b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/editor/model/SpringBundleModel.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.manifest.core.editor.model;
 
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/editor/model/SpringBundleModelFactory.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/editor/model/SpringBundleModelFactory.java
index b4ada78..5b08f2f 100644
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/editor/model/SpringBundleModelFactory.java
+++ b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/core/editor/model/SpringBundleModelFactory.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.manifest.core.editor.model;
 
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/BundleManifestDiffer.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/BundleManifestDiffer.java
index a904737..8fdaa03 100644
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/BundleManifestDiffer.java
+++ b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/BundleManifestDiffer.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.manifest.internal.core;
 
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/BundleManifestManager.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/BundleManifestManager.java
index 08b39ff..a079629 100644
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/BundleManifestManager.java
+++ b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/BundleManifestManager.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009 - 2013 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009 - 2013 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.manifest.internal.core;
 
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/model/AbstractManifestElement.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/model/AbstractManifestElement.java
index 7463ba6..4060e57 100644
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/model/AbstractManifestElement.java
+++ b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/model/AbstractManifestElement.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.manifest.internal.core.model;
 
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/model/BundleManifest.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/model/BundleManifest.java
index 0cc0e72..1acd24a 100644
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/model/BundleManifest.java
+++ b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/model/BundleManifest.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009 - 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009 - 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.manifest.internal.core.model;
 
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/model/BundleManifestHeader.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/model/BundleManifestHeader.java
index 1e0edc7..4b70b3a 100644
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/model/BundleManifestHeader.java
+++ b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/model/BundleManifestHeader.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009 - 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009 - 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.manifest.internal.core.model;
 
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/model/BundleManifestHeaderElement.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/model/BundleManifestHeaderElement.java
index dd01d34..1bc0950 100644
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/model/BundleManifestHeaderElement.java
+++ b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/model/BundleManifestHeaderElement.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009 - 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009 - 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.manifest.internal.core.model;
 
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/BundleManifestValidationContext.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/BundleManifestValidationContext.java
deleted file mode 100644
index 7067138..0000000
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/BundleManifestValidationContext.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/// *******************************************************************************
-// * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
-// * All rights reserved. This program and the accompanying materials
-// * are made available under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available at
-// * http://www.eclipse.org/legal/epl-v10.html
-// *
-// * Contributors:
-// * SpringSource, a division of VMware, Inc. - initial API and implementation
-// *******************************************************************************/
-// package org.eclipse.virgo.ide.manifest.internal.core.validation;
-//
-// import java.util.ArrayList;
-// import java.util.Arrays;
-// import java.util.List;
-//
-//
-//
-/// **
-// * @author Christian Dupuis
-// * @since 1.0.0
-// */
-/// **
-// * TODO CD add comments
-// */
-// public class BundleManifestValidationContext extends AbstractValidationContext {
-//
-// public static final String[] BOOLEAN_VALUES = new String[] { "true", "false" };
-//
-// public BundleManifestValidationContext(IResourceModelElement rootElement,
-// IResourceModelElement contextElement) {
-// super(rootElement, contextElement);
-// }
-//
-// public void error(String problemId, String msg, int line, ValidationProblemAttribute... attributes) {
-// error(getRootElement(), problemId, msg, mergeAttributes(line, attributes));
-// }
-//
-// public void errorIllegalAttributeValue(BundleManifestHeader header, ManifestElement element,
-// String key, String value) {
-// String msg = NLS.bind(BundleManifestCoreMessages.BundleErrorReporter_att_value,
-// (new String[] { value, key }));
-// error(getRootElement(), "ILLEGAL_ATTRIBUTE_VALUE", msg, new ValidationProblemAttribute(
-// IMarker.LINE_NUMBER, BundleManifestUtils.getLineNumber(getDocument(), header, key
-// + "=")));
-// }
-//
-// public void errorIllegalDirectiveValue(BundleManifestHeader header, ManifestElement element,
-// String key, String value) {
-// String msg = NLS.bind(BundleManifestCoreMessages.BundleErrorReporter_dir_value,
-// (new String[] { value, key }));
-// error(getRootElement(), "ILLEGAL_DIRECTIVE_VALUE", msg, new ValidationProblemAttribute(
-// IMarker.LINE_NUMBER, BundleManifestUtils.getLineNumber(getDocument(), header, key
-// + ":=")));
-// }
-//
-// public void errorIllegalValue(BundleManifestHeader header, ManifestElement element, String illegalValue, String
-/// errorId) {
-// String msg = NLS.bind(BundleManifestCoreMessages.BundleErrorReporter_illegal_value, illegalValue);
-// error(getRootElement(), errorId, msg, new ValidationProblemAttribute(
-// IMarker.LINE_NUMBER, BundleManifestUtils
-// .getLineNumber(getDocument(), header, illegalValue)));
-// }
-//
-// public BundleManifest getBundleManifest() {
-// return (BundleManifest) getRootElement();
-// }
-//
-// public void info(String problemId, String msg, int line, ValidationProblemAttribute... attributes) {
-// info(getRootElement(), problemId, msg, mergeAttributes(line, attributes));
-// }
-//
-// public void validateAttributeValue(BundleManifestHeader header, ManifestElement element,
-// String key, String[] allowedValues) {
-// String value = element.getAttribute(key);
-// if (value == null) {
-// return;
-// }
-// for (int i = 0; i < allowedValues.length; i++) {
-// if (allowedValues[i].equals(value)) {
-// return;
-// }
-// }
-// errorIllegalAttributeValue(header, element, key, value);
-// }
-//
-// public void validateBooleanAttributeValue(BundleManifestHeader header, ManifestElement element,
-// String key) {
-// validateAttributeValue(header, element, key, BOOLEAN_VALUES);
-// }
-//
-// public void validateBooleanDirectiveValue(BundleManifestHeader header, ManifestElement element,
-// String key) {
-// validateDirectiveValue(header, element, key, BOOLEAN_VALUES);
-// }
-//
-// public void validateBooleanValue(BundleManifestHeader header) {
-// validateHeaderValue(header, BOOLEAN_VALUES, "ILLEGAL_VALUE");
-// }
-//
-// public void validateDirectiveValue(BundleManifestHeader header, ManifestElement element,
-// String key, String[] allowedValues) {
-// String value = element.getDirective(key);
-// if (value == null) {
-// return;
-// }
-// for (int i = 0; i < allowedValues.length; i++) {
-// if (allowedValues[i].equals(value)) {
-// return;
-// }
-// }
-// errorIllegalDirectiveValue(header, element, key, value);
-// }
-//
-// public void validateHeaderValue(BundleManifestHeader header, String[] allowedValues, String errorId) {
-// BundleManifestHeaderElement[] elements = header.getBundleManifestHeaderElements();
-// if (elements != null && elements.length > 0) {
-// for (int i = 0; i < allowedValues.length; i++) {
-// if (allowedValues[i].equals(elements[0].getManifestElement().getValue())) {
-// return;
-// }
-// }
-// errorIllegalValue(header, elements[0].getManifestElement(), elements[0]
-// .getManifestElement().getValue(), errorId);
-// }
-// }
-//
-// public BundleManifestHeader validateRequiredHeader(String name, String missingRequiredHeaderErrorId) {
-// BundleManifestHeader header = getBundleManifest().getHeader(name);
-// if (header == null) {
-// String msg = NLS.bind(BundleManifestCoreMessages.BundleErrorReporter_headerMissing,
-// name);
-// error(getRootElement(), missingRequiredHeaderErrorId, msg, new ValidationProblemAttribute(
-// IMarker.LINE_NUMBER, new Integer(1)));
-// }
-// return header;
-// }
-//
-// public void warning(String problemId, String msg, int line, ValidationProblemAttribute... attributes) {
-// warning(getRootElement(), problemId, msg, mergeAttributes(line, attributes));
-// }
-//
-// private ValidationProblemAttribute[] mergeAttributes(int line, ValidationProblemAttribute... attributes) {
-// List<ValidationProblemAttribute> attributeList = new ArrayList<ValidationProblemAttribute>();
-// if (attributes != null && attributes.length > 0) {
-// attributeList.addAll(Arrays.asList(attributes));
-// }
-// attributeList.add(new ValidationProblemAttribute(IMarker.LINE_NUMBER, line));
-// return attributeList.toArray(new ValidationProblemAttribute[attributeList.size()]);
-// }
-//
-// private IDocument getDocument() {
-// return getBundleManifest().getDocument();
-// }
-//
-// }
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/BundleManifestValidator.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/BundleManifestValidator.java
deleted file mode 100644
index dc7b1fb..0000000
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/BundleManifestValidator.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/// *******************************************************************************
-// * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
-// * All rights reserved. This program and the accompanying materials
-// * are made available under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available at
-// * http://www.eclipse.org/legal/epl-v10.html
-// *
-// * Contributors:
-// * SpringSource, a division of VMware, Inc. - initial API and implementation
-// *******************************************************************************/
-// package org.eclipse.virgo.ide.manifest.internal.core.validation;
-//
-//
-//
-/// **
-// * {@link AbstractValidator} that handles validation of MANIFEST.MF.
-// * @author Christian Dupuis
-// * @since 1.0.0
-// */
-// public class BundleManifestValidator extends AbstractValidator {
-//
-// /**
-// * {@inheritDoc}
-// */
-// public Set<IResource> deriveResources(Object object) {
-// return Collections.emptySet();
-// }
-//
-// /**
-// * {@inheritDoc}
-// */
-// public Set<IResource> getAffectedResources(IResource resource, int kind, int deltaKind) throws CoreException {
-// IJavaProject javaProject = JavaCore.create(resource.getProject());
-// IResource bundleManifest = BundleManifestUtils.locateManifest(javaProject, false);
-// Set<IResource> resources = new LinkedHashSet<IResource>();
-// if ((FacetUtils.isBundleProject(resource) && resource.equals(bundleManifest))
-// || (FacetUtils.isParProject(resource) && SpringCoreUtils.isManifest(resource))) {
-// resources.add(resource);
-// }
-// else if (FacetUtils.isBundleProject(resource)
-// && resource.getProjectRelativePath().toString().equals("template.mf")) {
-// resources.add(resource);
-// }
-// return resources;
-// }
-//
-// /**
-// * {@inheritDoc}
-// */
-// @Override
-// protected IValidationContext createContext(IResourceModelElement rootElement, IResourceModelElement contextElement) {
-// return new BundleManifestValidationContext(rootElement, contextElement);
-// }
-//
-// /**
-// * {@inheritDoc}
-// */
-// @Override
-// protected IValidationElementLifecycleManager createValidationElementLifecycleManager() {
-// return new BundleManifestElementLifecycleManager();
-// }
-//
-// /**
-// * {@inheritDoc}
-// */
-// @Override
-// protected boolean supports(IModelElement element) {
-// return element instanceof BundleManifest || element instanceof BundleManifestHeader;
-// }
-//
-// static class BundleManifestElementLifecycleManager implements IValidationElementLifecycleManager {
-//
-// private IResourceModelElement rootElement = null;
-//
-// /**
-// * {@inheritDoc}
-// */
-// public void destory() {
-// // nothing to do
-// }
-//
-// /**
-// * {@inheritDoc}
-// */
-// public Set<IResourceModelElement> getContextElements() {
-// Set<IResourceModelElement> contextElements = new HashSet<IResourceModelElement>();
-// contextElements.add(getRootElement());
-// return contextElements;
-// }
-//
-// /**
-// * {@inheritDoc}
-// */
-// public IResourceModelElement getRootElement() {
-// return rootElement;
-// }
-//
-// public void init(IResource resource) {
-// if (resource instanceof IFile) {
-// rootElement = new BundleManifest((IFile) resource);
-// }
-// }
-// }
-//
-// }
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/AbstractApplicationManifestHeaderRule.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/AbstractApplicationManifestHeaderRule.java
deleted file mode 100644
index fb345d8..0000000
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/AbstractApplicationManifestHeaderRule.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/// *******************************************************************************
-// * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
-// * All rights reserved. This program and the accompanying materials
-// * are made available under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available at
-// * http://www.eclipse.org/legal/epl-v10.html
-// *
-// * Contributors:
-// * SpringSource, a division of VMware, Inc. - initial API and implementation
-// *******************************************************************************/
-// package org.eclipse.virgo.ide.manifest.internal.core.validation.rules;
-//
-// import org.eclipse.virgo.ide.facet.core.FacetUtils;
-// import org.eclipse.virgo.ide.manifest.internal.core.validation.BundleManifestValidationContext;
-//
-//
-/// **
-// * @author Christian Dupuis
-// * @since 1.0.0
-// */
-/// **
-// * TODO CD add comments
-// */
-// public abstract class AbstractApplicationManifestHeaderRule extends AbstractManifestHeaderRule {
-//
-// @Override
-// protected boolean supportsContext(BundleManifestValidationContext context) {
-// return FacetUtils.isParProject(context.getRootElement().getElementResource());
-// }
-//
-// }
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/AbstractBundleManifestHeaderRule.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/AbstractBundleManifestHeaderRule.java
deleted file mode 100644
index b26c690..0000000
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/AbstractBundleManifestHeaderRule.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/// *******************************************************************************
-// * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
-// * All rights reserved. This program and the accompanying materials
-// * are made available under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available at
-// * http://www.eclipse.org/legal/epl-v10.html
-// *
-// * Contributors:
-// * SpringSource, a division of VMware, Inc. - initial API and implementation
-// *******************************************************************************/
-// package org.eclipse.virgo.ide.manifest.internal.core.validation.rules;
-//
-// import org.eclipse.core.resources.IResource;
-// import org.eclipse.jdt.core.IJavaProject;
-// import org.eclipse.jdt.core.JavaCore;
-// import org.eclipse.virgo.ide.facet.core.FacetUtils;
-// import org.eclipse.virgo.ide.manifest.core.BundleManifestUtils;
-// import org.eclipse.virgo.ide.manifest.internal.core.validation.BundleManifestValidationContext;
-// import org.osgi.framework.Version;
-//
-//
-/// **
-// * @author Christian Dupuis
-// * @since 1.0.0
-// */
-/// **
-// * TODO CD add comments
-// */
-// public abstract class AbstractBundleManifestHeaderRule extends AbstractManifestHeaderRule {
-//
-// protected static final Version MAX_VERSION = new Version(Integer.MAX_VALUE,
-// Integer.MAX_VALUE, Integer.MAX_VALUE);
-//
-// @Override
-// protected boolean supportsContext(BundleManifestValidationContext context) {
-// IResource resource = context.getRootElement().getElementResource();
-// IJavaProject javaProject = JavaCore.create(resource.getProject());
-//
-// return FacetUtils.isBundleProject(context.getRootElement().getElementResource())
-// && (resource.equals(BundleManifestUtils.locateManifest(javaProject, false)) || resource
-// .equals(BundleManifestUtils.locateManifest(javaProject, true)));
-// }
-// }
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/AbstractManifestHeaderRule.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/AbstractManifestHeaderRule.java
deleted file mode 100644
index d903a72..0000000
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/AbstractManifestHeaderRule.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/// *******************************************************************************
-// * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
-// * All rights reserved. This program and the accompanying materials
-// * are made available under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available at
-// * http://www.eclipse.org/legal/epl-v10.html
-// *
-// * Contributors:
-// * SpringSource, a division of VMware, Inc. - initial API and implementation
-// *******************************************************************************/
-// package org.eclipse.virgo.ide.manifest.internal.core.validation.rules;
-//
-//
-/// **
-// * @author Christian Dupuis
-// * @since 1.0.0
-// */
-/// **
-// * TODO CD add comments
-// */
-// public abstract class AbstractManifestHeaderRule implements
-// IValidationRule<BundleManifest, BundleManifestValidationContext> {
-//
-// public boolean supports(IModelElement element, IValidationContext context) {
-// return element instanceof BundleManifest && context instanceof BundleManifestValidationContext
-// && ((BundleManifest) element).getProblems().size() == 0
-// && supportsContext((BundleManifestValidationContext) context);
-// }
-//
-// public final void validate(BundleManifest element, BundleManifestValidationContext context, IProgressMonitor monitor)
-/// {
-// IResource resource = context.getRootElement().getElementResource();
-//
-// for (String headerName : getHeaderName()) {
-// BundleManifestHeader header = null;
-// if (isRequiredHeader(resource)) {
-// header = context.validateRequiredHeader(headerName, getMissingRequiredHeaderErrorId());
-// }
-// else {
-// header = context.getBundleManifest().getHeader(headerName);
-// }
-// if (header != null) {
-// validateHeader(header, context);
-// }
-// }
-// }
-//
-// /**
-// * Intended to be overridden by validation rules to provide a unique error id that will be added to the marker in
-// * the case that the header is required and missing.
-// */
-// protected String getMissingRequiredHeaderErrorId() {
-// return "MISSING_REQUIRED_HEADER";
-// }
-//
-// protected abstract String[] getHeaderName();
-//
-// protected boolean isRequiredHeader(IResource resource) {
-// return false;
-// }
-//
-// protected abstract boolean supportsContext(BundleManifestValidationContext context);
-//
-// protected abstract void validateHeader(BundleManifestHeader header, BundleManifestValidationContext context);
-// }
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/ApplicationSymbolicNameRule.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/ApplicationSymbolicNameRule.java
deleted file mode 100644
index 60ef5f8..0000000
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/ApplicationSymbolicNameRule.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/// *******************************************************************************
-// * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
-// * All rights reserved. This program and the accompanying materials
-// * are made available under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available at
-// * http://www.eclipse.org/legal/epl-v10.html
-// *
-// * Contributors:
-// * SpringSource, a division of VMware, Inc. - initial API and implementation
-// *******************************************************************************/
-// package org.eclipse.virgo.ide.manifest.internal.core.validation.rules;
-//
-//
-//
-/// **
-// * @author Christian Dupuis
-// * @since 1.0.0
-// */
-/// **
-// * TODO CD add comments
-// */
-// @SuppressWarnings("restriction")
-// public class ApplicationSymbolicNameRule extends AbstractApplicationManifestHeaderRule {
-//
-// private static final String[] APPLICATION_SYMBOLIC_NAME_MANIFEST_HEADER =
-// new String[] { "Application-SymbolicName" };
-//
-// @Override
-// protected String[] getHeaderName() {
-// return APPLICATION_SYMBOLIC_NAME_MANIFEST_HEADER;
-// }
-//
-// @Override
-// protected boolean isRequiredHeader(IResource resource) {
-// return true;
-// }
-//
-// @Override
-// protected void validateHeader(BundleManifestHeader header,
-// BundleManifestValidationContext context) {
-//
-// BundleManifestHeaderElement[] elements = header.getBundleManifestHeaderElements();
-// String id = elements.length > 0 ? elements[0].getManifestElement().getValue() : null;
-// if (id == null || id.length() == 0) {
-// context.error("NO_SYMBOLIC_NAME",
-// BundleManifestCoreMessages.BundleErrorReporter_NoSymbolicName, header
-// .getLineNumber() + 1);
-// }
-//
-// if (StringUtils.hasText(id) && !IdUtil.isValidCompositeID3_0(id)) {
-// context.error("ILLAGEL_SYMBOLIC_NAME",
-// BundleManifestCoreMessages.BundleErrorReporter_InvalidSymbolicName,
-// BundleManifestUtils.getLineNumber(context.getBundleManifest().getDocument(),
-// header, id));
-// }
-//
-// }
-//
-// }
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/ApplicationVersionRule.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/ApplicationVersionRule.java
deleted file mode 100644
index 48eaeba..0000000
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/ApplicationVersionRule.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/// *******************************************************************************
-// * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
-// * All rights reserved. This program and the accompanying materials
-// * are made available under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available at
-// * http://www.eclipse.org/legal/epl-v10.html
-// *
-// * Contributors:
-// * SpringSource, a division of VMware, Inc. - initial API and implementation
-// *******************************************************************************/
-// package org.eclipse.virgo.ide.manifest.internal.core.validation.rules;
-//
-// import org.eclipse.core.resources.IResource;
-// import org.eclipse.core.runtime.IStatus;
-// import org.eclipse.pde.internal.core.util.VersionUtil;
-// import org.eclipse.virgo.ide.manifest.internal.core.model.BundleManifestHeader;
-// import org.eclipse.virgo.ide.manifest.internal.core.validation.BundleManifestValidationContext;
-//
-//
-/// **
-// * @author Christian Dupuis
-// * @since 1.0.0
-// */
-/// **
-// * TODO CD add comments
-// */
-// @SuppressWarnings("restriction")
-// public class ApplicationVersionRule extends AbstractApplicationManifestHeaderRule {
-//
-// private static final String[] APPLICATION_VERSION_MANIFEST_HEADER =
-// new String[] { "Application-Version" };
-//
-// @Override
-// protected String[] getHeaderName() {
-// return APPLICATION_VERSION_MANIFEST_HEADER;
-// }
-//
-// @Override
-// protected boolean isRequiredHeader(IResource resource) {
-// return true;
-// }
-//
-// @Override
-// protected void validateHeader(BundleManifestHeader header,
-// BundleManifestValidationContext context) {
-// IStatus status = VersionUtil.validateVersion(header.getValue());
-// if (!status.isOK()) {
-// context.error("ILLEGAL_BUNDLE_VERSION", status.getMessage(),
-// header.getLineNumber() + 1);
-// }
-// }
-//
-// }
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/BundleActivationPolicyRule.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/BundleActivationPolicyRule.java
deleted file mode 100644
index ae702be..0000000
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/BundleActivationPolicyRule.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/// *******************************************************************************
-// * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
-// * All rights reserved. This program and the accompanying materials
-// * are made available under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available at
-// * http://www.eclipse.org/legal/epl-v10.html
-// *
-// * Contributors:
-// * SpringSource, a division of VMware, Inc. - initial API and implementation
-// *******************************************************************************/
-// package org.eclipse.virgo.ide.manifest.internal.core.validation.rules;
-//
-// import org.eclipse.virgo.ide.manifest.internal.core.model.BundleManifestHeader;
-// import org.eclipse.virgo.ide.manifest.internal.core.validation.BundleManifestValidationContext;
-// import org.osgi.framework.Constants;
-//
-//
-/// **
-// * @author Christian Dupuis
-// * @since 1.0.0
-// */
-/// **
-// * TODO CD add comments
-// */
-// public class BundleActivationPolicyRule extends AbstractBundleManifestHeaderRule {
-//
-// @Override
-// protected String[] getHeaderName() {
-// return new String[] { Constants.BUNDLE_ACTIVATIONPOLICY };
-// }
-//
-// @Override
-// protected void validateHeader(BundleManifestHeader header,
-// BundleManifestValidationContext context) {
-// context.validateHeaderValue(header, new String[] { Constants.ACTIVATION_LAZY },
-/// ManifestValidationRuleConstants.ILLEGAL_BUNDLE_ACTIVATION_POLICY);
-// }
-//
-// }
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/BundleActivatorRule.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/BundleActivatorRule.java
deleted file mode 100644
index 3450979..0000000
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/BundleActivatorRule.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/// *******************************************************************************
-// * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
-// * All rights reserved. This program and the accompanying materials
-// * are made available under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available at
-// * http://www.eclipse.org/legal/epl-v10.html
-// *
-// * Contributors:
-// * SpringSource, a division of VMware, Inc. - initial API and implementation
-// *******************************************************************************/
-// package org.eclipse.virgo.ide.manifest.internal.core.validation.rules;
-//
-//
-//
-/// **
-// * @author Christian Dupuis
-// * @since 1.0.0
-// */
-/// **
-// * TODO CD add comments
-// */
-// public class BundleActivatorRule extends AbstractBundleManifestHeaderRule {
-//
-// @Override
-// protected String[] getHeaderName() {
-// return new String[] { Constants.BUNDLE_ACTIVATOR };
-// }
-//
-// @Override
-// protected void validateHeader(BundleManifestHeader header,
-// BundleManifestValidationContext context) {
-// String activatorClass = header.getValue();
-// //TODO -- not sure if this logic is ok, it is much simpler than old logic, but assuming that the class needs to be in
-/// the same bundle as Manifest
-// IProject project = context.getRootElement().getElementResource().getProject();
-// IJavaProject javaProject = JavaCore.create(project);
-// IType findType;
-// try {
-// findType = javaProject.findType(activatorClass, new NullProgressMonitor());
-// if (findType == null) {
-// context.error("ILLEGAL_ACTIVATOR_CLASS", NLS.bind(
-// BundleManifestCoreMessages.BundleErrorReporter_NoExist, activatorClass), header
-// .getLineNumber() + 1);
-// }
-// } catch (JavaModelException e) {
-// context.error("ILLEGAL_ACTIVATOR_CLASS", NLS.bind(
-// BundleManifestCoreMessages.BundleErrorReporter_NoExist, activatorClass), header
-// .getLineNumber() + 1);
-// }
-// }
-//
-// }
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/BundleManifestVersionRule.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/BundleManifestVersionRule.java
deleted file mode 100644
index ca70148..0000000
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/BundleManifestVersionRule.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/// *******************************************************************************
-// * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
-// * All rights reserved. This program and the accompanying materials
-// * are made available under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available at
-// * http://www.eclipse.org/legal/epl-v10.html
-// *
-// * Contributors:
-// * SpringSource, a division of VMware, Inc. - initial API and implementation
-// *******************************************************************************/
-// package org.eclipse.virgo.ide.manifest.internal.core.validation.rules;
-//
-// import org.eclipse.core.resources.IResource;
-// import org.eclipse.virgo.ide.facet.core.FacetCorePlugin;
-// import org.eclipse.virgo.ide.facet.core.FacetUtils;
-// import org.eclipse.virgo.ide.manifest.core.BundleManifestCoreMessages;
-// import org.eclipse.virgo.ide.manifest.internal.core.model.BundleManifestHeader;
-// import org.eclipse.virgo.ide.manifest.internal.core.validation.BundleManifestValidationContext;
-// import org.osgi.framework.Constants;
-//
-//
-/// **
-// * @author Christian Dupuis
-// * @since 1.0.0
-// */
-/// **
-// * TODO CD add comments
-// */
-// public class BundleManifestVersionRule extends AbstractBundleManifestHeaderRule {
-//
-// @Override
-// protected boolean supportsContext(BundleManifestValidationContext context) {
-// if (super.supportsContext(context)) {
-// IResource resource = context.getRootElement().getElementResource();
-// return !FacetUtils.hasProjectFacet(resource, FacetCorePlugin.WEB_FACET_ID);
-// }
-// return false;
-// }
-//
-// @Override
-// protected String[] getHeaderName() {
-// return new String[] { Constants.BUNDLE_MANIFESTVERSION };
-// }
-//
-// @Override
-// protected boolean isRequiredHeader(IResource resource) {
-// return true;
-// }
-//
-// @Override
-// protected void validateHeader(BundleManifestHeader header,
-// BundleManifestValidationContext context) {
-// String version = header.getValue();
-// if (!"2".equals(version)) {
-// context.warning(ManifestValidationRuleConstants.ILLEGAL_BUNDLE_MANIFEST_VERSION,
-// BundleManifestCoreMessages.BundleErrorReporter_illegalManifestVersion, header
-// .getLineNumber() + 1);
-// }
-// }
-//
-// @Override
-// protected String getMissingRequiredHeaderErrorId() {
-// return ManifestValidationRuleConstants.MISSING_BUNDLE_MANIFEST_VERSION;
-// }
-//
-// }
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/BundleNameRule.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/BundleNameRule.java
deleted file mode 100644
index 1d19b76..0000000
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/BundleNameRule.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/// *******************************************************************************
-// * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
-// * All rights reserved. This program and the accompanying materials
-// * are made available under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available at
-// * http://www.eclipse.org/legal/epl-v10.html
-// *
-// * Contributors:
-// * SpringSource, a division of VMware, Inc. - initial API and implementation
-// *******************************************************************************/
-// package org.eclipse.virgo.ide.manifest.internal.core.validation.rules;
-//
-// import org.eclipse.core.resources.IResource;
-// import org.eclipse.virgo.ide.manifest.internal.core.model.BundleManifestHeader;
-// import org.eclipse.virgo.ide.manifest.internal.core.validation.BundleManifestValidationContext;
-// import org.osgi.framework.Constants;
-//
-//
-/// **
-// * @author Christian Dupuis
-// * @since 1.0.0
-// */
-/// **
-// * TODO CD add comments
-// */
-// public class BundleNameRule extends AbstractBundleManifestHeaderRule {
-//
-// @Override
-// protected String[] getHeaderName() {
-// return new String[] { Constants.BUNDLE_NAME };
-// }
-//
-// @Override
-// protected boolean isRequiredHeader(IResource resource) {
-// return true;
-// }
-//
-// @Override
-// protected void validateHeader(BundleManifestHeader header,
-// BundleManifestValidationContext context) {
-// // nothing to validate on the bundle name
-// }
-//
-// @Override
-// protected String getMissingRequiredHeaderErrorId() {
-// return ManifestValidationRuleConstants.MISSING_BUNDLE_NAME;
-// }
-//
-// }
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/BundleSymbolicNameRule.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/BundleSymbolicNameRule.java
deleted file mode 100644
index b018cfc..0000000
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/BundleSymbolicNameRule.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/// *******************************************************************************
-// * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
-// * All rights reserved. This program and the accompanying materials
-// * are made available under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available at
-// * http://www.eclipse.org/legal/epl-v10.html
-// *
-// * Contributors:
-// * SpringSource, a division of VMware, Inc. - initial API and implementation
-// *******************************************************************************/
-// package org.eclipse.virgo.ide.manifest.internal.core.validation.rules;
-//
-//
-//
-/// **
-// * @author Christian Dupuis
-// * @since 1.0.0
-// */
-/// **
-// * TODO CD add comments
-// */
-// @SuppressWarnings("restriction")
-// public class BundleSymbolicNameRule extends AbstractBundleManifestHeaderRule {
-//
-// private static final String[] FRAGMENT_ATTACHMENT_DIRECTIVE_ALLOWED_VALUES = new String[] {
-// Constants.FRAGMENT_ATTACHMENT_ALWAYS, Constants.FRAGMENT_ATTACHMENT_NEVER,
-// Constants.FRAGMENT_ATTACHMENT_RESOLVETIME };
-//
-// @Override
-// protected String[] getHeaderName() {
-// return new String[] { Constants.BUNDLE_SYMBOLICNAME };
-// }
-//
-// @Override
-// protected boolean isRequiredHeader(IResource resource) {
-// return !FacetUtils.hasProjectFacet(resource, FacetCorePlugin.WEB_FACET_ID);
-// }
-//
-// @Override
-// protected void validateHeader(BundleManifestHeader header, BundleManifestValidationContext context) {
-//
-// BundleManifestHeaderElement[] elements = header.getBundleManifestHeaderElements();
-// String id = elements.length > 0 ? elements[0].getManifestElement().getValue() : null;
-// if (id == null || id.length() == 0) {
-// context.error("NO_SYMBOLIC_NAME", BundleManifestCoreMessages.BundleErrorReporter_NoSymbolicName, header
-// .getLineNumber() + 1);
-// }
-//
-// if (StringUtils.hasText(id) && !IdUtil.isValidCompositeID3_0(id)) {
-// context.error("ILLAGEL_SYMBOLIC_NAME", BundleManifestCoreMessages.BundleErrorReporter_InvalidSymbolicName,
-// BundleManifestUtils.getLineNumber(context.getBundleManifest().getDocument(), header, id));
-// }
-//
-// if (elements.length > 0) {
-// // validate singleton directive
-// context.validateBooleanAttributeValue(header, elements[0].getManifestElement(),
-// Constants.SINGLETON_DIRECTIVE);
-// context.validateBooleanDirectiveValue(header, elements[0].getManifestElement(),
-// Constants.SINGLETON_DIRECTIVE);
-//
-// // validate fragment-attachment directive
-// context.validateAttributeValue(header, elements[0].getManifestElement(),
-// Constants.FRAGMENT_ATTACHMENT_DIRECTIVE, FRAGMENT_ATTACHMENT_DIRECTIVE_ALLOWED_VALUES);
-// context.validateDirectiveValue(header, elements[0].getManifestElement(),
-// Constants.FRAGMENT_ATTACHMENT_DIRECTIVE, FRAGMENT_ATTACHMENT_DIRECTIVE_ALLOWED_VALUES);
-// }
-// }
-//
-// @Override
-// protected String getMissingRequiredHeaderErrorId() {
-// return ManifestValidationRuleConstants.MISSING_BUNDLE_SYMBOLIC_NAME;
-// }
-//
-// }
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/BundleVersionRule.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/BundleVersionRule.java
deleted file mode 100644
index a516bbb..0000000
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/BundleVersionRule.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/// *******************************************************************************
-// * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
-// * All rights reserved. This program and the accompanying materials
-// * are made available under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available at
-// * http://www.eclipse.org/legal/epl-v10.html
-// *
-// * Contributors:
-// * SpringSource, a division of VMware, Inc. - initial API and implementation
-// *******************************************************************************/
-// package org.eclipse.virgo.ide.manifest.internal.core.validation.rules;
-//
-// import org.eclipse.core.resources.IResource;
-// import org.eclipse.core.runtime.IStatus;
-// import org.eclipse.pde.internal.core.util.VersionUtil;
-// import org.eclipse.virgo.ide.facet.core.FacetCorePlugin;
-// import org.eclipse.virgo.ide.facet.core.FacetUtils;
-// import org.eclipse.virgo.ide.manifest.internal.core.model.BundleManifestHeader;
-// import org.eclipse.virgo.ide.manifest.internal.core.validation.BundleManifestValidationContext;
-// import org.osgi.framework.Constants;
-//
-//
-/// **
-// * @author Christian Dupuis
-// * @since 1.0.0
-// */
-/// **
-// * TODO CD add comments
-// */
-// @SuppressWarnings("restriction")
-// public class BundleVersionRule extends AbstractBundleManifestHeaderRule {
-//
-// @Override
-// protected String[] getHeaderName() {
-// return new String[] { Constants.BUNDLE_VERSION };
-// }
-//
-// @Override
-// protected boolean isRequiredHeader(IResource resource) {
-// return !FacetUtils.hasProjectFacet(resource, FacetCorePlugin.WEB_FACET_ID);
-// }
-//
-// @Override
-// protected void validateHeader(BundleManifestHeader header, BundleManifestValidationContext context) {
-// IStatus status = VersionUtil.validateVersion(header.getValue());
-// if (!status.isOK()) {
-// context.error("ILLEGAL_BUNDLE_VERSION", status.getMessage(), header.getLineNumber() + 1);
-// }
-// }
-//
-// @Override
-// protected String getMissingRequiredHeaderErrorId() {
-// return ManifestValidationRuleConstants.MISSING_BUNDLE_VERSION;
-// }
-//
-// }
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/ExportPackageRule.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/ExportPackageRule.java
deleted file mode 100644
index b67b39e..0000000
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/ExportPackageRule.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/// *******************************************************************************
-// * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
-// * All rights reserved. This program and the accompanying materials
-// * are made available under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available at
-// * http://www.eclipse.org/legal/epl-v10.html
-// *
-// * Contributors:
-// * SpringSource, a division of VMware, Inc. - initial API and implementation
-// *******************************************************************************/
-// package org.eclipse.virgo.ide.manifest.internal.core.validation.rules;
-//
-// import org.eclipse.core.runtime.IStatus;
-// import org.eclipse.jdt.core.IJavaElement;
-// import org.eclipse.jdt.core.IPackageFragment;
-// import org.eclipse.jdt.core.IPackageFragmentRoot;
-// import org.eclipse.jdt.core.JavaCore;
-// import org.eclipse.jdt.core.JavaModelException;
-// import org.eclipse.osgi.util.ManifestElement;
-// import org.eclipse.pde.internal.core.util.VersionUtil;
-// import org.eclipse.virgo.ide.manifest.core.BundleManifestUtils;
-// import org.eclipse.virgo.ide.manifest.internal.core.model.BundleManifestHeader;
-// import org.eclipse.virgo.ide.manifest.internal.core.model.BundleManifestHeaderElement;
-// import org.eclipse.virgo.ide.manifest.internal.core.validation.BundleManifestValidationContext;
-// import org.osgi.framework.Constants;
-//
-//
-/// **
-// * @author Christian Dupuis
-// * @since 1.0.0
-// */
-/// **
-// * TODO CD add comments
-// */
-// @SuppressWarnings("restriction")
-// public class ExportPackageRule extends AbstractBundleManifestHeaderRule {
-//
-// private void validateExportPackage(BundleManifestHeader header, ManifestElement element,
-// BundleManifestValidationContext context) {
-// boolean found = false;
-// try {
-// IPackageFragmentRoot[] roots = JavaCore.create(
-// context.getRootElement().getElementResource().getProject()).getPackageFragmentRoots();
-//
-// for (IPackageFragmentRoot root : roots) {
-// int kind = root.getKind();
-// if (kind == IPackageFragmentRoot.K_SOURCE
-// || (kind == IPackageFragmentRoot.K_BINARY && !root.isExternal())) {
-// IJavaElement[] javaElements = root.getChildren();
-// for (int j = 0; j < javaElements.length; j++)
-// if (javaElements[j] instanceof IPackageFragment) {
-// IPackageFragment fragment = (IPackageFragment) javaElements[j];
-// String name = fragment.getElementName();
-// if (name.length() == 0) {
-// name = ".";
-// }
-// if (fragment.containsJavaResources()
-// || fragment.getNonJavaResources().length > 0) {
-// if (name.equals(element.getValue())) {
-// found = true;
-// }
-// }
-// }
-// }
-// }
-// }
-// catch (JavaModelException e) {
-// }
-//
-// // if we actually have packages to add
-// if (!found) {
-// context.warning("MISSING_PACKAGE_EXPORT", "Bundle does export non-existing package", header
-// .getLineNumber() + 1);
-// }
-// }
-//
-// private void validateVersionAttribute(BundleManifestHeader header, ManifestElement element,
-// BundleManifestValidationContext context) {
-// String version = element.getAttribute(Constants.VERSION_ATTRIBUTE);
-// if (version == null)
-// return;
-// IStatus status = VersionUtil.validateVersion(version);
-// if (!status.isOK()) {
-// context.error("ILLEGAL_VERSION_RANGE", status.getMessage(), BundleManifestUtils
-// .getPackageLineNumber(context.getBundleManifest().getDocument(), header,
-// element));
-// }
-// }
-//
-// @Override
-// protected String[] getHeaderName() {
-// return new String[] { Constants.EXPORT_PACKAGE };
-// }
-//
-// @Override
-// protected void validateHeader(BundleManifestHeader header,
-// BundleManifestValidationContext context) {
-// for (BundleManifestHeaderElement element : header.getBundleManifestHeaderElements()) {
-// validateVersionAttribute(header, element.getManifestElement(), context);
-// validateExportPackage(header, element.getManifestElement(), context);
-// }
-// }
-//
-// }
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/ImportPackageBundleAndLibraryRule.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/ImportPackageBundleAndLibraryRule.java
deleted file mode 100644
index 5fab77e..0000000
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/ImportPackageBundleAndLibraryRule.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/// *******************************************************************************
-// * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
-// * All rights reserved. This program and the accompanying materials
-// * are made available under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available at
-// * http://www.eclipse.org/legal/epl-v10.html
-// *
-// * Contributors:
-// * SpringSource, a division of VMware, Inc. - initial API and implementation
-// *******************************************************************************/
-// package org.eclipse.virgo.ide.manifest.internal.core.validation.rules;
-//
-//
-/// **
-// * @author Christian Dupuis
-// * @since 1.0.0
-// */
-/// **
-// * TODO CD add comments
-// */
-// @SuppressWarnings("restriction")
-// public class ImportPackageBundleAndLibraryRule extends AbstractBundleManifestHeaderRule {
-//
-// private void validateResolutionDirective(BundleManifestHeader header, ManifestElement element,
-// BundleManifestValidationContext context) {
-// String resolution = element.getDirective(Constants.RESOLUTION_DIRECTIVE);
-// if (resolution != null) {
-// context.validateDirectiveValue(header, element, Constants.RESOLUTION_DIRECTIVE,
-// new String[] { Constants.RESOLUTION_MANDATORY, Constants.RESOLUTION_OPTIONAL });
-// }
-// }
-//
-// private void validateVersionAttribute(BundleManifestHeader header, ManifestElement element,
-// BundleManifestValidationContext context) {
-// String version = null;
-// if (Constants.REQUIRE_BUNDLE.equals(header.getElementName())) {
-// version = element.getAttribute(Constants.BUNDLE_VERSION_ATTRIBUTE);
-// } else {
-// version = element.getAttribute(Constants.VERSION_ATTRIBUTE);
-// }
-//
-// if (version == null)
-// return;
-// IStatus status = VersionUtil.validateVersionRange(version);
-// if (!status.isOK()) {
-// String errorId = getIllegalVersionErrorId(header);
-// String artifactName = element.getValue();
-// context.error(errorId, status.getMessage(), BundleManifestUtils
-// .getPackageLineNumber(context.getBundleManifest().getDocument(), header,
-// element), new ValidationProblemAttribute(ManifestValidationRuleConstants.IMPORT_ARTIFACT_NAME, artifactName));
-// }
-// }
-//
-// protected String getIllegalVersionErrorId(BundleManifestHeader header) {
-// if (header.getElementName().equals(Constants.IMPORT_PACKAGE)) {
-// return ManifestValidationRuleConstants.ILLEGAL_IMPORT_PACKAGE_VERSION;
-// } else if (header.getElementName().equals("Import-Bundle")) {
-// return ManifestValidationRuleConstants.ILLEGAL_IMPORT_BUNDLE_VERSION;
-// } else if (header.getElementName().equals("Require-Bundle")) {
-// return ManifestValidationRuleConstants.ILLEGAL_REQUIRE_BUNDLE_VERSION;
-// } else if (header.getElementName().equals("Import-Library")) {
-// return ManifestValidationRuleConstants.ILLEGAL_IMPORT_LIBRARY_VERSION;
-// }
-// return "";
-// }
-//
-// @Override
-// protected String[] getHeaderName() {
-// return new String[] { Constants.IMPORT_PACKAGE, "Import-Bundle", "Import-Library", Constants.REQUIRE_BUNDLE };
-// }
-//
-// @Override
-// protected void validateHeader(BundleManifestHeader header,
-// BundleManifestValidationContext context) {
-// for (BundleManifestHeaderElement element : header.getBundleManifestHeaderElements()) {
-// validateResolutionDirective(header, element.getManifestElement(), context);
-// validateVersionAttribute(header, element.getManifestElement(), context);
-// }
-// }
-//
-// }
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/ManifestParsingProblemsRule.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/ManifestParsingProblemsRule.java
deleted file mode 100644
index 3ef236d..0000000
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/ManifestParsingProblemsRule.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/// *******************************************************************************
-// * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
-// * All rights reserved. This program and the accompanying materials
-// * are made available under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available at
-// * http://www.eclipse.org/legal/epl-v10.html
-// *
-// * Contributors:
-// * SpringSource, a division of VMware, Inc. - initial API and implementation
-// *******************************************************************************/
-// package org.eclipse.virgo.ide.manifest.internal.core.validation.rules;
-//
-//
-/// **
-// * @author Christian Dupuis
-// * @since 1.0.0
-// */
-/// **
-// * TODO CD add comments
-// */
-// public class ManifestParsingProblemsRule implements
-// IValidationRule<BundleManifest, BundleManifestValidationContext> {
-//
-// public boolean supports(IModelElement element, IValidationContext context) {
-// return element instanceof BundleManifest
-// && context instanceof BundleManifestValidationContext;
-// }
-//
-// public void validate(BundleManifest element, BundleManifestValidationContext context,
-// IProgressMonitor monitor) {
-// context.addProblems(element.getProblems().toArray(new ValidationProblem[element.getProblems().size()]));
-// }
-// }
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/ManifestValidationRuleConstants.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/ManifestValidationRuleConstants.java
deleted file mode 100644
index 9ef6e9a..0000000
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/ManifestValidationRuleConstants.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.virgo.ide.manifest.internal.core.validation.rules;
-
-/**
- * @author Christian Dupuis
- */
-public interface ManifestValidationRuleConstants {
-
-    String MISSING_BUNDLE_SYMBOLIC_NAME = "MISSING_BUNDLE_SYMBOLIC_NAME";
-
-    String MISSING_BUNDLE_NAME = "MISSING_BUNDLE_NAME";
-
-    String MISSING_BUNDLE_VERSION = "MISSING_BUNDLE_VERSION";
-
-    String MISSING_BUNDLE_MANIFEST_VERSION = "MISSING_BUNDLE_MANIFEST_VERSION";
-
-    String ILLEGAL_BUNDLE_MANIFEST_VERSION = "ILLEGAL_BUNDLE_MANIFEST_VERSION";
-
-    String ILLEGAL_BUNDLE_ACTIVATION_POLICY = "ILLEGAL_BUNDLE_ACTIVATION_POLICY";
-
-    String ILLEGAL_IMPORT_BUNDLE_VERSION = "ILLEGAL_IMPORT_BUNDLE_VERSION";
-
-    String ILLEGAL_REQUIRE_BUNDLE_VERSION = "ILLEGAL_REQUIRE_BUNDLE_VERSION";
-
-    String ILLEGAL_IMPORT_LIBRARY_VERSION = "ILLEGAL_IMPORT_LIBRARY_VERSION";
-
-    String ILLEGAL_IMPORT_PACKAGE_VERSION = "ILLEGAL_IMPORT_PACKAGE_VERSION";
-
-    String IMPORT_ARTIFACT_NAME = "IMPORT_ARTIFACT_NAME";
-
-}
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/RequireBundleRule.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/RequireBundleRule.java
deleted file mode 100644
index 78cbdaf..0000000
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/manifest/internal/core/validation/rules/RequireBundleRule.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/// *******************************************************************************
-// * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
-// * All rights reserved. This program and the accompanying materials
-// * are made available under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available at
-// * http://www.eclipse.org/legal/epl-v10.html
-// *
-// * Contributors:
-// * SpringSource, a division of VMware, Inc. - initial API and implementation
-// *******************************************************************************/
-// package org.eclipse.virgo.ide.manifest.internal.core.validation.rules;
-//
-// import org.eclipse.osgi.util.ManifestElement;
-// import org.eclipse.pde.internal.core.util.VersionUtil;
-// import org.eclipse.virgo.ide.manifest.core.BundleManifestCoreMessages;
-// import org.eclipse.virgo.ide.manifest.core.BundleManifestUtils;
-// import org.eclipse.virgo.ide.manifest.internal.core.model.BundleManifestHeader;
-// import org.eclipse.virgo.ide.manifest.internal.core.model.BundleManifestHeaderElement;
-// import org.eclipse.virgo.ide.manifest.internal.core.validation.BundleManifestValidationContext;
-// import org.osgi.framework.Constants;
-//
-//
-/// **
-// * @author Christian Dupuis
-// * @since 1.0.0
-// */
-/// **
-// * TODO CD add comments
-// */
-// @SuppressWarnings("restriction")
-// public class RequireBundleRule extends AbstractBundleManifestHeaderRule {
-//
-// private void validateBundleVersionAttribute(BundleManifestHeader header,
-// ManifestElement element, BundleManifestValidationContext context) {
-// String versionRange = element.getAttribute(Constants.BUNDLE_VERSION_ATTRIBUTE);
-// if (versionRange != null && !VersionUtil.validateVersionRange(versionRange).isOK()) {
-// context.error("ILLEGAL_BUNDLE_VERSION",
-// BundleManifestCoreMessages.BundleErrorReporter_InvalidFormatInBundleVersion,
-// BundleManifestUtils.getPackageLineNumber(context.getBundleManifest()
-// .getDocument(), header, element));
-// }
-// }
-//
-// private void validateResolutionDirective(BundleManifestHeader header, ManifestElement element,
-// BundleManifestValidationContext context) {
-// String resolution = element.getDirective(Constants.RESOLUTION_DIRECTIVE);
-// if (resolution != null) {
-// context.validateDirectiveValue(header, element, Constants.RESOLUTION_DIRECTIVE,
-// new String[] { Constants.RESOLUTION_MANDATORY, Constants.RESOLUTION_OPTIONAL });
-// }
-// }
-//
-// private void validateVisibilityDirective(BundleManifestHeader header, ManifestElement element,
-// BundleManifestValidationContext context) {
-// String visibility = element.getDirective(Constants.VISIBILITY_DIRECTIVE);
-// if (visibility != null) {
-// context.validateDirectiveValue(header, element, Constants.VISIBILITY_DIRECTIVE,
-// new String[] { Constants.VISIBILITY_PRIVATE, Constants.VISIBILITY_REEXPORT });
-// }
-// }
-//
-// @Override
-// protected String[] getHeaderName() {
-// return new String[] { Constants.REQUIRE_BUNDLE };
-// }
-//
-// @Override
-// protected void validateHeader(BundleManifestHeader header,
-// BundleManifestValidationContext context) {
-// for (BundleManifestHeaderElement element : header.getBundleManifestHeaderElements()) {
-// validateBundleVersionAttribute(header, element.getManifestElement(), context);
-// validateVisibilityDirective(header, element.getManifestElement(), context);
-// validateResolutionDirective(header, element.getManifestElement(), context);
-// }
-// }
-//
-// }
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/module/core/ServerModuleArtifactAdapterDelegate.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/module/core/ServerModuleArtifactAdapterDelegate.java
index 39ddae3..73bdae3 100644
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/module/core/ServerModuleArtifactAdapterDelegate.java
+++ b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/module/core/ServerModuleArtifactAdapterDelegate.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2010 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.module.core;
 
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/module/core/ServerModuleDelegate.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/module/core/ServerModuleDelegate.java
index 00f7b52..b184a98 100644
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/module/core/ServerModuleDelegate.java
+++ b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/module/core/ServerModuleDelegate.java
@@ -1,14 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2010 SpringSource, a division of VMware, Inc. and others.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *     GianMaria Romanato - support for nested plans
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.module.core;
 
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/module/core/ServerModuleFactoryDelegate.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/module/core/ServerModuleFactoryDelegate.java
index a137701..6c4079e 100644
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/module/core/ServerModuleFactoryDelegate.java
+++ b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/ide/module/core/ServerModuleFactoryDelegate.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009 - 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009 - 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.module.core;
 
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/kernel/osgi/provisioning/tools/DependencyLocatorVirgo.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/kernel/osgi/provisioning/tools/DependencyLocatorVirgo.java
index a55b087..bd3a412 100644
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/kernel/osgi/provisioning/tools/DependencyLocatorVirgo.java
+++ b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/kernel/osgi/provisioning/tools/DependencyLocatorVirgo.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.kernel.osgi.provisioning.tools;
 
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/kernel/osgi/provisioning/tools/NoOpEventLogger.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/kernel/osgi/provisioning/tools/NoOpEventLogger.java
index e0fc937..c66e86f 100644
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/kernel/osgi/provisioning/tools/NoOpEventLogger.java
+++ b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/kernel/osgi/provisioning/tools/NoOpEventLogger.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.kernel.osgi.provisioning.tools;
 
diff --git a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/kernel/osgi/provisioning/tools/Pre35DependencyLocatorVirgo.java b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/kernel/osgi/provisioning/tools/Pre35DependencyLocatorVirgo.java
index f07a65c..53c904f 100644
--- a/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/kernel/osgi/provisioning/tools/Pre35DependencyLocatorVirgo.java
+++ b/org.eclipse.virgo.ide.manifest.core/src/org/eclipse/virgo/kernel/osgi/provisioning/tools/Pre35DependencyLocatorVirgo.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.kernel.osgi.provisioning.tools;
 
diff --git a/org.eclipse.virgo.ide.par.edit/about.html b/org.eclipse.virgo.ide.par.edit/about.html
index 2abb573..164f781 100644
--- a/org.eclipse.virgo.ide.par.edit/about.html
+++ b/org.eclipse.virgo.ide.par.edit/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>April 13, 2012</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.virgo.ide.par.edit/plugin.xml b/org.eclipse.virgo.ide.par.edit/plugin.xml
index 86a6304..b07bf71 100644
--- a/org.eclipse.virgo.ide.par.edit/plugin.xml
+++ b/org.eclipse.virgo.ide.par.edit/plugin.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-/*******************************************************************************
+/*********************************************************************
  * Copyright (c) 2007, 2012 SpringSource
- * 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:
- *     SpringSource - initial API and implementation
- *******************************************************************************/
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 -->
 <plugin>
     
diff --git a/org.eclipse.virgo.ide.par.edit/src/org/eclipse/virgo/ide/par/provider/BundleItemProvider.java b/org.eclipse.virgo.ide.par.edit/src/org/eclipse/virgo/ide/par/provider/BundleItemProvider.java
index 30b85f9..cdc8ec2 100644
--- a/org.eclipse.virgo.ide.par.edit/src/org/eclipse/virgo/ide/par/provider/BundleItemProvider.java
+++ b/org.eclipse.virgo.ide.par.edit/src/org/eclipse/virgo/ide/par/provider/BundleItemProvider.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.par.provider;
 
diff --git a/org.eclipse.virgo.ide.par.edit/src/org/eclipse/virgo/ide/par/provider/ParEditPlugin.java b/org.eclipse.virgo.ide.par.edit/src/org/eclipse/virgo/ide/par/provider/ParEditPlugin.java
index 8a9edcd..a4f6b41 100644
--- a/org.eclipse.virgo.ide.par.edit/src/org/eclipse/virgo/ide/par/provider/ParEditPlugin.java
+++ b/org.eclipse.virgo.ide.par.edit/src/org/eclipse/virgo/ide/par/provider/ParEditPlugin.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.par.provider;
 
diff --git a/org.eclipse.virgo.ide.par.edit/src/org/eclipse/virgo/ide/par/provider/ParItemProvider.java b/org.eclipse.virgo.ide.par.edit/src/org/eclipse/virgo/ide/par/provider/ParItemProvider.java
index 2873b08..bb4c32c 100644
--- a/org.eclipse.virgo.ide.par.edit/src/org/eclipse/virgo/ide/par/provider/ParItemProvider.java
+++ b/org.eclipse.virgo.ide.par.edit/src/org/eclipse/virgo/ide/par/provider/ParItemProvider.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.par.provider;
 
diff --git a/org.eclipse.virgo.ide.par.edit/src/org/eclipse/virgo/ide/par/provider/ParItemProviderAdapterFactory.java b/org.eclipse.virgo.ide.par.edit/src/org/eclipse/virgo/ide/par/provider/ParItemProviderAdapterFactory.java
index 4bafc07..cb02c9c 100644
--- a/org.eclipse.virgo.ide.par.edit/src/org/eclipse/virgo/ide/par/provider/ParItemProviderAdapterFactory.java
+++ b/org.eclipse.virgo.ide.par.edit/src/org/eclipse/virgo/ide/par/provider/ParItemProviderAdapterFactory.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.par.provider;
 
diff --git a/org.eclipse.virgo.ide.par/about.html b/org.eclipse.virgo.ide.par/about.html
index 2abb573..164f781 100644
--- a/org.eclipse.virgo.ide.par/about.html
+++ b/org.eclipse.virgo.ide.par/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>April 13, 2012</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.virgo.ide.par/plugin.xml b/org.eclipse.virgo.ide.par/plugin.xml
index a253a72..760c56e 100644
--- a/org.eclipse.virgo.ide.par/plugin.xml
+++ b/org.eclipse.virgo.ide.par/plugin.xml
@@ -2,16 +2,15 @@
 <?eclipse version="3.0"?>
 
 <!--
- /*******************************************************************************
- * Copyright (c) 2012 SpringSource
- * 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:
- *     SpringSource - initial API and implementation
- *******************************************************************************/
+/*********************************************************************
+ * Copyright (c) 2007, 2012 SpringSource
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 -->
 
 <plugin>
diff --git a/org.eclipse.virgo.ide.par/src/org/eclipse/virgo/ide/par/Bundle.java b/org.eclipse.virgo.ide.par/src/org/eclipse/virgo/ide/par/Bundle.java
index b4b5714..35d8ef2 100644
--- a/org.eclipse.virgo.ide.par/src/org/eclipse/virgo/ide/par/Bundle.java
+++ b/org.eclipse.virgo.ide.par/src/org/eclipse/virgo/ide/par/Bundle.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.par;
 
diff --git a/org.eclipse.virgo.ide.par/src/org/eclipse/virgo/ide/par/Par.java b/org.eclipse.virgo.ide.par/src/org/eclipse/virgo/ide/par/Par.java
index 981e27f..6cb67fb 100644
--- a/org.eclipse.virgo.ide.par/src/org/eclipse/virgo/ide/par/Par.java
+++ b/org.eclipse.virgo.ide.par/src/org/eclipse/virgo/ide/par/Par.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.par;
 
diff --git a/org.eclipse.virgo.ide.par/src/org/eclipse/virgo/ide/par/ParFactory.java b/org.eclipse.virgo.ide.par/src/org/eclipse/virgo/ide/par/ParFactory.java
index a45eeaf..c55fc8a 100644
--- a/org.eclipse.virgo.ide.par/src/org/eclipse/virgo/ide/par/ParFactory.java
+++ b/org.eclipse.virgo.ide.par/src/org/eclipse/virgo/ide/par/ParFactory.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.par;
 
diff --git a/org.eclipse.virgo.ide.par/src/org/eclipse/virgo/ide/par/ParPackage.java b/org.eclipse.virgo.ide.par/src/org/eclipse/virgo/ide/par/ParPackage.java
index d793495..b79f439 100644
--- a/org.eclipse.virgo.ide.par/src/org/eclipse/virgo/ide/par/ParPackage.java
+++ b/org.eclipse.virgo.ide.par/src/org/eclipse/virgo/ide/par/ParPackage.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.par;
 
diff --git a/org.eclipse.virgo.ide.par/src/org/eclipse/virgo/ide/par/impl/BundleImpl.java b/org.eclipse.virgo.ide.par/src/org/eclipse/virgo/ide/par/impl/BundleImpl.java
index 9eb57c0..828270b 100644
--- a/org.eclipse.virgo.ide.par/src/org/eclipse/virgo/ide/par/impl/BundleImpl.java
+++ b/org.eclipse.virgo.ide.par/src/org/eclipse/virgo/ide/par/impl/BundleImpl.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.par.impl;
 
diff --git a/org.eclipse.virgo.ide.par/src/org/eclipse/virgo/ide/par/impl/ParFactoryImpl.java b/org.eclipse.virgo.ide.par/src/org/eclipse/virgo/ide/par/impl/ParFactoryImpl.java
index da81ba5..a6a119e 100644
--- a/org.eclipse.virgo.ide.par/src/org/eclipse/virgo/ide/par/impl/ParFactoryImpl.java
+++ b/org.eclipse.virgo.ide.par/src/org/eclipse/virgo/ide/par/impl/ParFactoryImpl.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.par.impl;
 
diff --git a/org.eclipse.virgo.ide.par/src/org/eclipse/virgo/ide/par/impl/ParImpl.java b/org.eclipse.virgo.ide.par/src/org/eclipse/virgo/ide/par/impl/ParImpl.java
index eb05f7d..e176b5b 100644
--- a/org.eclipse.virgo.ide.par/src/org/eclipse/virgo/ide/par/impl/ParImpl.java
+++ b/org.eclipse.virgo.ide.par/src/org/eclipse/virgo/ide/par/impl/ParImpl.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.par.impl;
 
diff --git a/org.eclipse.virgo.ide.par/src/org/eclipse/virgo/ide/par/impl/ParPackageImpl.java b/org.eclipse.virgo.ide.par/src/org/eclipse/virgo/ide/par/impl/ParPackageImpl.java
index 23cd717..1f5f2a2 100644
--- a/org.eclipse.virgo.ide.par/src/org/eclipse/virgo/ide/par/impl/ParPackageImpl.java
+++ b/org.eclipse.virgo.ide.par/src/org/eclipse/virgo/ide/par/impl/ParPackageImpl.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.par.impl;
 
diff --git a/org.eclipse.virgo.ide.par/src/org/eclipse/virgo/ide/par/util/ParAdapterFactory.java b/org.eclipse.virgo.ide.par/src/org/eclipse/virgo/ide/par/util/ParAdapterFactory.java
index 9bb4bbd..f85c346 100644
--- a/org.eclipse.virgo.ide.par/src/org/eclipse/virgo/ide/par/util/ParAdapterFactory.java
+++ b/org.eclipse.virgo.ide.par/src/org/eclipse/virgo/ide/par/util/ParAdapterFactory.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.par.util;
 
diff --git a/org.eclipse.virgo.ide.par/src/org/eclipse/virgo/ide/par/util/ParSwitch.java b/org.eclipse.virgo.ide.par/src/org/eclipse/virgo/ide/par/util/ParSwitch.java
index f8664e9..99f180d 100644
--- a/org.eclipse.virgo.ide.par/src/org/eclipse/virgo/ide/par/util/ParSwitch.java
+++ b/org.eclipse.virgo.ide.par/src/org/eclipse/virgo/ide/par/util/ParSwitch.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.par.util;
 
diff --git a/org.eclipse.virgo.ide.pde.core/about.html b/org.eclipse.virgo.ide.pde.core/about.html
index 2abb573..164f781 100644
--- a/org.eclipse.virgo.ide.pde.core/about.html
+++ b/org.eclipse.virgo.ide.pde.core/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>April 13, 2012</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.virgo.ide.pde.core/plugin.xml b/org.eclipse.virgo.ide.pde.core/plugin.xml
index b6eb52c..961041d 100644
--- a/org.eclipse.virgo.ide.pde.core/plugin.xml
+++ b/org.eclipse.virgo.ide.pde.core/plugin.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <!--
-/*******************************************************************************
+/**********************************************************************
  *  Copyright (c) 2015 GianMaria Romanato
- *  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:
- *     GianMaria Romanato - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 -->
 <plugin>
 
diff --git a/org.eclipse.virgo.ide.pde.core/src/org/eclipse/virgo/ide/pde/core/internal/Builder.java b/org.eclipse.virgo.ide.pde.core/src/org/eclipse/virgo/ide/pde/core/internal/Builder.java
index 6395edf..f6bb3ce 100644
--- a/org.eclipse.virgo.ide.pde.core/src/org/eclipse/virgo/ide/pde/core/internal/Builder.java
+++ b/org.eclipse.virgo.ide.pde.core/src/org/eclipse/virgo/ide/pde/core/internal/Builder.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- *  Copyright (c) 2015 GianMaria Romanato
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2015 GianMaria Romanato
  *
- *  Contributors:
- *     GianMaria Romanato - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.pde.core.internal;
 
diff --git a/org.eclipse.virgo.ide.pde.core/src/org/eclipse/virgo/ide/pde/core/internal/Constants.java b/org.eclipse.virgo.ide.pde.core/src/org/eclipse/virgo/ide/pde/core/internal/Constants.java
index e9d7bb7..204f0bb 100644
--- a/org.eclipse.virgo.ide.pde.core/src/org/eclipse/virgo/ide/pde/core/internal/Constants.java
+++ b/org.eclipse.virgo.ide.pde.core/src/org/eclipse/virgo/ide/pde/core/internal/Constants.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- *  Copyright (c) 2015 GianMaria Romanato
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2015 GianMaria Romanato
  *
- *  Contributors:
- *     GianMaria Romanato - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.pde.core.internal;
 
diff --git a/org.eclipse.virgo.ide.pde.core/src/org/eclipse/virgo/ide/pde/core/internal/Helper.java b/org.eclipse.virgo.ide.pde.core/src/org/eclipse/virgo/ide/pde/core/internal/Helper.java
index cefd0c2..3c969f5 100644
--- a/org.eclipse.virgo.ide.pde.core/src/org/eclipse/virgo/ide/pde/core/internal/Helper.java
+++ b/org.eclipse.virgo.ide.pde.core/src/org/eclipse/virgo/ide/pde/core/internal/Helper.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- *  Copyright (c) 2015 GianMaria Romanato
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2015 GianMaria Romanato
  *
- *  Contributors:
- *     GianMaria Romanato - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.pde.core.internal;
 
diff --git a/org.eclipse.virgo.ide.pde.core/src/org/eclipse/virgo/ide/pde/core/internal/Messages.java b/org.eclipse.virgo.ide.pde.core/src/org/eclipse/virgo/ide/pde/core/internal/Messages.java
index 60a9283..1e8ea60 100644
--- a/org.eclipse.virgo.ide.pde.core/src/org/eclipse/virgo/ide/pde/core/internal/Messages.java
+++ b/org.eclipse.virgo.ide.pde.core/src/org/eclipse/virgo/ide/pde/core/internal/Messages.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- *  Copyright (c) 2015 GianMaria Romanato
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2015 GianMaria Romanato
  *
- *  Contributors:
- *     GianMaria Romanato - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.pde.core.internal;
 
diff --git a/org.eclipse.virgo.ide.pde.core/src/org/eclipse/virgo/ide/pde/core/internal/Nature.java b/org.eclipse.virgo.ide.pde.core/src/org/eclipse/virgo/ide/pde/core/internal/Nature.java
index 5fd56bb..d19caad 100644
--- a/org.eclipse.virgo.ide.pde.core/src/org/eclipse/virgo/ide/pde/core/internal/Nature.java
+++ b/org.eclipse.virgo.ide.pde.core/src/org/eclipse/virgo/ide/pde/core/internal/Nature.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- *  Copyright (c) 2015 GianMaria Romanato
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2015 GianMaria Romanato
  *
- *  Contributors:
- *     GianMaria Romanato - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.pde.core.internal;
 
diff --git a/org.eclipse.virgo.ide.pde.core/src/org/eclipse/virgo/ide/pde/core/internal/cmd/SetupProjectOperation.java b/org.eclipse.virgo.ide.pde.core/src/org/eclipse/virgo/ide/pde/core/internal/cmd/SetupProjectOperation.java
index 8de05c1..aadab6f 100644
--- a/org.eclipse.virgo.ide.pde.core/src/org/eclipse/virgo/ide/pde/core/internal/cmd/SetupProjectOperation.java
+++ b/org.eclipse.virgo.ide.pde.core/src/org/eclipse/virgo/ide/pde/core/internal/cmd/SetupProjectOperation.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- *  Copyright (c) 2015 GianMaria Romanato
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2015 GianMaria Romanato
  *
- *  Contributors:
- *     GianMaria Romanato - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.pde.core.internal.cmd;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/about.html b/org.eclipse.virgo.ide.runtime.core/about.html
index 2abb573..164f781 100644
--- a/org.eclipse.virgo.ide.runtime.core/about.html
+++ b/org.eclipse.virgo.ide.runtime.core/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>April 13, 2012</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.virgo.ide.runtime.core/plugin.xml b/org.eclipse.virgo.ide.runtime.core/plugin.xml
index 29b24ef..6ec8205 100644
--- a/org.eclipse.virgo.ide.runtime.core/plugin.xml
+++ b/org.eclipse.virgo.ide.runtime.core/plugin.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.3"?>
 <!--
-/*******************************************************************************
+/*********************************************************************
  * Copyright (c) 2007, 2010 SpringSource
- * 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:
- *     SpringSource - initial API and implementation
- *******************************************************************************/
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 -->
 <plugin>
 	
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/bundlerepository/domain/BundleImport.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/bundlerepository/domain/BundleImport.java
index fb1eac1..0060c2d 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/bundlerepository/domain/BundleImport.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/bundlerepository/domain/BundleImport.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
+/*********************************************************************
  * Copyright (c) 2007, 2012 SpringSource
- * 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:
- *     SpringSource - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.bundlerepository.domain;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/bundlerepository/domain/OsgiVersion.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/bundlerepository/domain/OsgiVersion.java
index 8023eca..da8fe6f 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/bundlerepository/domain/OsgiVersion.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/bundlerepository/domain/OsgiVersion.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
+/*********************************************************************
  * Copyright (c) 2007, 2012 SpringSource
- * 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:
- *     SpringSource - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.bundlerepository.domain;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/bundlerepository/domain/PackageExport.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/bundlerepository/domain/PackageExport.java
index c56def3..c847ee2 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/bundlerepository/domain/PackageExport.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/bundlerepository/domain/PackageExport.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
+/*********************************************************************
  * Copyright (c) 2007, 2012 SpringSource
- * 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:
- *     SpringSource - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.bundlerepository.domain;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/bundlerepository/domain/PackageImport.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/bundlerepository/domain/PackageImport.java
index e18563a..c4adcc2 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/bundlerepository/domain/PackageImport.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/bundlerepository/domain/PackageImport.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
+/*********************************************************************
  * Copyright (c) 2007, 2012 SpringSource
- * 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:
- *     SpringSource - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.bundlerepository.domain;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/bundlerepository/domain/PackageMember.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/bundlerepository/domain/PackageMember.java
index 6f1255d..b5b33ba 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/bundlerepository/domain/PackageMember.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/bundlerepository/domain/PackageMember.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
+/*********************************************************************
  * Copyright (c) 2007, 2012 SpringSource
- * 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:
- *     SpringSource - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.bundlerepository.domain;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/bundlerepository/domain/PackageMemberType.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/bundlerepository/domain/PackageMemberType.java
index e8364d8..0d60be4 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/bundlerepository/domain/PackageMemberType.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/bundlerepository/domain/PackageMemberType.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
+/*********************************************************************
  * Copyright (c) 2007, 2012 SpringSource
- * 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:
- *     SpringSource - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.bundlerepository.domain;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/bundlerepository/domain/SpringSourceApplicationPlatform.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/bundlerepository/domain/SpringSourceApplicationPlatform.java
index fb33038..10ab811 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/bundlerepository/domain/SpringSourceApplicationPlatform.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/bundlerepository/domain/SpringSourceApplicationPlatform.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
+/*********************************************************************
  * Copyright (c) 2007, 2012 SpringSource
- * 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:
- *     SpringSource - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.bundlerepository.domain;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/bundlerepository/domain/VersionRange.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/bundlerepository/domain/VersionRange.java
index 5cbb3e5..f0bacbb 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/bundlerepository/domain/VersionRange.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/bundlerepository/domain/VersionRange.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
+/*********************************************************************
  * Copyright (c) 2007, 2012 SpringSource
- * 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:
- *     SpringSource - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.bundlerepository.domain;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/internal/utils/json/JSONChildParser.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/internal/utils/json/JSONChildParser.java
index 49302a2..442c79a 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/internal/utils/json/JSONChildParser.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/internal/utils/json/JSONChildParser.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.internal.utils.json;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/internal/utils/json/JSONFileParser.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/internal/utils/json/JSONFileParser.java
index 7662763..aff9d66 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/internal/utils/json/JSONFileParser.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/internal/utils/json/JSONFileParser.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.internal.utils.json;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/internal/utils/json/SimpleJSONParser.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/internal/utils/json/SimpleJSONParser.java
index 6fcf1d1..56fd515 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/internal/utils/json/SimpleJSONParser.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/internal/utils/json/SimpleJSONParser.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.internal.utils.json;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/management/remote/Bundle.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/management/remote/Bundle.java
index 406fe68..194097b 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/management/remote/Bundle.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/management/remote/Bundle.java
@@ -1,14 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 SpringSource, a divison of VMware, 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
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2011 SpringSource, a division of VMware, Inc. and others and others.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *     SAP AG - moving to Eclipse Libra project and enhancements
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.management.remote;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/management/remote/PackageExport.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/management/remote/PackageExport.java
index f991c9b..0fdbe8e 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/management/remote/PackageExport.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/management/remote/PackageExport.java
@@ -1,14 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 SpringSource, a divison of VMware, 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
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2011 SpringSource, a division of VMware, Inc. and others and others.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *     SAP AG - moving to Eclipse Libra project and enhancements
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.management.remote;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/management/remote/PackageImport.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/management/remote/PackageImport.java
index 1679f0c..5ff5743 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/management/remote/PackageImport.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/management/remote/PackageImport.java
@@ -1,14 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 SpringSource, a divison of VMware, 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
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2011 SpringSource, a division of VMware, Inc. and others and others.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *     SAP AG - moving to Eclipse Libra project and enhancements
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.management.remote;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/management/remote/ServiceReference.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/management/remote/ServiceReference.java
index 0151ac0..f7dee82 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/management/remote/ServiceReference.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/management/remote/ServiceReference.java
@@ -1,14 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 SpringSource, a divison of VMware, 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
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2011 SpringSource, a division of VMware, Inc. and others and others.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *     SAP AG - moving to Eclipse Libra project and enhancements
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.management.remote;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/preferences/PreferenceConstants.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/preferences/PreferenceConstants.java
index b1f0cf5..9931011 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/preferences/PreferenceConstants.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/preferences/PreferenceConstants.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.preferences;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/preferences/PreferenceInitializer.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/preferences/PreferenceInitializer.java
index 87341bd..3f93a1c 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/preferences/PreferenceInitializer.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/preferences/PreferenceInitializer.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.preferences;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/preferences/VirgoPreferencePage.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/preferences/VirgoPreferencePage.java
index c2e18b1..9ff70d8 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/preferences/VirgoPreferencePage.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/preferences/VirgoPreferencePage.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.preferences;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/IServer.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/IServer.java
index 674523f..0517d69 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/IServer.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/IServer.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009 - 2013 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009 - 2013 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.core;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/IServerBehaviour.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/IServerBehaviour.java
index b685c20..603303d 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/IServerBehaviour.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/IServerBehaviour.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.core;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/IServerConfiguration.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/IServerConfiguration.java
index 95df802..07047b0 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/IServerConfiguration.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/IServerConfiguration.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.core;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/IServerDeployer.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/IServerDeployer.java
index 3e0e430..6c7d865 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/IServerDeployer.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/IServerDeployer.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.core;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/IServerRuntime.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/IServerRuntime.java
index b4e5d26..a125f2b 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/IServerRuntime.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/IServerRuntime.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.core;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/IServerRuntimeProvider.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/IServerRuntimeProvider.java
index 3e61a8c..36bea2e 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/IServerRuntimeProvider.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/IServerRuntimeProvider.java
@@ -1,14 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 SpringSource, a divison of VMware, 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
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2011 SpringSource, a division of VMware, Inc. and others and others.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *     SAP AG - moving to Eclipse Libra project and enhancements
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.core;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/IServerRuntimeWorkingCopy.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/IServerRuntimeWorkingCopy.java
index 688845f..8059261 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/IServerRuntimeWorkingCopy.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/IServerRuntimeWorkingCopy.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.core;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/IServerWorkingCopy.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/IServerWorkingCopy.java
index 59dc326..2336591 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/IServerWorkingCopy.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/IServerWorkingCopy.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009 - 2013 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009 - 2013 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.core;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/ServerCorePlugin.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/ServerCorePlugin.java
index 9f75633..eb53a48 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/ServerCorePlugin.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/ServerCorePlugin.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2010 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.core;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/ServerUtils.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/ServerUtils.java
index 91ee028..dc297cf 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/ServerUtils.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/ServerUtils.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2010 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.core;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/Artefact.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/Artefact.java
index 908e5f9..539d0a0 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/Artefact.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/Artefact.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
+/*********************************************************************
  * Copyright (c) 2007, 2012 SpringSource
- * 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:
- *     SpringSource - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.core.artefacts;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/ArtefactRepository.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/ArtefactRepository.java
index dbd345f..4308c84 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/ArtefactRepository.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/ArtefactRepository.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
+/*********************************************************************
  * Copyright (c) 2007, 2012 SpringSource
- * 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:
- *     SpringSource - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.core.artefacts;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/ArtefactRepositoryManager.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/ArtefactRepositoryManager.java
index f7e75ec..aba70af 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/ArtefactRepositoryManager.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/ArtefactRepositoryManager.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2010 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.core.artefacts;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/ArtefactSet.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/ArtefactSet.java
index 436779f..73f6958 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/ArtefactSet.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/ArtefactSet.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.core.artefacts;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/ArtefactType.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/ArtefactType.java
index 6116f5b..4ca4bdd 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/ArtefactType.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/ArtefactType.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.core.artefacts;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/BundleArtefact.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/BundleArtefact.java
index d3b3adf..b602106 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/BundleArtefact.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/BundleArtefact.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
+/*********************************************************************
  * Copyright (c) 2007, 2012 SpringSource
- * 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:
- *     SpringSource - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.core.artefacts;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/IArtefact.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/IArtefact.java
index 9fd4e63..163d40f 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/IArtefact.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/IArtefact.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.core.artefacts;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/IArtefactTyped.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/IArtefactTyped.java
index e121ed6..45c67ab 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/IArtefactTyped.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/IArtefactTyped.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.core.artefacts;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/ILocalArtefact.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/ILocalArtefact.java
index 5f04667..f2645fe 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/ILocalArtefact.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/ILocalArtefact.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.core.artefacts;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/ILocalEntity.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/ILocalEntity.java
index 223c8a7..cd55d41 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/ILocalEntity.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/ILocalEntity.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.core.artefacts;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/LibraryArtefact.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/LibraryArtefact.java
index e16261a..38ffe58 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/LibraryArtefact.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/LibraryArtefact.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
+/*********************************************************************
  * Copyright (c) 2007, 2012 SpringSource
- * 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:
- *     SpringSource - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.core.artefacts;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/LocalArtefactRepository.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/LocalArtefactRepository.java
index 92a28d5..31f26e0 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/LocalArtefactRepository.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/LocalArtefactRepository.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.core.artefacts;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/LocalArtefactSet.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/LocalArtefactSet.java
index fa6f901..d68f0b3 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/LocalArtefactSet.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/LocalArtefactSet.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.core.artefacts;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/LocalBundleArtefact.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/LocalBundleArtefact.java
index e6a1f9d..1863b87 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/LocalBundleArtefact.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/LocalBundleArtefact.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.core.artefacts;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/LocalLibraryArtefact.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/LocalLibraryArtefact.java
index 6a22392..b1a2e43 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/LocalLibraryArtefact.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/artefacts/LocalLibraryArtefact.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.core.artefacts;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/provisioning/IBundleRepositoryChangeListener.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/provisioning/IBundleRepositoryChangeListener.java
index 640af6a..336b767 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/provisioning/IBundleRepositoryChangeListener.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/provisioning/IBundleRepositoryChangeListener.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.core.provisioning;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/provisioning/RepositoryProvisioningJob.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/provisioning/RepositoryProvisioningJob.java
index eca5220..db23e49 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/provisioning/RepositoryProvisioningJob.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/provisioning/RepositoryProvisioningJob.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.core.provisioning;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/provisioning/RepositorySourceProvisiongJob.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/provisioning/RepositorySourceProvisiongJob.java
index e8704db..d8d1c0a 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/provisioning/RepositorySourceProvisiongJob.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/provisioning/RepositorySourceProvisiongJob.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.core.provisioning;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/provisioning/RepositoryUtils.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/provisioning/RepositoryUtils.java
index 920ef06..00a11de 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/provisioning/RepositoryUtils.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/core/provisioning/RepositoryUtils.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009 - 2013 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009 - 2013 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.core.provisioning;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/DefaultServerDeployer.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/DefaultServerDeployer.java
index be6471b..c856dc3 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/DefaultServerDeployer.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/DefaultServerDeployer.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2010 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/DeploymentIdentity.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/DeploymentIdentity.java
index dd2f58b..23d93c8 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/DeploymentIdentity.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/DeploymentIdentity.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/LaunchArgumentUtils.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/LaunchArgumentUtils.java
index e10c2c6..643f721 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/LaunchArgumentUtils.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/LaunchArgumentUtils.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/Server.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/Server.java
index 87f079f..b650904 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/Server.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/Server.java
@@ -1,14 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009 - 2013 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009 - 2013 SpringSource, a division of VMware, Inc. and others.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *     GianMaria Romanato - support for nested plans
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/ServerBehaviour.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/ServerBehaviour.java
index e4561a8..f363542 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/ServerBehaviour.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/ServerBehaviour.java
@@ -1,14 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009 - 2012 SpringSource, a divison of VMware, 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
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009 - 2012 SpringSource, a division of VMware, Inc. and others and others.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *     SAP AG - moving to Eclipse Libra project and enhancements
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/ServerConfiguration.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/ServerConfiguration.java
index 4ea7638..bc566ad 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/ServerConfiguration.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/ServerConfiguration.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/ServerLaunchConfigurationDelegate.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/ServerLaunchConfigurationDelegate.java
index 59ffb21..0a4b6ec 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/ServerLaunchConfigurationDelegate.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/ServerLaunchConfigurationDelegate.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/ServerLaunchableAdapterDelegate.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/ServerLaunchableAdapterDelegate.java
index 12639c1..a77135a 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/ServerLaunchableAdapterDelegate.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/ServerLaunchableAdapterDelegate.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/ServerPublishOperation.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/ServerPublishOperation.java
index 410a9c0..e8f66b2 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/ServerPublishOperation.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/ServerPublishOperation.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2010 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/ServerPublishTask.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/ServerPublishTask.java
index a2e5cd4..5f214e0 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/ServerPublishTask.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/ServerPublishTask.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2010 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/ServerRuntimeUtils.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/ServerRuntimeUtils.java
index c29cf27..1432b1a 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/ServerRuntimeUtils.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/ServerRuntimeUtils.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/ServerSourcePathComputerDelegate.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/ServerSourcePathComputerDelegate.java
index f1940a3..b8c3ab7 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/ServerSourcePathComputerDelegate.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/ServerSourcePathComputerDelegate.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/ServerStatusPingThread.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/ServerStatusPingThread.java
index 838c17c..05acaf4 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/ServerStatusPingThread.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/ServerStatusPingThread.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/VirgoServer.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/VirgoServer.java
index fd6afb2..71a0580 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/VirgoServer.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/VirgoServer.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2010 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2010 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/VirgoServerBehaviour.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/VirgoServerBehaviour.java
index 051cd7d..5f63705 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/VirgoServerBehaviour.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/VirgoServerBehaviour.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2010 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2010 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/VirgoServerRuntime.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/VirgoServerRuntime.java
index 593fe06..88b2fa4 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/VirgoServerRuntime.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/VirgoServerRuntime.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/actions/ModifyArtefactOrderCommand.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/actions/ModifyArtefactOrderCommand.java
index 8d6e23a..a1cad50 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/actions/ModifyArtefactOrderCommand.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/actions/ModifyArtefactOrderCommand.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core.actions;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/actions/ModifyCleanStartupCommand.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/actions/ModifyCleanStartupCommand.java
index 6feac29..7d0ae0e 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/actions/ModifyCleanStartupCommand.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/actions/ModifyCleanStartupCommand.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core.actions;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/actions/ModifyDeployerPasswordCommand.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/actions/ModifyDeployerPasswordCommand.java
index a92ea6e..8343416 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/actions/ModifyDeployerPasswordCommand.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/actions/ModifyDeployerPasswordCommand.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core.actions;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/actions/ModifyDeployerPortCommand.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/actions/ModifyDeployerPortCommand.java
index b40daea..857fde9 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/actions/ModifyDeployerPortCommand.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/actions/ModifyDeployerPortCommand.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core.actions;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/actions/ModifyDeployerTimeoutCommand.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/actions/ModifyDeployerTimeoutCommand.java
index 491fa45..43698c0 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/actions/ModifyDeployerTimeoutCommand.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/actions/ModifyDeployerTimeoutCommand.java
@@ -1,3 +1,12 @@
+/*********************************************************************
+ * Copyright (c) 2015 Daan de Wit
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core.actions;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/actions/ModifyDeployerUsernameCommand.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/actions/ModifyDeployerUsernameCommand.java
index c4f444c..ae940c6 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/actions/ModifyDeployerUsernameCommand.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/actions/ModifyDeployerUsernameCommand.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core.actions;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/actions/ModifyMaxPermSizeCommand.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/actions/ModifyMaxPermSizeCommand.java
index fb6a67c..14d1478 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/actions/ModifyMaxPermSizeCommand.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/actions/ModifyMaxPermSizeCommand.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
+/*********************************************************************
  * Copyright (c) 2013 Eclipse Foundation
- * 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:
- *     Tasktop Technologies - initial implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core.actions;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/actions/ModifyStaticResourcesCommand.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/actions/ModifyStaticResourcesCommand.java
index d53df0d..1d0b3c9 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/actions/ModifyStaticResourcesCommand.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/actions/ModifyStaticResourcesCommand.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core.actions;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/actions/ModifyTailLogFilesCommand.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/actions/ModifyTailLogFilesCommand.java
index d04b36f..17e94d0 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/actions/ModifyTailLogFilesCommand.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/actions/ModifyTailLogFilesCommand.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core.actions;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/AbstractJmxServerCommand.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/AbstractJmxServerCommand.java
index fe5924a..7d05f2f 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/AbstractJmxServerCommand.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/AbstractJmxServerCommand.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core.command;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/AbstractJmxServerDeployerCommand.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/AbstractJmxServerDeployerCommand.java
index db90f04..ec5bba1 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/AbstractJmxServerDeployerCommand.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/AbstractJmxServerDeployerCommand.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core.command;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/GenericJmxServerDeployCommand.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/GenericJmxServerDeployCommand.java
index 4e70a6f..4cdc7c0 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/GenericJmxServerDeployCommand.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/GenericJmxServerDeployCommand.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core.command;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/IServerCommand.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/IServerCommand.java
index af97e93..641e2e6 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/IServerCommand.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/IServerCommand.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core.command;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/JmxBundleAdminExecuteCommand.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/JmxBundleAdminExecuteCommand.java
index ce7e889..0040dd0 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/JmxBundleAdminExecuteCommand.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/JmxBundleAdminExecuteCommand.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core.command;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/JmxBundleAdminServerCommand.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/JmxBundleAdminServerCommand.java
index 0f38356..f4da0bc 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/JmxBundleAdminServerCommand.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/JmxBundleAdminServerCommand.java
@@ -1,14 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 SpringSource, a divison of VMware, 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
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2011 SpringSource, a division of VMware, Inc. and others and others.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *     SAP AG - moving to Eclipse Libra project and enhancements
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core.command;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/JmxServerCheckBundleDeployedCommand.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/JmxServerCheckBundleDeployedCommand.java
index 4ca568c..7746c97 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/JmxServerCheckBundleDeployedCommand.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/JmxServerCheckBundleDeployedCommand.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
+/*********************************************************************
  * Copyright (c) 2015 GianMaria Romanato
- * 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:
- *     GianMaria Romanato - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core.command;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/JmxServerDeployCommand.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/JmxServerDeployCommand.java
index 6829e77..213fcb8 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/JmxServerDeployCommand.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/JmxServerDeployCommand.java
@@ -1,14 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2010 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2010 SpringSource, a division of VMware, Inc. and others.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *     GianMaria Romanato - bug fixing
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core.command;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/JmxServerPingCommand.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/JmxServerPingCommand.java
index cc6bcea..5541466 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/JmxServerPingCommand.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/JmxServerPingCommand.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core.command;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/JmxServerRefreshCommand.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/JmxServerRefreshCommand.java
index d53d900..fa0a554 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/JmxServerRefreshCommand.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/JmxServerRefreshCommand.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core.command;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/JmxServerShutdownCommand.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/JmxServerShutdownCommand.java
index 25dd4bd..bd7de27 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/JmxServerShutdownCommand.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/JmxServerShutdownCommand.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009 - 2013 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009 - 2013 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core.command;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/JmxServerUndeployCommand.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/JmxServerUndeployCommand.java
index d08b234..8419e78 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/JmxServerUndeployCommand.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/JmxServerUndeployCommand.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2010 - 2013 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2010 - 2013 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core.command;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/JmxServerUpdateCommand.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/JmxServerUpdateCommand.java
index b0d8923..f053820 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/JmxServerUpdateCommand.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/command/JmxServerUpdateCommand.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2010 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core.command;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/provisioning/IArtefactRepositoryLoader.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/provisioning/IArtefactRepositoryLoader.java
index 58a7757..5f0b445 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/provisioning/IArtefactRepositoryLoader.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/provisioning/IArtefactRepositoryLoader.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core.provisioning;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/provisioning/JsonArtefactRepositoryLoader.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/provisioning/JsonArtefactRepositoryLoader.java
index cf79126..d2937d8 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/provisioning/JsonArtefactRepositoryLoader.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/provisioning/JsonArtefactRepositoryLoader.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core.provisioning;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/runtimes/InstallationType.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/runtimes/InstallationType.java
index ef63640..cf51819 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/runtimes/InstallationType.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/runtimes/InstallationType.java
@@ -1,11 +1,12 @@
-/**
- * <copyright>
+/*********************************************************************
+ * Copyright (c) 2009 - 2012 SpringSource, a division of VMware, Inc.
  *
- * TODO Copyright
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
  *
- * </copyright>
- *
- */
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core.runtimes;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/runtimes/InvalidRuntimeProvider.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/runtimes/InvalidRuntimeProvider.java
index 3ab89e0..d268ba1 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/runtimes/InvalidRuntimeProvider.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/runtimes/InvalidRuntimeProvider.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
+/*********************************************************************
  * Copyright (c) 2012 Eclipse Foundation
- * 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:
- *     SAP AG - initial implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core.runtimes;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/runtimes/RuntimeProviders.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/runtimes/RuntimeProviders.java
index d0310df..739edf3 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/runtimes/RuntimeProviders.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/runtimes/RuntimeProviders.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009 - 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009 - 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core.runtimes;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/runtimes/Virgo21_30Provider.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/runtimes/Virgo21_30Provider.java
index f7d2767..f9febbf 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/runtimes/Virgo21_30Provider.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/runtimes/Virgo21_30Provider.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
+/*********************************************************************
  * Copyright (c) 2012 Eclipse Foundation
- * 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:
- *     SAP AG - initial implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core.runtimes;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/runtimes/Virgo35Provider.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/runtimes/Virgo35Provider.java
index 629b3c2..2095371 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/runtimes/Virgo35Provider.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/runtimes/Virgo35Provider.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
+/*********************************************************************
  * Copyright (c) 2012 - 2013 Eclipse Foundation
- * 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:
- *     SAP AG - initial implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core.runtimes;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/runtimes/Virgo37Provider.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/runtimes/Virgo37Provider.java
index e49271f..e2c9b76 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/runtimes/Virgo37Provider.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/runtimes/Virgo37Provider.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
+/*********************************************************************
  * Copyright (c) 2015 Eclipse Foundation
- * 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:
- *     EclipseSource - initial implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core.runtimes;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/runtimes/VirgoRuntimeProvider.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/runtimes/VirgoRuntimeProvider.java
index 256ff2a..31faecc 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/runtimes/VirgoRuntimeProvider.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/runtimes/VirgoRuntimeProvider.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2010 - 2013 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2010 - 2013 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core.runtimes;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/utils/StatusUtil.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/utils/StatusUtil.java
index 1cc4c8a..8de36c9 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/utils/StatusUtil.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/utils/StatusUtil.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core.utils;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/utils/WebDownloadUtils.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/utils/WebDownloadUtils.java
index d4ed932..a38aa8d 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/utils/WebDownloadUtils.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/core/utils/WebDownloadUtils.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2010 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.core.utils;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/ui/projects/ArtefactProjectFileContainer.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/ui/projects/ArtefactProjectFileContainer.java
index 9efcf07..4b07481 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/ui/projects/ArtefactProjectFileContainer.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/ui/projects/ArtefactProjectFileContainer.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.projects;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/ui/projects/IServerProjectArtefact.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/ui/projects/IServerProjectArtefact.java
index 501bba0..fcc61cf 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/ui/projects/IServerProjectArtefact.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/ui/projects/IServerProjectArtefact.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.projects;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/ui/projects/IServerProjectContainer.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/ui/projects/IServerProjectContainer.java
index 7f08d56..249d5cc 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/ui/projects/IServerProjectContainer.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/ui/projects/IServerProjectContainer.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.projects;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/ui/projects/ProjectBundleContainer.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/ui/projects/ProjectBundleContainer.java
index e51e480..c220ef0 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/ui/projects/ProjectBundleContainer.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/ui/projects/ProjectBundleContainer.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.projects;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/ui/projects/ProjectBundleRoot.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/ui/projects/ProjectBundleRoot.java
index bd0adfc..b517a82 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/ui/projects/ProjectBundleRoot.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/ui/projects/ProjectBundleRoot.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.projects;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/ui/projects/ProjectFileContainer.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/ui/projects/ProjectFileContainer.java
index 9813f35..13c0ac0 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/ui/projects/ProjectFileContainer.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/ui/projects/ProjectFileContainer.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.projects;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/ui/projects/ProjectFileReference.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/ui/projects/ProjectFileReference.java
index 56a3c97..bc775af 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/ui/projects/ProjectFileReference.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/ui/projects/ProjectFileReference.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.projects;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/ui/projects/ServerProject.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/ui/projects/ServerProject.java
index 233078e..31d8c37 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/ui/projects/ServerProject.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/ui/projects/ServerProject.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009 - 2013 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009 - 2013 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.projects;
 
diff --git a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/ui/projects/ServerProjectManager.java b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/ui/projects/ServerProjectManager.java
index 6746187..9f33087 100644
--- a/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/ui/projects/ServerProjectManager.java
+++ b/org.eclipse.virgo.ide.runtime.core/src/org/eclipse/virgo/ide/runtime/internal/ui/projects/ServerProjectManager.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009 - 2013 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009 - 2013 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.projects;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/about.html b/org.eclipse.virgo.ide.runtime.ui/about.html
index 2abb573..164f781 100644
--- a/org.eclipse.virgo.ide.runtime.ui/about.html
+++ b/org.eclipse.virgo.ide.runtime.ui/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>April 13, 2012</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.virgo.ide.runtime.ui/plugin.xml b/org.eclipse.virgo.ide.runtime.ui/plugin.xml
index 639a7a7..e8f2af6 100644
--- a/org.eclipse.virgo.ide.runtime.ui/plugin.xml
+++ b/org.eclipse.virgo.ide.runtime.ui/plugin.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.3"?>
 <!--
-/*******************************************************************************
+/*********************************************************************
  * Copyright (c) 2007, 2010 SpringSource
- * 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:
- *     SpringSource - initial API and implementation
- *******************************************************************************/
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 -->
 <plugin>
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/Messages.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/Messages.java
index 37a14f4..7c2572c 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/Messages.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/Messages.java
@@ -1,3 +1,12 @@
+/*********************************************************************
+ * Copyright (c) 2015 GianMaria Romanato
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/PDEHelper.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/PDEHelper.java
index e31002a..e2b0cd4 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/PDEHelper.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/PDEHelper.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- *  Copyright (c) 2015 GianMaria Romanato
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2015 GianMaria Romanato
  *
- *  Contributors:
- *     GianMaria Romanato - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/PDETargetPlatformComposite.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/PDETargetPlatformComposite.java
index f49e00c..55b6a82 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/PDETargetPlatformComposite.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/PDETargetPlatformComposite.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- *  Copyright (c) 2015 GianMaria Romanato
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2015 GianMaria Romanato
  *
- *  Contributors:
- *     GianMaria Romanato - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/PDETargetPlatformWizardFragment.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/PDETargetPlatformWizardFragment.java
index f190c05..47e04ac 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/PDETargetPlatformWizardFragment.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/PDETargetPlatformWizardFragment.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- *  Copyright (c) 2015 GianMaria Romanato
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2015 GianMaria Romanato
  *
- *  Contributors:
- *     GianMaria Romanato - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/PDEUIMessages.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/PDEUIMessages.java
index 0c84502..599c118 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/PDEUIMessages.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/PDEUIMessages.java
@@ -1,6 +1,15 @@
 
 package org.eclipse.virgo.ide.runtime.internal.ui;
 
+/*********************************************************************
+ * Copyright (c) 2015 GianMaria Romanato
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 import org.eclipse.osgi.util.NLS;
 
 public class PDEUIMessages extends NLS {
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/ServerLicenseRuntimeWizardFragment.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/ServerLicenseRuntimeWizardFragment.java
index 832aff5..086cd3e 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/ServerLicenseRuntimeWizardFragment.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/ServerLicenseRuntimeWizardFragment.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/ServerRuntimeComposite.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/ServerRuntimeComposite.java
index 14ec684..62799b2 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/ServerRuntimeComposite.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/ServerRuntimeComposite.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2010 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/ServerUiImages.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/ServerUiImages.java
index ff9f28d..ce8f728 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/ServerUiImages.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/ServerUiImages.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2010 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/ServerUiPlugin.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/ServerUiPlugin.java
index 45e42b8..4d39f4e 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/ServerUiPlugin.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/ServerUiPlugin.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/VirgoLaunchConfigurationTabGroup.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/VirgoLaunchConfigurationTabGroup.java
index 27a77e1..1d9064e 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/VirgoLaunchConfigurationTabGroup.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/VirgoLaunchConfigurationTabGroup.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2010 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2010 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/VirgoServerRuntimeWizardFragment.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/VirgoServerRuntimeWizardFragment.java
index ab26602..3b1b4e5 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/VirgoServerRuntimeWizardFragment.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/VirgoServerRuntimeWizardFragment.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2010 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2010 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/actions/OpenBundleManifestAction.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/actions/OpenBundleManifestAction.java
index f190d4c..850abb6 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/actions/OpenBundleManifestAction.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/actions/OpenBundleManifestAction.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.actions;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/actions/OpenProjectManifestAction.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/actions/OpenProjectManifestAction.java
index d817fc4..1550a83 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/actions/OpenProjectManifestAction.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/actions/OpenProjectManifestAction.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.actions;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/actions/OpenServerProjectFileAction.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/actions/OpenServerProjectFileAction.java
index 4b794f5..a5a3b3f 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/actions/OpenServerProjectFileAction.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/actions/OpenServerProjectFileAction.java
@@ -1,14 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * 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
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.actions;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/actions/RedeployBundleAction.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/actions/RedeployBundleAction.java
index 413049f..4a395e0 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/actions/RedeployBundleAction.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/actions/RedeployBundleAction.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.actions;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/ArtefactOrderEditorSection.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/ArtefactOrderEditorSection.java
index 4d2c1ce..7f19a68 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/ArtefactOrderEditorSection.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/ArtefactOrderEditorSection.java
@@ -1,14 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc. and others.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *     GianMaria Romanato - multiple selection and apply changes on save
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.editor;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/Messages.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/Messages.java
index 7c3b30c..65b7c18 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/Messages.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/Messages.java
@@ -1,11 +1,12 @@
-/**
- * <copyright>
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * TODO Copyright
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
  *
- * </copyright>
- *
- */
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.editor;
 
@@ -110,23 +111,23 @@
 
     public static String ServerDeployEditorSection_description;
 
-	public static String ServerDeployEditorSection_invalid_port_form_error;
+    public static String ServerDeployEditorSection_invalid_port_form_error;
 
-	public static String ServerDeployEditorSection_invalid_port_save_message;
+    public static String ServerDeployEditorSection_invalid_port_save_message;
 
-	public static String ServerDeployEditorSection_invalid_timeout_form_error;
+    public static String ServerDeployEditorSection_invalid_timeout_form_error;
 
-	public static String ServerDeployEditorSection_invalid_timeout_save_message;
+    public static String ServerDeployEditorSection_invalid_timeout_save_message;
 
-	public static String ServerDeployEditorSection_port_label;
+    public static String ServerDeployEditorSection_port_label;
 
-	public static String ServerDeployEditorSection_timeout_label;
+    public static String ServerDeployEditorSection_timeout_label;
 
-	public static String ServerDeployEditorSection_timeout_too_small_form_error;
+    public static String ServerDeployEditorSection_timeout_too_small_form_error;
 
-	public static String ServerDeployEditorSection_title;
+    public static String ServerDeployEditorSection_title;
 
-	public static String StartupEditorSection_description;
+    public static String StartupEditorSection_description;
 
     public static String StartupEditorSection_maxpermsize_label;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/RepositoryBrowserEditorPage.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/RepositoryBrowserEditorPage.java
index 5029d9e..e52f0e7 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/RepositoryBrowserEditorPage.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/RepositoryBrowserEditorPage.java
@@ -1,14 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2010 SpringSource, a division of VMware, Inc. and others.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *     GianMaria Romanato - remove SpringSource repository browser section
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.editor;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/ServerDeployEditorSection.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/ServerDeployEditorSection.java
index f48bd7f..0eec208 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/ServerDeployEditorSection.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/ServerDeployEditorSection.java
@@ -1,14 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2015 SpringSource, a divison of VMware, 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
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2015 SpringSource, a division of VMware, Inc. and others and others.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *     GianMaria Romanato - externalize strings and perform changes only on save
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.editor;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/ServerOutlinePage.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/ServerOutlinePage.java
index fcf615d..2adb180 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/ServerOutlinePage.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/ServerOutlinePage.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.editor;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/StartupEditorSection.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/StartupEditorSection.java
index 0124f86..a586628 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/StartupEditorSection.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/StartupEditorSection.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009 - 2013 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009 - 2013 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.editor;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/StaticResourcesEditorSection.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/StaticResourcesEditorSection.java
index c7ff5f9..8148c89 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/StaticResourcesEditorSection.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/StaticResourcesEditorSection.java
@@ -1,17 +1,12 @@
-// TODO - externalize strings ""
-// grid data della tabella non funziona
-// controlli sul file name nel dialog di aggiunta
-
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc. and others.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.editor;
 
@@ -161,22 +156,22 @@
                 InputDialog dialog = new InputDialog(getShell(), Messages.StaticResourcesEditorSection_new_filename_dialog_title,
                     Messages.StaticResourcesEditorSection_new_filename_dialog_message, "", new IInputValidator() { //$NON-NLS-1$
 
-                    public String isValid(String newText) {
-                        if (!StringUtils.isNotBlank(newText)) {
-                            return Messages.StaticResourcesEditorSection_empty_filename_error;
-                        }
+                        public String isValid(String newText) {
+                            if (!StringUtils.isNotBlank(newText)) {
+                                return Messages.StaticResourcesEditorSection_empty_filename_error;
+                            }
 
-                        if ("*".equals(newText)) { //$NON-NLS-1$
-                            return Messages.StaticResourcesEditorSection_wildcard_too_greedy;
-                        }
+                            if ("*".equals(newText)) { //$NON-NLS-1$
+                                return Messages.StaticResourcesEditorSection_wildcard_too_greedy;
+                            }
 
-                        String replaceWildcards = newText.replaceAll("\\?", "a").replaceAll("\\*", "b"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-                        if (!Path.isValidWindowsSegment(replaceWildcards) || !Path.isValidWindowsSegment(replaceWildcards)) {
-                            return Messages.StaticResourcesEditorSection_invalid_path;
+                            String replaceWildcards = newText.replaceAll("\\?", "a").replaceAll("\\*", "b"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+                            if (!Path.isValidWindowsSegment(replaceWildcards) || !Path.isValidWindowsSegment(replaceWildcards)) {
+                                return Messages.StaticResourcesEditorSection_invalid_path;
+                            }
+                            return null;
                         }
-                        return null;
-                    }
-                });
+                    });
                 if (dialog.open() == Window.OK) {
                     StaticResourcesEditorSection.this.updating = true;
                     List<Object> filenames = new ArrayList<Object>(
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/TargetPlatformEditWizard.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/TargetPlatformEditWizard.java
index b2e10ae..ff2b1c3 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/TargetPlatformEditWizard.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/TargetPlatformEditWizard.java
@@ -1,3 +1,12 @@
+/*********************************************************************
+ * Copyright (c) 2015 GianMaria Romanato
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.editor;
 
@@ -12,7 +21,6 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.statushandlers.StatusManager;
 import org.eclipse.virgo.ide.runtime.internal.ui.PDETargetPlatformComposite;
-import org.eclipse.virgo.ide.runtime.internal.ui.PDEUIMessages;
 import org.eclipse.virgo.ide.ui.ServerIdeUiPlugin;
 import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
 
@@ -58,7 +66,8 @@
                 }
             });
         } catch (Exception e) {
-            StatusManager.getManager().handle(new Status(IStatus.ERROR, ServerIdeUiPlugin.PLUGIN_ID, TargetPlatformSectionMessages.TargetPlatformSection_InternalError, e),
+            StatusManager.getManager().handle(
+                new Status(IStatus.ERROR, ServerIdeUiPlugin.PLUGIN_ID, TargetPlatformSectionMessages.TargetPlatformSection_InternalError, e),
                 StatusManager.LOG | StatusManager.SHOW);
         }
         return true;
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/TargetPlatformSection.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/TargetPlatformSection.java
index 3beb052..ceb493e 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/TargetPlatformSection.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/TargetPlatformSection.java
@@ -1,3 +1,12 @@
+/*********************************************************************
+ * Copyright (c) 2015 GianMaria Romanato
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.editor;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/TargetPlatformSectionMessages.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/TargetPlatformSectionMessages.java
index de1e560..2ca2143 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/TargetPlatformSectionMessages.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/TargetPlatformSectionMessages.java
@@ -1,3 +1,12 @@
+/*********************************************************************
+ * Copyright (c) 2015 GianMaria Romanato
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.editor;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/VirgoEditorAdapterFactory.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/VirgoEditorAdapterFactory.java
index a319dd5..cd63c3a 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/VirgoEditorAdapterFactory.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/VirgoEditorAdapterFactory.java
@@ -1,11 +1,12 @@
-/**
- * <copyright>
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * TODO Copyright
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
  *
- * </copyright>
- *
- */
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.editor;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/VirgoRepositoryBrowserEditorPage.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/VirgoRepositoryBrowserEditorPage.java
index ad17388..1394c15 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/VirgoRepositoryBrowserEditorPage.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/VirgoRepositoryBrowserEditorPage.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2010 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2010 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.editor;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/WebUiUtils.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/WebUiUtils.java
index 35c55cc..514ba44 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/WebUiUtils.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/editor/WebUiUtils.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.editor;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/filters/BundleArtefactFilter.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/filters/BundleArtefactFilter.java
index 4d5981b..7b756ed 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/filters/BundleArtefactFilter.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/filters/BundleArtefactFilter.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.filters;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/filters/FilterAction.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/filters/FilterAction.java
index e7307c6..9d6e9b8 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/filters/FilterAction.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/filters/FilterAction.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.filters;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/filters/LibraryArtefactFilter.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/filters/LibraryArtefactFilter.java
index 0b9cfe3..8ee022b 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/filters/LibraryArtefactFilter.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/filters/LibraryArtefactFilter.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.filters;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/filters/VirgoServerFilter.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/filters/VirgoServerFilter.java
index d881e28..dbd6fc7 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/filters/VirgoServerFilter.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/filters/VirgoServerFilter.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.filters;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/properties/RuntimePreferencePage.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/properties/RuntimePreferencePage.java
index 0631dad..9b2730f 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/properties/RuntimePreferencePage.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/properties/RuntimePreferencePage.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2010 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.properties;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/ArtefactContainersContentProvider.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/ArtefactContainersContentProvider.java
index 83d1bd9..5b0a5b8 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/ArtefactContainersContentProvider.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/ArtefactContainersContentProvider.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.providers;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/FlattenedArtefactsContentProvider.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/FlattenedArtefactsContentProvider.java
index dcf713a..855b25d 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/FlattenedArtefactsContentProvider.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/FlattenedArtefactsContentProvider.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.providers;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/FlattenedPropertiesFileContentProvider.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/FlattenedPropertiesFileContentProvider.java
index 8f6cae5..b135f35 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/FlattenedPropertiesFileContentProvider.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/FlattenedPropertiesFileContentProvider.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.providers;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/GenericTreeProvider.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/GenericTreeProvider.java
index 8ae900b..b7fb501 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/GenericTreeProvider.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/GenericTreeProvider.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.providers;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/InstalledBundlesAndLibrariesContentProvider.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/InstalledBundlesAndLibrariesContentProvider.java
index 2fc7611..fbb9b6b 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/InstalledBundlesAndLibrariesContentProvider.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/InstalledBundlesAndLibrariesContentProvider.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.providers;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/LibrariesNode.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/LibrariesNode.java
index 3bbfa89..d1503db 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/LibrariesNode.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/LibrariesNode.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.providers;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/LogFileContentProvider.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/LogFileContentProvider.java
index 8c1073b..efe85a8 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/LogFileContentProvider.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/LogFileContentProvider.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.providers;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/PropertiesFileContentProvider.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/PropertiesFileContentProvider.java
index 493a367..5987c3c 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/PropertiesFileContentProvider.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/PropertiesFileContentProvider.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.providers;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/RepositoryContentProvider.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/RepositoryContentProvider.java
index 1da7498..f77b16e 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/RepositoryContentProvider.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/RepositoryContentProvider.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.providers;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/RepositoryPageContentProvider.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/RepositoryPageContentProvider.java
index ac711b8..6994e24 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/RepositoryPageContentProvider.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/RepositoryPageContentProvider.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.providers;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/RuntimeActionProvider.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/RuntimeActionProvider.java
index f470419..ad2c812 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/RuntimeActionProvider.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/RuntimeActionProvider.java
@@ -1,14 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * Copyright (c) 2005, 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
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.providers;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/RuntimeContainersContentProvider.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/RuntimeContainersContentProvider.java
index 25eea7b..f92f9e3 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/RuntimeContainersContentProvider.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/RuntimeContainersContentProvider.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.providers;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/RuntimeFullLabelProvider.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/RuntimeFullLabelProvider.java
index 019a3e2..be09b75 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/RuntimeFullLabelProvider.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/RuntimeFullLabelProvider.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.providers;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/RuntimeLabelProvider.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/RuntimeLabelProvider.java
index 7e20e1c..4c1ad24 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/RuntimeLabelProvider.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/RuntimeLabelProvider.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.providers;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/ServerFile.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/ServerFile.java
index 8008555..0d98a24 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/ServerFile.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/ServerFile.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.providers;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/ServerFileContentProvider.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/ServerFileContentProvider.java
index d3161a6..f619b20 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/ServerFileContentProvider.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/ServerFileContentProvider.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.providers;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/ServerFileLabelProvider.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/ServerFileLabelProvider.java
index 59ef575..02cd5ea 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/ServerFileLabelProvider.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/ServerFileLabelProvider.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.providers;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/ServerFileSelection.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/ServerFileSelection.java
index 3b7ce4b..702de74 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/ServerFileSelection.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/ServerFileSelection.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.providers;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/ServerTargetPlatformDecorator.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/ServerTargetPlatformDecorator.java
index 7d787f8..fbc0bd7 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/ServerTargetPlatformDecorator.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/ServerTargetPlatformDecorator.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- *  Copyright (c) 2015 GianMaria Romanato
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2015 GianMaria Romanato
  *
- *  Contributors:
- *     GianMaria Romanato - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.providers;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/SimpleBundleLabelProvider.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/SimpleBundleLabelProvider.java
index 5d4ef4a..7b03897 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/SimpleBundleLabelProvider.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/providers/SimpleBundleLabelProvider.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.providers;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/repository/RefreshBundleJob.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/repository/RefreshBundleJob.java
index fc63abc..0971dba 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/repository/RefreshBundleJob.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/repository/RefreshBundleJob.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009 - 2013 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009 - 2013 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.repository;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/sorters/ArtefactSignatureSorter.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/sorters/ArtefactSignatureSorter.java
index 9770c6d..4151697 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/sorters/ArtefactSignatureSorter.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/sorters/ArtefactSignatureSorter.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.sorters;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/sorters/RepositoryViewerSorter.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/sorters/RepositoryViewerSorter.java
index fa3e60b..5487d1a 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/sorters/RepositoryViewerSorter.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/internal/ui/sorters/RepositoryViewerSorter.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.internal.ui.sorters;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/ui/ServerEditorPageContentProvider.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/ui/ServerEditorPageContentProvider.java
index e2d94a4..5dc69f9 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/ui/ServerEditorPageContentProvider.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/ui/ServerEditorPageContentProvider.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.ui;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/ui/ServerEditorPageLabelProvider.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/ui/ServerEditorPageLabelProvider.java
index f0f8ef4..347bc30 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/ui/ServerEditorPageLabelProvider.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/ui/ServerEditorPageLabelProvider.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.ui;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/ui/views/ArtefactCommonView.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/ui/views/ArtefactCommonView.java
index 19e242b..96f63fe 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/ui/views/ArtefactCommonView.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/ui/views/ArtefactCommonView.java
@@ -1,14 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * Copyright (c) IBM Corporation (code cribbed from pde and navigator.)
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.ui.views;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/ui/views/CommonView.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/ui/views/CommonView.java
index 99c58fe..1f214c0 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/ui/views/CommonView.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/ui/views/CommonView.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.ui.views;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/ui/views/LogFileCommonView.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/ui/views/LogFileCommonView.java
index 5c71b53..1a0d860 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/ui/views/LogFileCommonView.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/ui/views/LogFileCommonView.java
@@ -1,14 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * Copyright (c) IBM Corporation (code cribbed from pde and navigator.)
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.ui.views;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/ui/views/PropertiesFileCommonView.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/ui/views/PropertiesFileCommonView.java
index 2fbe8e4..6b53eeb 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/ui/views/PropertiesFileCommonView.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/ui/views/PropertiesFileCommonView.java
@@ -1,14 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * Copyright (c) IBM Corporation (code cribbed from pde and navigator.)
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.ui.views;
 
diff --git a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/ui/views/ServerFileCommonView.java b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/ui/views/ServerFileCommonView.java
index 91bae6c..bfd7200 100644
--- a/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/ui/views/ServerFileCommonView.java
+++ b/org.eclipse.virgo.ide.runtime.ui/src/org/eclipse/virgo/ide/runtime/ui/views/ServerFileCommonView.java
@@ -1,14 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * Copyright (c) IBM Corporation (code cribbed from pde and navigator.)
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.runtime.ui.views;
 
diff --git a/org.eclipse.virgo.ide.site/pack-and-sign/sign-and-wait.sh b/org.eclipse.virgo.ide.site/pack-and-sign/sign-and-wait.sh
index a530ec9..6f5f780 100755
--- a/org.eclipse.virgo.ide.site/pack-and-sign/sign-and-wait.sh
+++ b/org.eclipse.virgo.ide.site/pack-and-sign/sign-and-wait.sh
@@ -1,15 +1,14 @@
 #!/bin/bash -e
 
-#*******************************************************************************
+#**********************************************************************
 # Copyright (c) 2009 Tasktop Technologies 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:
-#      Tasktop Technologies - initial API and implementation
-#*******************************************************************************
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#**********************************************************************
 
 if [ $# -lt 3 ]
 then
diff --git a/org.eclipse.virgo.ide.tests.util/about.html b/org.eclipse.virgo.ide.tests.util/about.html
index 2abb573..164f781 100644
--- a/org.eclipse.virgo.ide.tests.util/about.html
+++ b/org.eclipse.virgo.ide.tests.util/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>April 13, 2012</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.virgo.ide.tests.util/src/org/eclipse/virgo/ide/tests/util/VirgoIdeTestCase.java b/org.eclipse.virgo.ide.tests.util/src/org/eclipse/virgo/ide/tests/util/VirgoIdeTestCase.java
index 1710fc6..a49cfc7 100644
--- a/org.eclipse.virgo.ide.tests.util/src/org/eclipse/virgo/ide/tests/util/VirgoIdeTestCase.java
+++ b/org.eclipse.virgo.ide.tests.util/src/org/eclipse/virgo/ide/tests/util/VirgoIdeTestCase.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009, 2010 SpringSource
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2007, 2009 2010 SpringSource
  *
- * Contributors:
- *     SpringSource - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.tests.util;
 
diff --git a/org.eclipse.virgo.ide.tests.util/src/org/eclipse/virgo/ide/tests/util/VirgoIdeTestUtil.java b/org.eclipse.virgo.ide.tests.util/src/org/eclipse/virgo/ide/tests/util/VirgoIdeTestUtil.java
index 22e3b51..50fb55f 100644
--- a/org.eclipse.virgo.ide.tests.util/src/org/eclipse/virgo/ide/tests/util/VirgoIdeTestUtil.java
+++ b/org.eclipse.virgo.ide.tests.util/src/org/eclipse/virgo/ide/tests/util/VirgoIdeTestUtil.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009, 2010 SpringSource
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2007, 2009 2010 SpringSource
  *
- * Contributors:
- *     SpringSource - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.tests.util;
 
diff --git a/org.eclipse.virgo.ide.tests/about.html b/org.eclipse.virgo.ide.tests/about.html
index 2abb573..164f781 100644
--- a/org.eclipse.virgo.ide.tests/about.html
+++ b/org.eclipse.virgo.ide.tests/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>April 13, 2012</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.virgo.ide.ui.tests/about.html b/org.eclipse.virgo.ide.ui.tests/about.html
index 2abb573..164f781 100644
--- a/org.eclipse.virgo.ide.ui.tests/about.html
+++ b/org.eclipse.virgo.ide.ui.tests/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>April 13, 2012</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.virgo.ide.ui/about.html b/org.eclipse.virgo.ide.ui/about.html
index 2abb573..164f781 100644
--- a/org.eclipse.virgo.ide.ui/about.html
+++ b/org.eclipse.virgo.ide.ui/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>April 13, 2012</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.virgo.ide.ui/plugin.xml b/org.eclipse.virgo.ide.ui/plugin.xml
index 13a5121..5ce73a0 100644
--- a/org.eclipse.virgo.ide.ui/plugin.xml
+++ b/org.eclipse.virgo.ide.ui/plugin.xml
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-/*******************************************************************************
- * Copyright (c) 2007, 2010 SpringSource
- * 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:
- *     SpringSource - initial API and implementation
- *     GianMaria Romanato - new wizards and bugfixes
- *******************************************************************************/
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc. and others.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 -->
 <plugin>
    <extension
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/internal/ui/VirgoPerspective.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/internal/ui/VirgoPerspective.java
index deb0fd4..9690501 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/internal/ui/VirgoPerspective.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/internal/ui/VirgoPerspective.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.internal.ui;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/ServerIdeUiPlugin.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/ServerIdeUiPlugin.java
index 06ae1b5..8a900c9 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/ServerIdeUiPlugin.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/ServerIdeUiPlugin.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/StatusHandler.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/StatusHandler.java
index 8d1b268..b432481 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/StatusHandler.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/StatusHandler.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/AbstractImportSection.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/AbstractImportSection.java
index 91dff08..1bcde03 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/AbstractImportSection.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/AbstractImportSection.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/AbstractPdeFormTextEditorContributor.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/AbstractPdeFormTextEditorContributor.java
index af58e5c..58e9582 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/AbstractPdeFormTextEditorContributor.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/AbstractPdeFormTextEditorContributor.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/AbstractPdeGeneralInfoSection.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/AbstractPdeGeneralInfoSection.java
index f9853ab..3299c43 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/AbstractPdeGeneralInfoSection.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/AbstractPdeGeneralInfoSection.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleDependenciesPage.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleDependenciesPage.java
index d8b0cd9..e9443ac 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleDependenciesPage.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleDependenciesPage.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleDependencyPropertiesDialog.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleDependencyPropertiesDialog.java
index b3ebc55..8eceb32 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleDependencyPropertiesDialog.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleDependencyPropertiesDialog.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleExecutionEnvironmentSection.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleExecutionEnvironmentSection.java
index 7104f14..1a92ae7 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleExecutionEnvironmentSection.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleExecutionEnvironmentSection.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleExportPackageSection.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleExportPackageSection.java
index 60a1be7..12ebba3 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleExportPackageSection.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleExportPackageSection.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleGeneralInfoSection.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleGeneralInfoSection.java
index f5ae7b2..ceb4017 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleGeneralInfoSection.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleGeneralInfoSection.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009 - 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009 - 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleImportLibrarySection.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleImportLibrarySection.java
index 0ad59a8..a1dd506 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleImportLibrarySection.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleImportLibrarySection.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleImportPackageSection.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleImportPackageSection.java
index 01efedc..47cbc34 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleImportPackageSection.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleImportPackageSection.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleImportSection.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleImportSection.java
index 51e1b80..2158101 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleImportSection.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleImportSection.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleLibrarySection.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleLibrarySection.java
index ea28c59..00464e5 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleLibrarySection.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleLibrarySection.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleManifestEditor.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleManifestEditor.java
index 64c89fd..2c836be 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleManifestEditor.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleManifestEditor.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleManifestEditorContributor.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleManifestEditorContributor.java
index 7311468..0e1fc5e 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleManifestEditorContributor.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleManifestEditorContributor.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleManifestOutlinePage.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleManifestOutlinePage.java
index f17fdee..6af6e40 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleManifestOutlinePage.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleManifestOutlinePage.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleOverviewPage.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleOverviewPage.java
index 419fcde..d533654 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleOverviewPage.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleOverviewPage.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleQuickAssistAssistant.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleQuickAssistAssistant.java
index 038e28f..16dcb37 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleQuickAssistAssistant.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleQuickAssistAssistant.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleRuntimePage.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleRuntimePage.java
index 26c2c72..97a08fd 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleRuntimePage.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/BundleRuntimePage.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/IBundleManifestSaveListener.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/IBundleManifestSaveListener.java
index 71b7d92..d33afaf 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/IBundleManifestSaveListener.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/IBundleManifestSaveListener.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/ManifestEditorUtils.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/ManifestEditorUtils.java
index a9f7423..d93d8cf 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/ManifestEditorUtils.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/ManifestEditorUtils.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/ParDependenciesSection.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/ParDependenciesSection.java
index f68d803..cdc2abb 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/ParDependenciesSection.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/ParDependenciesSection.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/ParEditor.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/ParEditor.java
index d3fec46..253ad8b 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/ParEditor.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/ParEditor.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/ParGeneralInfoSection.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/ParGeneralInfoSection.java
index cc92655..5a567f4 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/ParGeneralInfoSection.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/ParGeneralInfoSection.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2011 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2011 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/ParManifestEditor.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/ParManifestEditor.java
index 2b831cb..a1f9132 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/ParManifestEditor.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/ParManifestEditor.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2010 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/ParOverviewPage.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/ParOverviewPage.java
index cd9b37a..3be6f4e 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/ParOverviewPage.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/ParOverviewPage.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/ParUtils.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/ParUtils.java
index 1aa7b5c..06865dc 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/ParUtils.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/ParUtils.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/ParXmlEditorPage.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/ParXmlEditorPage.java
index 43ea4ea..044e561 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/ParXmlEditorPage.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/ParXmlEditorPage.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/PdeCompatibilityUtil.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/PdeCompatibilityUtil.java
index 5607224..8de4ae1 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/PdeCompatibilityUtil.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/PdeCompatibilityUtil.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/ProjectSelectionDialog.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/ProjectSelectionDialog.java
index 0a91e63..8c3f300 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/ProjectSelectionDialog.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/ProjectSelectionDialog.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/SpringBundleFoldingStructureProvider.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/SpringBundleFoldingStructureProvider.java
index 615e871..ee6966b 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/SpringBundleFoldingStructureProvider.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/SpringBundleFoldingStructureProvider.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/SpringBundleHyperlinkDetector.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/SpringBundleHyperlinkDetector.java
index aa9239c..736f686 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/SpringBundleHyperlinkDetector.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/SpringBundleHyperlinkDetector.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/SpringBundleInputContext.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/SpringBundleInputContext.java
index b7e51c1..de0730f 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/SpringBundleInputContext.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/SpringBundleInputContext.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/SpringBundleSourcePage.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/SpringBundleSourcePage.java
index 221f85a..ede681a 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/SpringBundleSourcePage.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/SpringBundleSourcePage.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/model/BundleModelModification.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/model/BundleModelModification.java
index 87259fa..de02ea1 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/model/BundleModelModification.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/model/BundleModelModification.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors.model;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/model/BundleModelUtility.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/model/BundleModelUtility.java
index 477d37e..6dea37a 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/model/BundleModelUtility.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/model/BundleModelUtility.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors.model;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/plan/PlanAdapterFactoryProvider.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/plan/PlanAdapterFactoryProvider.java
index b86665c..57cb9b2 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/plan/PlanAdapterFactoryProvider.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/plan/PlanAdapterFactoryProvider.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2010 - 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2010 - 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors.plan;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/plan/PlanContentAssistProcessor.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/plan/PlanContentAssistProcessor.java
index ccc4356..81eb863 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/plan/PlanContentAssistProcessor.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/plan/PlanContentAssistProcessor.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2010 - 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2010 - 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors.plan;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/plan/PlanModelHandler.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/plan/PlanModelHandler.java
index 4141362..c9233c6 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/plan/PlanModelHandler.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/plan/PlanModelHandler.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2010 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2010 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors.plan;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/plan/PlanOutlineLabelProvider.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/plan/PlanOutlineLabelProvider.java
index edcb778..552c23f 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/plan/PlanOutlineLabelProvider.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/plan/PlanOutlineLabelProvider.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2010 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2010 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors.plan;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/text/AbstractPdeManifestConfiguration.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/text/AbstractPdeManifestConfiguration.java
index 1a42c73..7bb7ed7 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/text/AbstractPdeManifestConfiguration.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/text/AbstractPdeManifestConfiguration.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors.text;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/text/AbstractPdeManifestContentAssistProcessor.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/text/AbstractPdeManifestContentAssistProcessor.java
index f7d680e..6043f8b 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/text/AbstractPdeManifestContentAssistProcessor.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/text/AbstractPdeManifestContentAssistProcessor.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors.text;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/text/BundleColorManager.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/text/BundleColorManager.java
index 109ab6c..dddfd9f 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/text/BundleColorManager.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/text/BundleColorManager.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors.text;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/text/BundleManifestConfiguration.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/text/BundleManifestConfiguration.java
index 9f381f2..248fe1f 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/text/BundleManifestConfiguration.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/text/BundleManifestConfiguration.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors.text;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/text/BundleManifestContentAssistProcessor.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/text/BundleManifestContentAssistProcessor.java
index fa76d98..39ac5e0 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/text/BundleManifestContentAssistProcessor.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/text/BundleManifestContentAssistProcessor.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors.text;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/text/BundleTypeCompletionProposal.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/text/BundleTypeCompletionProposal.java
index 25cac16..0809347 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/text/BundleTypeCompletionProposal.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/text/BundleTypeCompletionProposal.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2010 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors.text;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/text/ISpringColorConstants.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/text/ISpringColorConstants.java
index 0f31d97..84a1477 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/text/ISpringColorConstants.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/text/ISpringColorConstants.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors.text;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/text/JFaceAbstractInformationControl.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/text/JFaceAbstractInformationControl.java
index 0ac9cd9..e3056ac 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/text/JFaceAbstractInformationControl.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/text/JFaceAbstractInformationControl.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors.text;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/text/JFaceDefaultInformationControl.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/text/JFaceDefaultInformationControl.java
index e39f8bd..305d0dc 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/text/JFaceDefaultInformationControl.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/text/JFaceDefaultInformationControl.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors.text;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/text/JFaceIInformationControlExtension5.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/text/JFaceIInformationControlExtension5.java
index ce3dcaf..635f39f 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/text/JFaceIInformationControlExtension5.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/editors/text/JFaceIInformationControlExtension5.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.editors.text;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/internal/actions/AbstractConvertAction.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/internal/actions/AbstractConvertAction.java
index 15a9a69..5b47b7d 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/internal/actions/AbstractConvertAction.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/internal/actions/AbstractConvertAction.java
@@ -1,3 +1,12 @@
+/*********************************************************************
+ * Copyright (c) 2015 GianMaria Romanato
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.internal.actions;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/internal/actions/ConvertPDE2VirgoProject.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/internal/actions/ConvertPDE2VirgoProject.java
index dce102e..7844d60 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/internal/actions/ConvertPDE2VirgoProject.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/internal/actions/ConvertPDE2VirgoProject.java
@@ -1,3 +1,12 @@
+/*********************************************************************
+ * Copyright (c) 2015 GianMaria Romanato
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.internal.actions;
 
@@ -66,8 +75,8 @@
 
     @Override
     protected boolean showConfirmationDialog() {
-        MessageDialog dlg = new MessageDialog(this.part.getSite().getShell(), Messages.ConvertPDE2VirgoProject_title, null, "", MessageDialog.QUESTION, //$NON-NLS-2$
-            new String[] { IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL }, 0) {
+        MessageDialog dlg = new MessageDialog(this.part.getSite().getShell(), Messages.ConvertPDE2VirgoProject_title, null, "",
+            MessageDialog.QUESTION, new String[] { IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL }, 0) {
 
             @Override
             protected Control createMessageArea(Composite composite) {
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/internal/actions/ConvertPlugInProject.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/internal/actions/ConvertPlugInProject.java
index 3060f10..be40db3 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/internal/actions/ConvertPlugInProject.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/internal/actions/ConvertPlugInProject.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- *  Copyright (c) 2016 GianMaria Romanato
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2016 GianMaria Romanato
  *
- *  Contributors:
- *     GianMaria Romanato - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.internal.actions;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/internal/actions/ConvertToBundleProject.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/internal/actions/ConvertToBundleProject.java
index 0d04fd7..2b3ac1a 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/internal/actions/ConvertToBundleProject.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/internal/actions/ConvertToBundleProject.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.internal.actions;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/internal/actions/ConvertToPlanProject.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/internal/actions/ConvertToPlanProject.java
index 56d848b..ea64c43 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/internal/actions/ConvertToPlanProject.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/internal/actions/ConvertToPlanProject.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2010 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2010 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.internal.actions;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/internal/actions/ManifestFormatAction.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/internal/actions/ManifestFormatAction.java
index 9d17de1..ebddf5e 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/internal/actions/ManifestFormatAction.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/internal/actions/ManifestFormatAction.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.internal.actions;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/internal/actions/ManifestFormatOperation.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/internal/actions/ManifestFormatOperation.java
index d6a3ece..63be72e 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/internal/actions/ManifestFormatOperation.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/internal/actions/ManifestFormatOperation.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.internal.actions;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/internal/actions/Messages.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/internal/actions/Messages.java
index 47d1e03..18dd9aa 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/internal/actions/Messages.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/internal/actions/Messages.java
@@ -1,3 +1,12 @@
+/*********************************************************************
+ * Copyright (c) 2015 GianMaria Romanato
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.internal.actions;
 
@@ -10,6 +19,7 @@
     public static String ConvertPDE2VirgoProject_message;
 
     public static String ConvertPDE2VirgoProject_title;
+
     public static String ConvertPlugInProject_message;
 
     public static String ConvertPlugInProject_title;
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/AbstractPropertiesPage.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/AbstractPropertiesPage.java
index 8541573..5dcbd65 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/AbstractPropertiesPage.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/AbstractPropertiesPage.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.wizards;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/Messages.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/Messages.java
index 3006a53..df7a310 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/Messages.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/Messages.java
@@ -1,3 +1,12 @@
+/*********************************************************************
+ * Copyright (c) 2015 GianMaria Romanato
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.wizards;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewBundleInformationPage.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewBundleInformationPage.java
index c55ee70..6dcdf5a 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewBundleInformationPage.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewBundleInformationPage.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2011 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.wizards;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewBundleProjectCreationPage.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewBundleProjectCreationPage.java
index 7e8d7a1..4234a70 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewBundleProjectCreationPage.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewBundleProjectCreationPage.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.wizards;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewBundleProjectSettingsPage.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewBundleProjectSettingsPage.java
index 37006b9..76d64f4 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewBundleProjectSettingsPage.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewBundleProjectSettingsPage.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.wizards;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewBundleProjectWizard.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewBundleProjectWizard.java
index 068b0c2..21e9c92 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewBundleProjectWizard.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewBundleProjectWizard.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2011 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.wizards;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewPDEProjectContentWizard.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewPDEProjectContentWizard.java
index 17400e0..aaae2d0 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewPDEProjectContentWizard.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewPDEProjectContentWizard.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- *  Copyright (c) 2015 GianMaria Romanato
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2015 GianMaria Romanato
  *
- *  Contributors:
- *     GianMaria Romanato - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.wizards;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewPDEProjectWABPage.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewPDEProjectWABPage.java
index f5c0827..cf2491d 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewPDEProjectWABPage.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewPDEProjectWABPage.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- *  Copyright (c) 2015 GianMaria Romanato
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2015 GianMaria Romanato
  *
- *  Contributors:
- *     GianMaria Romanato - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.wizards;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewPDEProjectWizard.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewPDEProjectWizard.java
index 964f9d3..f3b0886 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewPDEProjectWizard.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewPDEProjectWizard.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- *  Copyright (c) 2015 GianMaria Romanato
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2015 GianMaria Romanato
  *
- *  Contributors:
- *     GianMaria Romanato - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.wizards;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewParInformationPage.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewParInformationPage.java
index 087d977..b85e1ea 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewParInformationPage.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewParInformationPage.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.wizards;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewParProjectReferencePage.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewParProjectReferencePage.java
index 987619e..7fb8605 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewParProjectReferencePage.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewParProjectReferencePage.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.wizards;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewParProjectSettingsPage.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewParProjectSettingsPage.java
index 3f10f4f..7768af9 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewParProjectSettingsPage.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewParProjectSettingsPage.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.wizards;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewParProjectWizard.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewParProjectWizard.java
index d735b32..d481979 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewParProjectWizard.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewParProjectWizard.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.wizards;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewPlanProjectFilePage.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewPlanProjectFilePage.java
index e791667..acd8ef1 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewPlanProjectFilePage.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewPlanProjectFilePage.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- *  Copyright (c) 2015 GianMaria Romanato
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2015 GianMaria Romanato
  *
- *  Contributors:
- *     GianMaria Romanato - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.wizards;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewPlanProjectWizard.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewPlanProjectWizard.java
index 59ee936..9da7271 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewPlanProjectWizard.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NewPlanProjectWizard.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- *  Copyright (c) 2016 GianMaria Romanato
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2016 GianMaria Romanato
  *
- *  Contributors:
- *     GianMaria Romanato - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.wizards;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NullPropertiesPage.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NullPropertiesPage.java
index 49bd930..90c702c 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NullPropertiesPage.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/NullPropertiesPage.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.wizards;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/ProjectContentPageStrings.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/ProjectContentPageStrings.java
index ae3042e..1dc8402 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/ProjectContentPageStrings.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/ProjectContentPageStrings.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2012 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.wizards;
 
diff --git a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/WebModulePropertiesPage.java b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/WebModulePropertiesPage.java
index 1e18f5b..189eba2 100644
--- a/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/WebModulePropertiesPage.java
+++ b/org.eclipse.virgo.ide.ui/src/org/eclipse/virgo/ide/ui/wizards/WebModulePropertiesPage.java
@@ -1,13 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 SpringSource, a divison of VMware, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2009, 2011 SpringSource, a division of VMware, Inc.
  *
- * Contributors:
- *     SpringSource, a division of VMware, Inc. - initial API and implementation
- *******************************************************************************/
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 
 package org.eclipse.virgo.ide.ui.wizards;
 
diff --git a/org.eclipse.virgo.ide/about.html b/org.eclipse.virgo.ide/about.html
index 2abb573..164f781 100644
--- a/org.eclipse.virgo.ide/about.html
+++ b/org.eclipse.virgo.ide/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>April 13, 2012</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.virgo.ide/about.properties b/org.eclipse.virgo.ide/about.properties
index 0a175f9..1244a81 100644
--- a/org.eclipse.virgo.ide/about.properties
+++ b/org.eclipse.virgo.ide/about.properties
@@ -8,7 +8,9 @@
 \n\
 Version: {featureVersion}\n\
 \n\
-Copyright (c) 2008 - 2012 SpringSource, a division of VMware, Inc.\n\
+Copyright (c) 2008 - 2015 SpringSource, a division of VMware, Inc.\n\
+Copyright (c) 2015 - 2018 GianMaria Romanato\n\
+
 Visit http://eclipse.org/virgo\n\
 \n\
 This product includes software developed by the\n\
diff --git a/org.eclipse.virgo.ide/build.properties b/org.eclipse.virgo.ide/build.properties
index b6d2484..43e6ea2 100644
--- a/org.eclipse.virgo.ide/build.properties
+++ b/org.eclipse.virgo.ide/build.properties
@@ -5,11 +5,11 @@
                about.properties,\
                about.ini,\
                feature.png,\
-               epl-v10.html,\
+               epl-v20.html,\
                build.properties,\
                about.html
 src.includes = feature.png,\
                about.properties,\
                about.ini,\
-               epl-v10.html,\
+               epl-v20.html,\
                about.html
diff --git a/org.eclipse.virgo.ide/epl-v10.html b/org.eclipse.virgo.ide/epl-v10.html
deleted file mode 100644
index 90f2d5e..0000000
--- a/org.eclipse.virgo.ide/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"

-xmlns:w="urn:schemas-microsoft-com:office:word"

-xmlns="http://www.w3.org/TR/REC-html40">

-

-<head>

-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">

-<meta name=ProgId content=Word.Document>

-<meta name=Generator content="Microsoft Word 9">

-<meta name=Originator content="Microsoft Word 9">

-<link rel=File-List

-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<!--[if gte mso 9]><xml>

- <o:DocumentProperties>

-  <o:Revision>2</o:Revision>

-  <o:TotalTime>3</o:TotalTime>

-  <o:Created>2004-03-05T23:03:00Z</o:Created>

-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>

-  <o:Pages>4</o:Pages>

-  <o:Words>1626</o:Words>

-  <o:Characters>9270</o:Characters>

-   <o:Lines>77</o:Lines>

-  <o:Paragraphs>18</o:Paragraphs>

-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>

-  <o:Version>9.4402</o:Version>

- </o:DocumentProperties>

-</xml><![endif]--><!--[if gte mso 9]><xml>

- <w:WordDocument>

-  <w:TrackRevisions/>

- </w:WordDocument>

-</xml><![endif]-->

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{font-family:Tahoma;

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-generic-font-family:swiss;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	font-family:Tahoma;

-	mso-fareast-font-family:"Times New Roman";}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head>

-

-<body lang=EN-US style='tab-interval:.5in'>

-

-<div class=Section1>

-

-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>

-

-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear=left>

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)

-changes to the Program, and</span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)

-additions to the Program;</span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span

-style='color:red'> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>

-

-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)

-its license agreement:</span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>

-

-<p><span style='font-size:10.0pt'>When the Program is made available in source

-code form:</span> </p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)

-it must be made available under this Agreement; and </span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style='font-size:10.0pt'>Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor (&quot;Commercial

-Contributor&quot;) hereby agrees to defend and indemnify every other

-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and

-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style='font-size:10.0pt'>For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>

-

-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>

-

-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-

-</div>

-

-</body>

-

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