Add maven-classworlds module to replace plexus-classworlds dependency

- Copy complete plexus-classworlds source code to impl/maven-classworlds
- Replace all plexus-classworlds dependencies with maven-classworlds
- Update module structure and assembly configuration
- Maintain original package structure for now
- All builds passing

Implements first step of issue #11028

Author: gnodet

apache-maven/src/assembly/component.xml

@@ -23,14 +23,14 @@ under the License.
       <useProjectArtifact>false</useProjectArtifact>
       <outputDirectory>boot</outputDirectory>
       <includes>
-        <include>org.codehaus.plexus:plexus-classworlds</include>
+        <include>org.apache.maven:maven-classworlds</include>
       </includes>
     </dependencySet>
     <dependencySet>
       <useProjectArtifact>false</useProjectArtifact>
       <outputDirectory>lib</outputDirectory>
       <excludes>
-        <exclude>org.codehaus.plexus:plexus-classworlds</exclude>
+        <exclude>org.apache.maven:maven-classworlds</exclude>
       </excludes>
     </dependencySet>
   </dependencySets>

apache-maven/src/assembly/maven/bin/mvn

@@ -190,7 +190,7 @@ concat_lines() {
 
 MAVEN_PROJECTBASEDIR="`find_maven_basedir "$@"`"
 MAVEN_OPTS="$MAVEN_OPTS `concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config"`"
-LAUNCHER_JAR=`echo "$MAVEN_HOME"/boot/plexus-classworlds-*.jar`
+LAUNCHER_JAR=`echo "$MAVEN_HOME"/boot/maven-classworlds-*.jar`
 LAUNCHER_CLASS=org.codehaus.plexus.classworlds.launcher.Launcher
 
 # For Cygwin and MinGW, switch paths to Windows format before running java(1) command

apache-maven/src/assembly/maven/bin/mvn.cmd

@@ -247,7 +247,7 @@ goto processArgs
 :endHandleArgs
 call :processArgs %*
 
-for %%i in ("%MAVEN_HOME%"\boot\plexus-classworlds-*) do set LAUNCHER_JAR="%%i"
+for %%i in ("%MAVEN_HOME%"\boot\maven-classworlds-*) do set LAUNCHER_JAR="%%i"
 set LAUNCHER_CLASS=org.codehaus.plexus.classworlds.launcher.Launcher
 if "%MAVEN_MAIN_CLASS%"=="" @set MAVEN_MAIN_CLASS=org.apache.maven.cling.MavenCling
 

apache-maven/src/main/appended-resources/META-INF/LICENSE.vm

@@ -67,7 +67,7 @@ subject to the terms and conditions of the following licenses:
 #*    *##end
 #*    *###
 #*    *### Classworlds is in boot directory, not in lib
-#*    *##if ( $project.artifact.artifactId == "plexus-classworlds" )
+#*    *##if ( $project.artifact.artifactId == "maven-classworlds" )
 #*      *##set ( $directory = 'boot' )
 #*    *##end
 #*    *###

compat/maven-compat/pom.xml

@@ -117,8 +117,8 @@ under the License.
     </dependency>
 
     <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-classworlds</artifactId>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-classworlds</artifactId>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>

compat/maven-embedder/pom.xml

@@ -146,8 +146,8 @@ under the License.
     </dependency>
 
     <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-classworlds</artifactId>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-classworlds</artifactId>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>

compat/maven-embedder/src/main/java/org/apache/maven/cli/CliRequest.java

@@ -23,9 +23,9 @@
 import java.util.Properties;
 
 import org.apache.commons.cli.CommandLine;
+import org.apache.maven.api.classworlds.ClassWorld;
 import org.apache.maven.execution.DefaultMavenExecutionRequest;
 import org.apache.maven.execution.MavenExecutionRequest;
-import org.codehaus.plexus.classworlds.ClassWorld;
 
 /**
  * CliRequest

compat/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java

@@ -59,6 +59,9 @@
 import org.apache.maven.InternalErrorException;
 import org.apache.maven.Maven;
 import org.apache.maven.api.Constants;
+import org.apache.maven.api.classworlds.ClassRealm;
+import org.apache.maven.api.classworlds.ClassWorld;
+import org.apache.maven.api.classworlds.NoSuchRealmException;
 import org.apache.maven.api.cli.extensions.CoreExtension;
 import org.apache.maven.api.cli.extensions.InputSource;
 import org.apache.maven.api.services.MessageBuilder;
@@ -117,9 +120,6 @@
 import org.codehaus.plexus.DefaultPlexusContainer;
 import org.codehaus.plexus.PlexusConstants;
 import org.codehaus.plexus.PlexusContainer;
-import org.codehaus.plexus.classworlds.ClassWorld;
-import org.codehaus.plexus.classworlds.realm.ClassRealm;
-import org.codehaus.plexus.classworlds.realm.NoSuchRealmException;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 import org.codehaus.plexus.components.secdispatcher.SecDispatcher;
 import org.codehaus.plexus.logging.LoggerManager;
@@ -225,7 +225,7 @@ public int doMain(String[] args, String workingDirectory, PrintStream stdout, Pr
         final Set<String> realms;
         if (classWorld != null) {
             realms = new HashSet<>();
-            for (ClassRealm realm : classWorld.getRealms()) {
+            for (ClassRealm realm : ((org.codehaus.plexus.classworlds.ClassWorld) classWorld).getRealms()) {
                 realms.add(realm.getId());
             }
         } else {
@@ -246,7 +246,8 @@ public int doMain(String[] args, String workingDirectory, PrintStream stdout, Pr
             return doMain(cliRequest);
         } finally {
             if (classWorld != null) {
-                for (ClassRealm realm : new ArrayList<>(classWorld.getRealms())) {
+                for (ClassRealm realm :
+                        new ArrayList<>(((org.codehaus.plexus.classworlds.ClassWorld) classWorld).getRealms())) {
                     String realmId = realm.getId();
                     if (!realms.contains(realmId)) {
                         try {
@@ -673,13 +674,16 @@ void properties(CliRequest cliRequest) throws Exception {
 
     PlexusContainer container(CliRequest cliRequest) throws Exception {
         if (cliRequest.classWorld == null) {
-            cliRequest.classWorld =
-                    new ClassWorld("plexus.core", Thread.currentThread().getContextClassLoader());
+            cliRequest.classWorld = new org.codehaus.plexus.classworlds.ClassWorld(
+                    "plexus.core", Thread.currentThread().getContextClassLoader());
         }
 
         ClassRealm coreRealm = cliRequest.classWorld.getClassRealm("plexus.core");
         if (coreRealm == null) {
-            coreRealm = cliRequest.classWorld.getRealms().iterator().next();
+            coreRealm = ((org.codehaus.plexus.classworlds.ClassWorld) cliRequest.classWorld)
+                    .getRealms()
+                    .iterator()
+                    .next();
         }
 
         List<File> extClassPath = parseExtClasspath(cliRequest);
@@ -691,8 +695,8 @@ PlexusContainer container(CliRequest cliRequest) throws Exception {
         ClassRealm containerRealm = setupContainerRealm(cliRequest.classWorld, coreRealm, extClassPath, extensions);
 
         ContainerConfiguration cc = new DefaultContainerConfiguration()
-                .setClassWorld(cliRequest.classWorld)
-                .setRealm(containerRealm)
+                .setClassWorld((org.codehaus.plexus.classworlds.ClassWorld) cliRequest.classWorld)
+                .setRealm((org.codehaus.plexus.classworlds.realm.ClassRealm) containerRealm)
                 .setClassPathScanning(PlexusConstants.SCANNING_INDEX)
                 .setAutoWiring(true)
                 .setJSR250Lifecycle(true)
@@ -708,7 +712,7 @@ PlexusContainer container(CliRequest cliRequest) throws Exception {
 
         final CoreExports exports = new CoreExports(containerRealm, exportedArtifacts, exportedPackages);
 
-        Thread.currentThread().setContextClassLoader(containerRealm);
+        Thread.currentThread().setContextClassLoader(containerRealm.getClassLoader());
 
         DefaultPlexusContainer container = new DefaultPlexusContainer(cc, new AbstractModule() {
             @Override
@@ -734,12 +738,14 @@ protected void configure() {
         };
         for (CoreExtensionEntry extension : extensions) {
             container.discoverComponents(
-                    extension.getClassRealm(),
+                    (org.codehaus.plexus.classworlds.realm.ClassRealm) extension.getClassRealm(),
                     new AbstractModule() {
                         @Override
                         protected void configure() {
                             try {
-                                container.lookup(Injector.class).discover(extension.getClassRealm());
+                                container
+                                        .lookup(Injector.class)
+                                        .discover(extension.getClassRealm().getClassLoader());
                             } catch (Throwable e) {
                                 // ignore
                                 e.printStackTrace();
@@ -807,8 +813,8 @@ private List<CoreExtensionEntry> loadCoreExtensions(
         }
 
         ContainerConfiguration cc = new DefaultContainerConfiguration() //
-                .setClassWorld(cliRequest.classWorld) //
-                .setRealm(containerRealm) //
+                .setClassWorld((org.codehaus.plexus.classworlds.ClassWorld) cliRequest.classWorld) //
+                .setRealm((org.codehaus.plexus.classworlds.realm.ClassRealm) containerRealm) //
                 .setClassPathScanning(PlexusConstants.SCANNING_INDEX) //
                 .setAutoWiring(true) //
                 .setJSR250Lifecycle(true) //
@@ -874,7 +880,8 @@ private ClassRealm setupContainerRealm(
         if (!extClassPath.isEmpty() || !extensions.isEmpty()) {
             ClassRealm extRealm = classWorld.newRealm("maven.ext", null);
 
-            extRealm.setParentRealm(coreRealm);
+            ((org.codehaus.plexus.classworlds.realm.ClassRealm) extRealm)
+                    .setParentRealm((org.codehaus.plexus.classworlds.realm.ClassRealm) coreRealm);
 
             slf4jLogger.debug("Populating class realm '{}'", extRealm.getId());
 
@@ -888,11 +895,11 @@ private ClassRealm setupContainerRealm(
                 Set<String> exportedPackages = entry.getExportedPackages();
                 ClassRealm realm = entry.getClassRealm();
                 for (String exportedPackage : exportedPackages) {
-                    extRealm.importFrom(realm, exportedPackage);
+                    extRealm.importFrom(realm.getClassLoader(), exportedPackage);
                 }
                 if (exportedPackages.isEmpty()) {
                     // sisu uses realm imports to establish component visibility
-                    extRealm.importFrom(realm, realm.getId());
+                    extRealm.importFrom(realm.getClassLoader(), realm.getId());
                 }
             }
 

compat/maven-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java

@@ -33,6 +33,8 @@
 import org.apache.maven.RepositoryUtils;
 import org.apache.maven.api.Service;
 import org.apache.maven.api.Session;
+import org.apache.maven.api.classworlds.ClassRealm;
+import org.apache.maven.api.classworlds.ClassWorld;
 import org.apache.maven.api.cli.extensions.CoreExtension;
 import org.apache.maven.api.model.Plugin;
 import org.apache.maven.api.services.ArtifactCoordinatesFactory;
@@ -64,8 +66,6 @@
 import org.apache.maven.resolver.RepositorySystemSessionFactory;
 import org.codehaus.plexus.DefaultPlexusContainer;
 import org.codehaus.plexus.PlexusContainer;
-import org.codehaus.plexus.classworlds.ClassWorld;
-import org.codehaus.plexus.classworlds.realm.ClassRealm;
 import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.RepositorySystemSession.CloseableSession;
@@ -174,12 +174,13 @@ private CoreExtensionEntry createExtension(CoreExtension extension, List<Artifac
         Set<String> providedArtifacts = Collections.emptySet();
         String classLoadingStrategy = extension.getClassLoadingStrategy();
         if (STRATEGY_PARENT_FIRST.equals(classLoadingStrategy)) {
-            realm.importFrom(parentRealm, "");
+            realm.importFrom(parentRealm.getClassLoader(), "");
         } else if (STRATEGY_PLUGIN.equals(classLoadingStrategy)) {
             coreExports.getExportedPackages().forEach((p, cl) -> realm.importFrom(cl, p));
             providedArtifacts = coreExports.getExportedArtifacts();
         } else if (STRATEGY_SELF_FIRST.equals(classLoadingStrategy)) {
-            realm.setParentRealm(parentRealm);
+            ((org.codehaus.plexus.classworlds.realm.ClassRealm) realm)
+                    .setParentRealm((org.codehaus.plexus.classworlds.realm.ClassRealm) parentRealm);
         } else {
             throw new IllegalArgumentException("Unsupported class-loading strategy '"
                     + classLoadingStrategy + "'. Supported values are: " + STRATEGY_PARENT_FIRST

compat/maven-plugin-api/pom.xml

@@ -79,8 +79,8 @@ under the License.
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-classworlds</artifactId>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-classworlds</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.resolver</groupId>