diff --git a/m2e-core-tests b/m2e-core-tests
index fb4aad3107..8a06b65bc0 160000
--- a/m2e-core-tests
+++ b/m2e-core-tests
@@ -1 +1 @@
-Subproject commit fb4aad31074c786ec87ba749a15234805d251620
+Subproject commit 8a06b65bc0465dfacc31968fd415dc4071698821
diff --git a/org.eclipse.m2e.apt.core/META-INF/MANIFEST.MF b/org.eclipse.m2e.apt.core/META-INF/MANIFEST.MF
index ea4d6ca75a..6c9953961b 100644
--- a/org.eclipse.m2e.apt.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.apt.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.m2e.apt.core;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.1.qualifier
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
diff --git a/org.eclipse.m2e.apt.core/about.html b/org.eclipse.m2e.apt.core/about.html
index 70e4b67c8f..d4e5cea3da 100644
--- a/org.eclipse.m2e.apt.core/about.html
+++ b/org.eclipse.m2e.apt.core/about.html
@@ -9,20 +9,50 @@
 <h2>About This Content</h2>
  
 <p>October 29, 2010</p>	
-<h3>License</h3>
+	<h3>License</h3>
 
-<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>
+		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>
+	<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>
 
+<h3>Third Party Content</h3>
+
+<p>
+The Content includes items that have been sourced from third parties as set out below. If you 
+did not receive this Content directly from the Eclipse Foundation, the following is provided 
+for informational purposes only, and you should look to the Redistributor&rsquo;s license for 
+terms and conditions of use.
+</p>
+
+<h4>Maven Core 3.0.4 (Derivative work)</h4>
+<p>
+This software is based in part on the work of The Apache Software Foundation on the Maven Core project.</p>
+<p>The class org.eclipse.m2e.core.internal.project.conversion.ProjectConversionParticipantSorter is based on the following class from Maven Core :</p>
+<ul>
+<li>org.apache.maven.project.ProjectSorter</li>
+</ul>
+<p>
+Your use of Maven Core in source or binary code form is subject to the terms and conditions of the 
+The Apache Software License, Version 2.0 (&quot;ASL&quot;).  
+A copy of the ASL is available at <a href="http://maven.apache.org/license.html">http://maven.apache.org/license.html</a>.
+(a local copy can be found <a href="about_files/LICENSE-2.0.txt">here</a>)
+</p>
 </body>
 </html>
diff --git a/org.eclipse.m2e.apt.core/plugin.xml b/org.eclipse.m2e.apt.core/plugin.xml
index b58bedfc83..281ee56621 100644
--- a/org.eclipse.m2e.apt.core/plugin.xml
+++ b/org.eclipse.m2e.apt.core/plugin.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright (c) 2011 Knowledge Computing Corp.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Public License v1.0
-  which accompanies this distribution, and is available at
-  http://www.eclipse.org/legal/epl-v10.html
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
 -->
 <?eclipse version="3.2"?>
 <plugin>
diff --git a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/MavenJdtAptPlugin.java b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/MavenJdtAptPlugin.java
index 19f62022f2..d6e064b32e 100644
--- a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/MavenJdtAptPlugin.java
+++ b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/MavenJdtAptPlugin.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2011 Knowledge Computing Corp.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *    Karl M. Davis (Knowledge Computing Corp.) - initial API and implementation
diff --git a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/AbstractAptConfiguratorDelegate.java b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/AbstractAptConfiguratorDelegate.java
index 20bf30dcbe..6d24421281 100644
--- a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/AbstractAptConfiguratorDelegate.java
+++ b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/AbstractAptConfiguratorDelegate.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2012-2022 Red Hat, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *      Red Hat, Inc. - initial API and implementation
diff --git a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/AbstractAptProjectConfigurator.java b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/AbstractAptProjectConfigurator.java
index 261c3ce13d..79a6f7b76d 100644
--- a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/AbstractAptProjectConfigurator.java
+++ b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/AbstractAptProjectConfigurator.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2011-2014 Knowledge Computing Corp. and others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *    Karl M. Davis (Knowledge Computing Corp.) - initial API and implementation
diff --git a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/AnnotationProcessorConfiguration.java b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/AnnotationProcessorConfiguration.java
index 02000c0627..17fdd0ac54 100644
--- a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/AnnotationProcessorConfiguration.java
+++ b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/AnnotationProcessorConfiguration.java
@@ -1,9 +1,12 @@
 /*************************************************************************************
  * Copyright (c) 2008-2016 Red Hat, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Red Hat, Inc - Initial implementation.
diff --git a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/AptConfiguratorDelegate.java b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/AptConfiguratorDelegate.java
index e46fb66631..067d19068d 100644
--- a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/AptConfiguratorDelegate.java
+++ b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/AptConfiguratorDelegate.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2012 Red Hat, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *      Red Hat, Inc. - initial API and implementation
diff --git a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/DefaultAnnotationProcessorConfiguration.java b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/DefaultAnnotationProcessorConfiguration.java
index cd3339039e..b624d15040 100644
--- a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/DefaultAnnotationProcessorConfiguration.java
+++ b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/DefaultAnnotationProcessorConfiguration.java
@@ -1,9 +1,12 @@
 /*************************************************************************************
  * Copyright (c) 2008-2016 Red Hat, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Red Hat, Inc. - Initial implementation.
diff --git a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/IMavenAptConstants.java b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/IMavenAptConstants.java
index 8a487c7d2a..3dc2baf3e4 100644
--- a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/IMavenAptConstants.java
+++ b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/IMavenAptConstants.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2014 Red Hat, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *      Red Hat, Inc. - initial API and implementation
diff --git a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/Messages.java b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/Messages.java
index 57260845de..a8cd9b29af 100644
--- a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/Messages.java
+++ b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/Messages.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2013 Red Hat, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *      Red Hat, Inc. - initial API and implementation
diff --git a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/NoOpDelegate.java b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/NoOpDelegate.java
index 21c86a2c00..146025f7ec 100644
--- a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/NoOpDelegate.java
+++ b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/NoOpDelegate.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2012 Red Hat, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *      Red Hat, Inc. - initial API and implementation
diff --git a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/compiler/MavenCompilerAptProjectConfigurator.java b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/compiler/MavenCompilerAptProjectConfigurator.java
index 3ada0623d9..c9f70b457f 100644
--- a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/compiler/MavenCompilerAptProjectConfigurator.java
+++ b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/compiler/MavenCompilerAptProjectConfigurator.java
@@ -1,9 +1,12 @@
 /*************************************************************************************
  * Copyright (c) 2008-2012 Red Hat, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     JBoss by Red Hat - Initial implementation.
diff --git a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/compiler/MavenCompilerBuildParticipant.java b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/compiler/MavenCompilerBuildParticipant.java
index 6085167927..e538dd80e0 100644
--- a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/compiler/MavenCompilerBuildParticipant.java
+++ b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/compiler/MavenCompilerBuildParticipant.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2022 eBusiness Information, Excilys Group and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *      eBusiness Information, Excilys Group - initial API and implementation
diff --git a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/compiler/MavenCompilerExecutionDelegate.java b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/compiler/MavenCompilerExecutionDelegate.java
index e1dd24feb3..969c6cd106 100644
--- a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/compiler/MavenCompilerExecutionDelegate.java
+++ b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/compiler/MavenCompilerExecutionDelegate.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2012-2019 Red Hat, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *      Red Hat, Inc. - initial API and implementation
diff --git a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/compiler/MavenCompilerJdtAptDelegate.java b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/compiler/MavenCompilerJdtAptDelegate.java
index c3e5a40f55..c3ce615ac3 100644
--- a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/compiler/MavenCompilerJdtAptDelegate.java
+++ b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/compiler/MavenCompilerJdtAptDelegate.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2012-2019 Red Hat, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *      Red Hat, Inc. - initial API and implementation
diff --git a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/preferences/AnnotationProcessingPreferenceInitializer.java b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/preferences/AnnotationProcessingPreferenceInitializer.java
index 8708e075f5..5b2aa2a05e 100644
--- a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/preferences/AnnotationProcessingPreferenceInitializer.java
+++ b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/preferences/AnnotationProcessingPreferenceInitializer.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2008 Sonatype, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
 package org.eclipse.m2e.apt.internal.preferences;
diff --git a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/preferences/PreferencesManager.java b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/preferences/PreferencesManager.java
index 24f33d69b1..5aa3d54d41 100644
--- a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/preferences/PreferencesManager.java
+++ b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/preferences/PreferencesManager.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2012-2019 Red Hat, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *      Red Hat, Inc. - initial API and implementation
diff --git a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/processor/MavenProcessorAptProjectConfigurator.java b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/processor/MavenProcessorAptProjectConfigurator.java
index 2ac3da38fc..da73ea9c7a 100644
--- a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/processor/MavenProcessorAptProjectConfigurator.java
+++ b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/processor/MavenProcessorAptProjectConfigurator.java
@@ -1,9 +1,12 @@
 /*************************************************************************************
  * Copyright (c) 2008-2012 Red Hat, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Red Hat, Inc. - Initial implementation.
diff --git a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/processor/MavenProcessorBuildParticipant.java b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/processor/MavenProcessorBuildParticipant.java
index b7924f4c6a..1fb85d881d 100644
--- a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/processor/MavenProcessorBuildParticipant.java
+++ b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/processor/MavenProcessorBuildParticipant.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2022 eBusiness Information, Excilys Group and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *      eBusiness Information, Excilys Group - initial API and implementation
diff --git a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/processor/MavenProcessorExecutionDelegate.java b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/processor/MavenProcessorExecutionDelegate.java
index 69a1a7c2ce..26492968d2 100644
--- a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/processor/MavenProcessorExecutionDelegate.java
+++ b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/processor/MavenProcessorExecutionDelegate.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2012-2018 Red Hat, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *      Red Hat, Inc. - initial API and implementation
diff --git a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/processor/MavenProcessorJdtAptDelegate.java b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/processor/MavenProcessorJdtAptDelegate.java
index 546185f83a..bcd9d4d8f2 100644
--- a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/processor/MavenProcessorJdtAptDelegate.java
+++ b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/processor/MavenProcessorJdtAptDelegate.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2012-2018 Red Hat, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *      Red Hat, Inc. - initial API and implementation
diff --git a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/utils/AnnotationServiceLocator.java b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/utils/AnnotationServiceLocator.java
index 82fc4d636d..cbb69b9264 100644
--- a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/utils/AnnotationServiceLocator.java
+++ b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/utils/AnnotationServiceLocator.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2011 Knowledge Computing Corp.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *    Karl M. Davis (Knowledge Computing Corp.) - initial API and implementation
diff --git a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/utils/PluginDependencyResolver.java b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/utils/PluginDependencyResolver.java
index 161cccbebf..66ccad36a8 100644
--- a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/utils/PluginDependencyResolver.java
+++ b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/utils/PluginDependencyResolver.java
@@ -1,9 +1,12 @@
 /*************************************************************************************
  * Copyright (c) 2008-2019 Red Hat, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Red Hat, Inc. - Initial implementation.
diff --git a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/utils/ProjectUtils.java b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/utils/ProjectUtils.java
index 3c6e539f6b..2aec80f63b 100644
--- a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/utils/ProjectUtils.java
+++ b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/internal/utils/ProjectUtils.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2012-2019 Red Hat, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *      Red Hat, Inc. - initial API and implementation
diff --git a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/preferences/AnnotationProcessingMode.java b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/preferences/AnnotationProcessingMode.java
index 00a7fa0c5c..42dd3dc838 100644
--- a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/preferences/AnnotationProcessingMode.java
+++ b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/preferences/AnnotationProcessingMode.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2012 Red Hat, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *      Red Hat, Inc. - initial API and implementation
diff --git a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/preferences/IPreferencesManager.java b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/preferences/IPreferencesManager.java
index ab2ae9465e..6b868482e7 100644
--- a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/preferences/IPreferencesManager.java
+++ b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/preferences/IPreferencesManager.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2012-2014 Red Hat, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *      Red Hat, Inc. - initial API and implementation
diff --git a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/preferences/PreferencesConstants.java b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/preferences/PreferencesConstants.java
index 45578bef85..10ea00f90a 100644
--- a/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/preferences/PreferencesConstants.java
+++ b/org.eclipse.m2e.apt.core/src/org/eclipse/m2e/apt/preferences/PreferencesConstants.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2012 Red Hat, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *      Red Hat, Inc. - initial API and implementation
diff --git a/org.eclipse.m2e.apt.tests/about.html b/org.eclipse.m2e.apt.tests/about.html
new file mode 100644
index 0000000000..d4e5cea3da
--- /dev/null
+++ b/org.eclipse.m2e.apt.tests/about.html
@@ -0,0 +1,58 @@
+<!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"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>October 29, 2010</p>	
+	<h3>License</h3>
+
+	<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>
+
+<h3>Third Party Content</h3>
+
+<p>
+The Content includes items that have been sourced from third parties as set out below. If you 
+did not receive this Content directly from the Eclipse Foundation, the following is provided 
+for informational purposes only, and you should look to the Redistributor&rsquo;s license for 
+terms and conditions of use.
+</p>
+
+<h4>Maven Core 3.0.4 (Derivative work)</h4>
+<p>
+This software is based in part on the work of The Apache Software Foundation on the Maven Core project.</p>
+<p>The class org.eclipse.m2e.core.internal.project.conversion.ProjectConversionParticipantSorter is based on the following class from Maven Core :</p>
+<ul>
+<li>org.apache.maven.project.ProjectSorter</li>
+</ul>
+<p>
+Your use of Maven Core in source or binary code form is subject to the terms and conditions of the 
+The Apache Software License, Version 2.0 (&quot;ASL&quot;).  
+A copy of the ASL is available at <a href="http://maven.apache.org/license.html">http://maven.apache.org/license.html</a>.
+(a local copy can be found <a href="about_files/LICENSE-2.0.txt">here</a>)
+</p>
+</body>
+</html>
diff --git a/org.eclipse.m2e.apt.tests/src/org/eclipse/m2e/apt/tests/AbstractM2eAptProjectConfiguratorTestCase.java b/org.eclipse.m2e.apt.tests/src/org/eclipse/m2e/apt/tests/AbstractM2eAptProjectConfiguratorTestCase.java
index aa7b19daba..a1f3b19e76 100644
--- a/org.eclipse.m2e.apt.tests/src/org/eclipse/m2e/apt/tests/AbstractM2eAptProjectConfiguratorTestCase.java
+++ b/org.eclipse.m2e.apt.tests/src/org/eclipse/m2e/apt/tests/AbstractM2eAptProjectConfiguratorTestCase.java
@@ -1,9 +1,12 @@
 /*************************************************************************************
  * Copyright (c) 2012-2018 Red Hat, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Red Hat, Inc - Initial implementation.
diff --git a/org.eclipse.m2e.apt.tests/src/org/eclipse/m2e/apt/tests/M2eAptProjectconfiguratorTest.java b/org.eclipse.m2e.apt.tests/src/org/eclipse/m2e/apt/tests/M2eAptProjectconfiguratorTest.java
index 3ccb21e543..646d919662 100644
--- a/org.eclipse.m2e.apt.tests/src/org/eclipse/m2e/apt/tests/M2eAptProjectconfiguratorTest.java
+++ b/org.eclipse.m2e.apt.tests/src/org/eclipse/m2e/apt/tests/M2eAptProjectconfiguratorTest.java
@@ -1,9 +1,12 @@
 /*************************************************************************************
  * Copyright (c) 2012-2018 Red Hat, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Red Hat, Inc - Initial implementation.
diff --git a/org.eclipse.m2e.apt.ui/about.html b/org.eclipse.m2e.apt.ui/about.html
index 70e4b67c8f..d4e5cea3da 100644
--- a/org.eclipse.m2e.apt.ui/about.html
+++ b/org.eclipse.m2e.apt.ui/about.html
@@ -9,20 +9,50 @@
 <h2>About This Content</h2>
  
 <p>October 29, 2010</p>	
-<h3>License</h3>
+	<h3>License</h3>
 
-<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>
+		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>
+	<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>
 
+<h3>Third Party Content</h3>
+
+<p>
+The Content includes items that have been sourced from third parties as set out below. If you 
+did not receive this Content directly from the Eclipse Foundation, the following is provided 
+for informational purposes only, and you should look to the Redistributor&rsquo;s license for 
+terms and conditions of use.
+</p>
+
+<h4>Maven Core 3.0.4 (Derivative work)</h4>
+<p>
+This software is based in part on the work of The Apache Software Foundation on the Maven Core project.</p>
+<p>The class org.eclipse.m2e.core.internal.project.conversion.ProjectConversionParticipantSorter is based on the following class from Maven Core :</p>
+<ul>
+<li>org.apache.maven.project.ProjectSorter</li>
+</ul>
+<p>
+Your use of Maven Core in source or binary code form is subject to the terms and conditions of the 
+The Apache Software License, Version 2.0 (&quot;ASL&quot;).  
+A copy of the ASL is available at <a href="http://maven.apache.org/license.html">http://maven.apache.org/license.html</a>.
+(a local copy can be found <a href="about_files/LICENSE-2.0.txt">here</a>)
+</p>
 </body>
 </html>
diff --git a/org.eclipse.m2e.apt.ui/src/org/eclipse/m2e/apt/ui/preferences/AnnotationProcessingSettingsPage.java b/org.eclipse.m2e.apt.ui/src/org/eclipse/m2e/apt/ui/preferences/AnnotationProcessingSettingsPage.java
index a7f0c8d10f..cba23e8832 100644
--- a/org.eclipse.m2e.apt.ui/src/org/eclipse/m2e/apt/ui/preferences/AnnotationProcessingSettingsPage.java
+++ b/org.eclipse.m2e.apt.ui/src/org/eclipse/m2e/apt/ui/preferences/AnnotationProcessingSettingsPage.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2012-2014 Red Hat, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *      Red Hat, Inc. - initial API and implementation
diff --git a/org.eclipse.m2e.apt.ui/src/org/eclipse/m2e/apt/ui/preferences/PreferenceMessages.java b/org.eclipse.m2e.apt.ui/src/org/eclipse/m2e/apt/ui/preferences/PreferenceMessages.java
index 1545689d2f..139b0efb16 100644
--- a/org.eclipse.m2e.apt.ui/src/org/eclipse/m2e/apt/ui/preferences/PreferenceMessages.java
+++ b/org.eclipse.m2e.apt.ui/src/org/eclipse/m2e/apt/ui/preferences/PreferenceMessages.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2012 Red Hat, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *      Red Hat, Inc. - initial API and implementation
diff --git a/org.eclipse.m2e.apt.ui/src/org/eclipse/m2e/apt/ui/preferences/xpl/DialogField.java b/org.eclipse.m2e.apt.ui/src/org/eclipse/m2e/apt/ui/preferences/xpl/DialogField.java
index fbe1d9dd26..eaddc26ac6 100644
--- a/org.eclipse.m2e.apt.ui/src/org/eclipse/m2e/apt/ui/preferences/xpl/DialogField.java
+++ b/org.eclipse.m2e.apt.ui/src/org/eclipse/m2e/apt/ui/preferences/xpl/DialogField.java
@@ -1,9 +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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/org.eclipse.m2e.apt.ui/src/org/eclipse/m2e/apt/ui/preferences/xpl/IDialogFieldListener.java b/org.eclipse.m2e.apt.ui/src/org/eclipse/m2e/apt/ui/preferences/xpl/IDialogFieldListener.java
index 2ffb732937..f46f9ebaf3 100644
--- a/org.eclipse.m2e.apt.ui/src/org/eclipse/m2e/apt/ui/preferences/xpl/IDialogFieldListener.java
+++ b/org.eclipse.m2e.apt.ui/src/org/eclipse/m2e/apt/ui/preferences/xpl/IDialogFieldListener.java
@@ -1,9 +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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/org.eclipse.m2e.apt.ui/src/org/eclipse/m2e/apt/ui/preferences/xpl/LayoutUtil.java b/org.eclipse.m2e.apt.ui/src/org/eclipse/m2e/apt/ui/preferences/xpl/LayoutUtil.java
index d6dab26b0f..6fdb7c13fb 100644
--- a/org.eclipse.m2e.apt.ui/src/org/eclipse/m2e/apt/ui/preferences/xpl/LayoutUtil.java
+++ b/org.eclipse.m2e.apt.ui/src/org/eclipse/m2e/apt/ui/preferences/xpl/LayoutUtil.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/org.eclipse.m2e.apt.ui/src/org/eclipse/m2e/apt/ui/preferences/xpl/PropertyAndPreferencePage.java b/org.eclipse.m2e.apt.ui/src/org/eclipse/m2e/apt/ui/preferences/xpl/PropertyAndPreferencePage.java
index ecba0b151e..5a589a1d6e 100644
--- a/org.eclipse.m2e.apt.ui/src/org/eclipse/m2e/apt/ui/preferences/xpl/PropertyAndPreferencePage.java
+++ b/org.eclipse.m2e.apt.ui/src/org/eclipse/m2e/apt/ui/preferences/xpl/PropertyAndPreferencePage.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2011 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/org.eclipse.m2e.apt.ui/src/org/eclipse/m2e/apt/ui/preferences/xpl/StatusInfo.java b/org.eclipse.m2e.apt.ui/src/org/eclipse/m2e/apt/ui/preferences/xpl/StatusInfo.java
index 33bd343c27..d0edbb9795 100644
--- a/org.eclipse.m2e.apt.ui/src/org/eclipse/m2e/apt/ui/preferences/xpl/StatusInfo.java
+++ b/org.eclipse.m2e.apt.ui/src/org/eclipse/m2e/apt/ui/preferences/xpl/StatusInfo.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2011 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/org.eclipse.m2e.apt.ui/src/org/eclipse/m2e/apt/ui/preferences/xpl/StatusUtil.java b/org.eclipse.m2e.apt.ui/src/org/eclipse/m2e/apt/ui/preferences/xpl/StatusUtil.java
index 881a3eb012..4fd971f336 100644
--- a/org.eclipse.m2e.apt.ui/src/org/eclipse/m2e/apt/ui/preferences/xpl/StatusUtil.java
+++ b/org.eclipse.m2e.apt.ui/src/org/eclipse/m2e/apt/ui/preferences/xpl/StatusUtil.java
@@ -1,9 +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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF
index 110e1e409f..d8f059ec14 100644
--- a/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.m2e.core.ui;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.1.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/archetype/MavenArchetype.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/archetype/MavenArchetype.java
index 2ba1e01393..b9fc202971 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/archetype/MavenArchetype.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/archetype/MavenArchetype.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2022 Christoph Läubrich
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/embedder/IComponentLookup.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/embedder/IComponentLookup.java
index d81399a80c..6fa6360ce1 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/embedder/IComponentLookup.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/embedder/IComponentLookup.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2022 Christoph Läubrich
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/embedder/IMavenExecutableLocation.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/embedder/IMavenExecutableLocation.java
index df5020892c..c003b5c42b 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/embedder/IMavenExecutableLocation.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/embedder/IMavenExecutableLocation.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2022 Christoph Läubrich
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/embedder/MonitorExecutionListener.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/embedder/MonitorExecutionListener.java
index 3735b5e78b..adb21e3ee4 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/embedder/MonitorExecutionListener.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/embedder/MonitorExecutionListener.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2022 Christoph Läubrich and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/IMavenToolbox.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/IMavenToolbox.java
index 46ef94b02b..c589b91b1d 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/IMavenToolbox.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/IMavenToolbox.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2022 Christoph Läubrich.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/PlexusContainerManager.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/PlexusContainerManager.java
index 24c0a3c54a..4410810d98 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/PlexusContainerManager.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/PlexusContainerManager.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2022 Christoph Läubrich and others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/launch/IMavenLauncher.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/launch/IMavenLauncher.java
index 60e29938c6..9e0901b1cf 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/launch/IMavenLauncher.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/launch/IMavenLauncher.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2022 Christoph Läubrich
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/PomFacadeAdapterFactory.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/PomFacadeAdapterFactory.java
index 9ab1af0ed9..5f8844bc40 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/PomFacadeAdapterFactory.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/PomFacadeAdapterFactory.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2022 Christoph Läubrich
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/ProjectProcessingTracker.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/ProjectProcessingTracker.java
index b6595f8b98..6f2291d48b 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/ProjectProcessingTracker.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/ProjectProcessingTracker.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2022 Christoph Läubrich and others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/ResourcePomFacade.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/ResourcePomFacade.java
index e804e4c873..93d413d576 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/ResourcePomFacade.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/ResourcePomFacade.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2022 Christoph Läubrich
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/project/IArchetype.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/project/IArchetype.java
index fae463489a..200e8541f9 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/project/IArchetype.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/project/IArchetype.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2022 Christoph Läubrich
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
diff --git a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/internal/markers/OpenManagedVersionDefinitionResolution.java b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/internal/markers/OpenManagedVersionDefinitionResolution.java
index dde6500a5f..793fe62529 100644
--- a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/internal/markers/OpenManagedVersionDefinitionResolution.java
+++ b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/internal/markers/OpenManagedVersionDefinitionResolution.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2020 Till Brychcy and others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *      Till Brychcy - initial API and implementation
diff --git a/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/EclipseMavenLauncher.java b/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/EclipseMavenLauncher.java
index 974e519220..a2c201df8e 100644
--- a/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/EclipseMavenLauncher.java
+++ b/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/EclipseMavenLauncher.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) Christoph Läubrich
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
diff --git a/org.eclipse.m2e.pde.connector/META-INF/MANIFEST.MF b/org.eclipse.m2e.pde.connector/META-INF/MANIFEST.MF
index 49c21dcd69..b391b693ce 100644
--- a/org.eclipse.m2e.pde.connector/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.pde.connector/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: M2E PDE Connector
 Bundle-SymbolicName: org.eclipse.m2e.pde.connector;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.1.qualifier
 Automatic-Module-Name: org.eclipse.m2e.pde.connector
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-Vendor: Eclipse.org - m2e
diff --git a/org.eclipse.m2e.pde.connector/lifecycle-mapping-metadata.xml b/org.eclipse.m2e.pde.connector/lifecycle-mapping-metadata.xml
index 3a4fa8308e..dff31e9b33 100644
--- a/org.eclipse.m2e.pde.connector/lifecycle-mapping-metadata.xml
+++ b/org.eclipse.m2e.pde.connector/lifecycle-mapping-metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright (c) 2008 Sonatype, Inc.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Public License v1.0
-  which accompanies this distribution, and is available at
-  http://www.eclipse.org/legal/epl-v10.html
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
 -->
 
 <lifecycleMappingMetadata>
diff --git a/org.eclipse.m2e.pde.connector/src/org/eclipse/m2e/pde/connector/PDEMavenBundlePluginConfigurator.java b/org.eclipse.m2e.pde.connector/src/org/eclipse/m2e/pde/connector/PDEMavenBundlePluginConfigurator.java
index 0780738d42..111505b23a 100644
--- a/org.eclipse.m2e.pde.connector/src/org/eclipse/m2e/pde/connector/PDEMavenBundlePluginConfigurator.java
+++ b/org.eclipse.m2e.pde.connector/src/org/eclipse/m2e/pde/connector/PDEMavenBundlePluginConfigurator.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2022 Sonatype, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 package org.eclipse.m2e.pde.connector;
 
diff --git a/org.eclipse.m2e.pde.connector/src/org/eclipse/m2e/pde/connector/PDEProjectHelper.java b/org.eclipse.m2e.pde.connector/src/org/eclipse/m2e/pde/connector/PDEProjectHelper.java
index 4af089052c..4a6e650532 100644
--- a/org.eclipse.m2e.pde.connector/src/org/eclipse/m2e/pde/connector/PDEProjectHelper.java
+++ b/org.eclipse.m2e.pde.connector/src/org/eclipse/m2e/pde/connector/PDEProjectHelper.java
@@ -1,9 +1,12 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2022 Sonatype, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 package org.eclipse.m2e.pde.connector;