From a118f29eda9f8baf604eab06616e226a7b75ca0f Mon Sep 17 00:00:00 2001
From: Stuart McCulloch <mcculls@gmail.com>
Date: Sun, 26 Mar 2023 23:01:44 +0100
Subject: [PATCH] Remove tycho packaging

---
 .../.settings/org.eclipse.jdt.core.prefs      |   4 -
 .../build.properties                          |  16 --
 org.eclipse.sisu.plexus.extender/pom.xml      |  34 +--
 .../.settings/org.eclipse.jdt.core.prefs      |   4 -
 org.eclipse.sisu.plexus.tests/pom.xml         |  12 +
 .../.settings/org.eclipse.jdt.core.prefs      |   4 -
 org.eclipse.sisu.plexus/build.properties      |  19 --
 org.eclipse.sisu.plexus/build.target          | 138 ------------
 org.eclipse.sisu.plexus/pom.xml               |  88 +++-----
 pom.xml                                       | 205 ++++--------------
 10 files changed, 101 insertions(+), 423 deletions(-)
 delete mode 100644 org.eclipse.sisu.plexus.extender/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 org.eclipse.sisu.plexus.extender/build.properties
 delete mode 100644 org.eclipse.sisu.plexus.tests/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 org.eclipse.sisu.plexus/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 org.eclipse.sisu.plexus/build.properties
 delete mode 100644 org.eclipse.sisu.plexus/build.target

diff --git a/org.eclipse.sisu.plexus.extender/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.sisu.plexus.extender/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 64cef50..0000000
--- a/org.eclipse.sisu.plexus.extender/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.eclipse.sisu.plexus.extender/build.properties b/org.eclipse.sisu.plexus.extender/build.properties
deleted file mode 100644
index 9775300..0000000
--- a/org.eclipse.sisu.plexus.extender/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2010-present 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
-#
-# Contributors:
-#   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = target/classes/
-src.includes = about.html
-bin.includes = META-INF/,\
-               about.html,\
-               .
diff --git a/org.eclipse.sisu.plexus.extender/pom.xml b/org.eclipse.sisu.plexus.extender/pom.xml
index cc3916c..63639f1 100644
--- a/org.eclipse.sisu.plexus.extender/pom.xml
+++ b/org.eclipse.sisu.plexus.extender/pom.xml
@@ -21,27 +21,33 @@
   </parent>
 
   <artifactId>org.eclipse.sisu.plexus.extender</artifactId>
-  <packaging>eclipse-plugin</packaging>
+  <packaging>jar</packaging>
 
   <build>
     <sourceDirectory>src</sourceDirectory>
+    <resources>
+      <resource>
+        <directory>.</directory>
+        <includes>
+          <include>META-INF/**</include>
+          <include>about.html</include>
+          <include>overview.html</include>
+        </includes>
+      </resource>
+    </resources>
     <plugins>
       <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>target-platform-configuration</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-maven-plugin</artifactId>
-        <extensions>true</extensions>
-      </plugin>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-source-plugin</artifactId>
-      </plugin>
-      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <executions>
+          <execution>
+            <id>default-jar</id>
+            <configuration>
+              <archive>
+                <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+              </archive>
+            </configuration>
+          </execution>
           <execution>
             <id>empty-javadoc</id>
             <phase>package</phase>
diff --git a/org.eclipse.sisu.plexus.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.sisu.plexus.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 64cef50..0000000
--- a/org.eclipse.sisu.plexus.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.eclipse.sisu.plexus.tests/pom.xml b/org.eclipse.sisu.plexus.tests/pom.xml
index 73d417c..a1f1495 100644
--- a/org.eclipse.sisu.plexus.tests/pom.xml
+++ b/org.eclipse.sisu.plexus.tests/pom.xml
@@ -64,6 +64,7 @@
     </resources>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <configuration>
           <stripVersion>true</stripVersion>
@@ -182,6 +183,7 @@
         </executions>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <testSourceDirectory>${project.build.sourceDirectory}</testSourceDirectory>
@@ -275,6 +277,7 @@
         </executions>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-clean-plugin</artifactId>
         <executions>
           <execution>
@@ -324,12 +327,21 @@
         </executions>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <configuration>
+          <skipSource>true</skipSource>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
           <skip>true</skip>
         </configuration>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>
         <configuration>
           <skip>true</skip>
diff --git a/org.eclipse.sisu.plexus/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.sisu.plexus/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 64cef50..0000000
--- a/org.eclipse.sisu.plexus/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.eclipse.sisu.plexus/build.properties b/org.eclipse.sisu.plexus/build.properties
deleted file mode 100644
index 2627692..0000000
--- a/org.eclipse.sisu.plexus/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2010-present 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
-#
-# Contributors:
-#   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = target/classes/
-src.includes = about.html
-bin.includes = META-INF/,\
-               about.html,\
-               .
-
-extra.. = platform:/plugin/javax.annotation-api
-additional.bundles = javax.annotation-api
diff --git a/org.eclipse.sisu.plexus/build.target b/org.eclipse.sisu.plexus/build.target
deleted file mode 100644
index 9e6ccd7..0000000
--- a/org.eclipse.sisu.plexus/build.target
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.7"?>
-<target name="org.eclipse.sisu.plexus" sequenceNumber="0">
-	<locations>
-		<location type="Maven" includeSource="true">
-			<groupId>org.osgi</groupId>
-			<artifactId>org.eclipse.osgi</artifactId>
-			<version>3.10.100.v20150529-1857</version>
-			<type>jar</type>
-		</location>
-		<location type="Maven" includeSource="true">
-			<groupId>org.eclipse.jdt</groupId>
-			<artifactId>org.eclipse.jdt.apt.core</artifactId>
-			<version>3.4.100</version>
-			<type>jar</type>
-		</location>
-		<location type="Maven" includeSource="true">
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>1.6.4</version>
-			<type>jar</type>
-		</location>
-		<location type="Maven" includeSource="true">
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-core</artifactId>
-			<version>1.0.0</version>
-			<type>jar</type>
-		</location>
-		<location type="Maven" includeSource="true">
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-classic</artifactId>
-			<version>1.0.0</version>
-			<type>jar</type>
-		</location>
-		<location type="Maven" includeSource="true">
-			<groupId>javax.annotation</groupId>
-			<artifactId>javax.annotation-api</artifactId>
-			<version>1.2</version>
-			<type>jar</type>
-		</location>
-		<location type="Maven" includeSource="false">
-			<groupId>org.apache.servicemix.bundles</groupId>
-			<artifactId>org.apache.servicemix.bundles.javax-inject</artifactId>
-			<version>1_3</version>
-			<type>jar</type>
-		</location>
-		<location type="Maven" includeSource="true">
-			<groupId>org.apache.servicemix.bundles</groupId>
-			<artifactId>org.apache.servicemix.bundles.aopalliance</artifactId>
-			<version>1.0_1</version>
-			<type>jar</type>
-		</location>
-		<location type="Maven" includeSource="true">
-			<groupId>javax.el</groupId>
-			<artifactId>javax.el-api</artifactId>
-			<version>3.0.0</version>
-			<type>jar</type>
-		</location>
-		<location type="Maven" includeSource="true">
-			<groupId>javax.interceptor</groupId>
-			<artifactId>javax.interceptor-api</artifactId>
-			<version>1.2</version>
-			<type>jar</type>
-		</location>
-		<location type="Maven" includeSource="true">
-			<groupId>javax.enterprise</groupId>
-			<artifactId>cdi-api</artifactId>
-			<version>1.2</version>
-			<type>jar</type>
-		</location>
-		<location type="Maven" includeSource="true">
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>16.0</version>
-			<type>jar</type>
-		</location>
-		<location type="Maven" includeSource="true">
-			<groupId>com.google.inject</groupId>
-			<artifactId>guice</artifactId>
-			<version>4.0</version>
-			<type>jar</type>
-		</location>
-		<location type="Maven" includeSource="true" missingManifest="generate">
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.5</version>
-			<type>jar</type>
-		</location>
-		<location type="Maven" includeSource="true">
-			<groupId>com.google.inject.extensions</groupId>
-			<artifactId>guice-servlet</artifactId>
-			<version>4.0</version>
-			<type>jar</type>
-		</location>
-		<location type="Maven" includeSource="true" missingManifest="generate">
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.11</version>
-			<type>jar</type>
-		</location>
-		<location type="Maven" includeSource="true">
-			<groupId>org.testng</groupId>
-			<artifactId>testng</artifactId>
-			<version>6.7</version>
-			<type>jar</type>
-		</location>
-		<location type="Maven" includeSource="true">
-			<groupId>org.eclipse.sisu</groupId>
-			<artifactId>org.eclipse.sisu.inject</artifactId>
-			<version>0.9.0-SNAPSHOT</version>
-			<type>jar</type>
-		</location>
-		<location type="Maven" includeSource="true">
-			<groupId>org.eclipse.sisu</groupId>
-			<artifactId>org.eclipse.sisu.inject.extender</artifactId>
-			<version>0.9.0-SNAPSHOT</version>
-			<type>jar</type>
-		</location>
-		<location type="Maven" includeSource="true">
-			<groupId>org.codehaus.plexus</groupId>
-			<artifactId>plexus-classworlds</artifactId>
-			<version>2.5.2</version>
-			<type>jar</type>
-		</location>
-		<location type="Maven" includeSource="true" missingManifest="generate">
-			<groupId>org.codehaus.plexus</groupId>
-			<artifactId>plexus-utils</artifactId>
-			<version>3.0.17</version>
-			<type>jar</type>
-		</location>
-		<location type="Maven" includeSource="true" missingManifest="generate">
-			<groupId>org.codehaus.plexus</groupId>
-			<artifactId>plexus-component-annotations</artifactId>
-			<version>1.5.5</version>
-			<type>jar</type>
-		</location>
-	</locations>
-</target>
diff --git a/org.eclipse.sisu.plexus/pom.xml b/org.eclipse.sisu.plexus/pom.xml
index 0bff4ff..db3f14c 100644
--- a/org.eclipse.sisu.plexus/pom.xml
+++ b/org.eclipse.sisu.plexus/pom.xml
@@ -21,7 +21,7 @@
   </parent>
 
   <artifactId>org.eclipse.sisu.plexus</artifactId>
-  <packaging>eclipse-plugin</packaging>
+  <packaging>jar</packaging>
 
   <dependencies>
     <!--
@@ -82,6 +82,18 @@
       <artifactId>plexus-utils</artifactId>
       <version>3.3.0</version>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.36</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>osgi.core</artifactId>
+      <version>5.0.0</version>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -92,66 +104,28 @@
 
   <build>
     <sourceDirectory>src</sourceDirectory>
+    <resources>
+      <resource>
+        <directory>.</directory>
+        <includes>
+          <include>META-INF/**</include>
+          <include>about.html</include>
+          <include>overview.html</include>
+          <include>plugin.xml</include>
+        </includes>
+      </resource>
+    </resources>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-build-target</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>attach-artifact</goal>
-            </goals>
-            <configuration>
-              <artifacts>
-                <artifact>
-                  <file>build.target</file>
-                  <classifier>build</classifier>
-                  <type>target</type>
-                </artifact>
-              </artifacts>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>target-platform-configuration</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-maven-plugin</artifactId>
-        <extensions>${tycho.extensions}</extensions>
-      </plugin>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-source-plugin</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+          </archive>
+        </configuration>
       </plugin>
     </plugins>
   </build>
 
-  <!--
-  Disable Tycho extensions so artifact can be consumed by Java 8 builds.
-  -->
-  <properties>
-    <tycho.extensions>false</tycho.extensions>
-  </properties>
-  <profiles>
-    <profile>
-      <!--
-      Enable Tycho extensions when building the project artifact.
-      -->
-      <id>tycho.extensions</id>
-      <activation>
-        <file>
-          <exists>src</exists>
-        </file>
-      </activation>
-      <properties>
-        <tycho.extensions>true</tycho.extensions>
-      </properties>
-    </profile>
-  </profiles>
-
 </project>
diff --git a/pom.xml b/pom.xml
index 04d2f9d..19a27de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,131 +86,41 @@
 
     <mavenBuildVersion>3.6.3</mavenBuildVersion>
     <javaBuildVersion>11</javaBuildVersion>
-
-    <tycho.scmUrl>scm:git:https://github.com/eclipse/sisu.plexus.git</tycho.scmUrl>
-    <tycho-version>2.7.5</tycho-version>
   </properties>
 
   <build>
     <pluginManagement>
       <plugins>
         <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>target-platform-configuration</artifactId>
-          <version>${tycho-version}</version>
-          <configuration>
-            <executionEnvironment>JavaSE-1.8</executionEnvironment>
-            <target>
-              <artifact>
-                <groupId>org.eclipse.sisu</groupId>
-                <artifactId>org.eclipse.sisu.plexus</artifactId>
-                <version>${project.version}</version>
-                <classifier>build</classifier>
-              </artifact>
-            </target>
-            <environments>
-              <environment>
-                <os>win32</os>
-                <ws>win32</ws>
-                <arch>x86</arch>
-              </environment>
-              <environment>
-                <os>linux</os>
-                <ws>gtk</ws>
-                <arch>x86_64</arch>
-              </environment>
-              <environment>
-                <os>macosx</os>
-                <ws>cocoa</ws>
-                <arch>x86_64</arch>
-              </environment>
-            </environments>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>tycho-compiler-plugin</artifactId>
-          <version>${tycho-version}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>tycho-maven-plugin</artifactId>
-          <version>${tycho-version}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>tycho-p2-plugin</artifactId>
-          <version>${tycho-version}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>tycho-p2-publisher-plugin</artifactId>
-          <version>${tycho-version}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>tycho-p2-repository-plugin</artifactId>
-          <version>${tycho-version}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>tycho-packaging-plugin</artifactId>
-          <version>${tycho-version}</version>
-          <configuration>
-            <archive>
-              <addMavenDescriptor>false</addMavenDescriptor>
-            </archive>
-            <sourceReferences>
-              <generate>true</generate>
-            </sourceReferences>
-          </configuration>
-          <dependencies>
-            <dependency>
-              <groupId>org.eclipse.tycho.extras</groupId>
-              <artifactId>tycho-sourceref-jgit</artifactId>
-              <version>${tycho-version}</version>
-            </dependency>
-          </dependencies>
-        </plugin>
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>tycho-source-plugin</artifactId>
-          <version>${tycho-version}</version>
-          <executions>
-            <execution>
-              <id>plugin-source</id>
-              <goals>
-                <goal>plugin-source</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>tycho-surefire-plugin</artifactId>
-          <version>${tycho-version}</version>
-        </plugin>
-        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-antrun-plugin</artifactId>
           <version>3.1.0</version>
         </plugin>
         <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-clean-plugin</artifactId>
           <version>3.2.0</version>
         </plugin>
         <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-resources-plugin</artifactId>
           <version>3.3.0</version>
         </plugin>
         <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
           <version>3.11.0</version>
+          <configuration>
+            <proc>none</proc>
+          </configuration>
         </plugin>
         <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
           <version>3.5.0</version>
         </plugin>
         <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
           <version>3.0.0</version>
           <dependencies>
@@ -222,6 +132,7 @@
           </dependencies>
         </plugin>
         <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-failsafe-plugin</artifactId>
           <version>3.0.0</version>
           <dependencies>
@@ -233,14 +144,17 @@
           </dependencies>
         </plugin>
         <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
           <version>3.3.0</version>
         </plugin>
         <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-install-plugin</artifactId>
           <version>3.1.0</version>
         </plugin>
         <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-deploy-plugin</artifactId>
           <version>3.1.0</version>
         </plugin>
@@ -255,6 +169,7 @@
           <version>1.6.13</version>
         </plugin>
         <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-release-plugin</artifactId>
           <version>3.0.0</version>
           <configuration>
@@ -262,6 +177,12 @@
           </configuration>
         </plugin>
         <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-source-plugin</artifactId>
+          <version>3.2.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
           <version>3.5.0</version>
           <configuration>
@@ -273,6 +194,7 @@
           </configuration>
         </plugin>
         <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
           <version>3.12.1</version>
         </plugin>
@@ -281,11 +203,6 @@
           <artifactId>spotless-maven-plugin</artifactId>
           <version>2.35.0</version>
         </plugin>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>build-helper-maven-plugin</artifactId>
-          <version>3.3.0</version>
-        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
@@ -306,7 +223,8 @@
                   <maxJdkVersion>${maven.compiler.target}</maxJdkVersion>
                   <excludes>
                     <!-- Used in tests only -->
-                    <exclude>p2.eclipse.plugin:wrapped.org.junit.jupiter.junit-jupiter-api</exclude>
+                    <exclude>org.junit.jupiter:junit-jupiter-api</exclude>
+                    <exclude>org.junit.platform:junit-platform-commons</exclude>
                     <exclude>org.apache.felix:org.apache.felix.framework:jar:7.0.5</exclude>
                   </excludes>
                 </enforceBytecodeVersion>
@@ -328,12 +246,26 @@
           </dependency>
         </dependencies>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>jar-no-fork</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 
   <reporting>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-project-info-reports-plugin</artifactId>
         <version>3.4.2</version>
       </plugin>
@@ -367,73 +299,12 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>m2e</id>
-      <activation>
-        <property>
-          <name>m2e.version</name>
-        </property>
-      </activation>
-      <build>
-        <!-- ignore various mojos that aren't covered by m2e -->
-        <pluginManagement>
-          <plugins>
-            <plugin>
-              <groupId>org.eclipse.m2e</groupId>
-              <artifactId>lifecycle-mapping</artifactId>
-              <version>1.0.0</version>
-              <configuration>
-                <lifecycleMappingMetadata>
-                  <pluginExecutions>
-                    <pluginExecution>
-                      <pluginExecutionFilter>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <versionRange>[1.0,)</versionRange>
-                        <goals><goal>attach-artifact</goal></goals>
-                      </pluginExecutionFilter>
-                      <action><ignore></ignore></action>
-                    </pluginExecution>
-                    <pluginExecution>
-                      <pluginExecutionFilter>
-                        <groupId>org.eclipse.tycho</groupId>
-                        <artifactId>target-platform-configuration</artifactId>
-                        <versionRange>[1.0,)</versionRange>
-                        <goals><goal>target-platform</goal></goals>
-                      </pluginExecutionFilter>
-                      <action><ignore></ignore></action>
-                    </pluginExecution>
-                    <pluginExecution>
-                      <pluginExecutionFilter>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-clean-plugin</artifactId>
-                        <versionRange>[2.4.1,)</versionRange>
-                        <goals><goal>clean</goal></goals>
-                      </pluginExecutionFilter>
-                      <action><ignore /></action>
-                    </pluginExecution>
-                    <pluginExecution>
-                      <pluginExecutionFilter>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <versionRange>[2.1,)</versionRange>
-                        <goals><goal>copy</goal></goals>
-                      </pluginExecutionFilter>
-                      <action><ignore /></action>
-                    </pluginExecution>
-                  </pluginExecutions>
-                </lifecycleMappingMetadata>
-              </configuration>
-            </plugin>
-          </plugins>
-        </pluginManagement>
-      </build>
-    </profile>
     <profile>
       <id>sonatype-oss-release</id>
       <build>
         <plugins>
           <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
             <version>3.0.1</version>
             <configuration>