Update test setup so tests will work on Java 17+

Author: mcculls

org.eclipse.sisu.plexus/pom.xml

@@ -142,6 +142,7 @@
                 <artifactItem>
                   <groupId>com.google.inject</groupId>
                   <artifactId>guice</artifactId>
+                  <classifier>no_aop</classifier>
                   <version>3.0</version>
                 </artifactItem>
               </artifactItems>
@@ -164,6 +165,7 @@
                 <artifactItem>
                   <groupId>com.google.inject</groupId>
                   <artifactId>guice</artifactId>
+                  <classifier>no_aop</classifier>
                   <version>4.0</version>
                 </artifactItem>
               </artifactItems>
@@ -191,6 +193,7 @@
                 <artifactItem>
                   <groupId>com.google.inject</groupId>
                   <artifactId>guice</artifactId>
+                  <classifier>no_aop</classifier>
                   <version>4.2.3</version>
                 </artifactItem>
               </artifactItems>
@@ -215,9 +218,15 @@
                   <artifactId>guava</artifactId>
                   <version>30.1-jre</version>
                 </artifactItem>
+                <artifactItem>
+                  <groupId>org.ow2.asm</groupId>
+                  <artifactId>asm</artifactId>
+                  <version>9.5</version>
+                </artifactItem>
                 <artifactItem>
                   <groupId>com.google.inject</groupId>
                   <artifactId>guice</artifactId>
+                  <classifier>classes</classifier>
                   <version>5.1.0</version>
                 </artifactItem>
               </artifactItems>
@@ -269,7 +278,7 @@
             <configuration>
               <groups>org.eclipse.sisu.BaseTests</groups>
               <additionalClasspathElements>
-                <additionalClasspathElement>${project.build.directory}/guice3/guice.jar</additionalClasspathElement>
+                <additionalClasspathElement>${project.build.directory}/guice3/guice-no_aop.jar</additionalClasspathElement>
               </additionalClasspathElements>
             </configuration>
           </execution>
@@ -283,7 +292,7 @@
               <excludedGroups>org.eclipse.sisu.BaseTests</excludedGroups>
               <additionalClasspathElements>
                 <additionalClasspathElement>${project.build.directory}/guice3/guava.jar</additionalClasspathElement>
-                <additionalClasspathElement>${project.build.directory}/guice3/guice.jar</additionalClasspathElement>
+                <additionalClasspathElement>${project.build.directory}/guice3/guice-no_aop.jar</additionalClasspathElement>
               </additionalClasspathElements>
               <systemPropertyVariables>
                 <guiceVersion>guice3</guiceVersion>
@@ -300,7 +309,7 @@
               <excludedGroups>org.eclipse.sisu.BaseTests</excludedGroups>
               <additionalClasspathElements>
                 <additionalClasspathElement>${project.build.directory}/guice4/guava.jar</additionalClasspathElement>
-                <additionalClasspathElement>${project.build.directory}/guice4/guice.jar</additionalClasspathElement>
+                <additionalClasspathElement>${project.build.directory}/guice4/guice-no_aop.jar</additionalClasspathElement>
               </additionalClasspathElements>
               <systemPropertyVariables>
                 <guiceVersion>guice4</guiceVersion>
@@ -318,7 +327,7 @@
               <additionalClasspathElements>
                 <additionalClasspathElement>${project.build.directory}/guice423/failureaccess.jar</additionalClasspathElement>
                 <additionalClasspathElement>${project.build.directory}/guice423/guava.jar</additionalClasspathElement>
-                <additionalClasspathElement>${project.build.directory}/guice423/guice.jar</additionalClasspathElement>
+                <additionalClasspathElement>${project.build.directory}/guice423/guice-no_aop.jar</additionalClasspathElement>
               </additionalClasspathElements>
               <systemPropertyVariables>
                 <guiceVersion>guice423</guiceVersion>
@@ -336,7 +345,8 @@
               <additionalClasspathElements>
                 <additionalClasspathElement>${project.build.directory}/guice5/failureaccess.jar</additionalClasspathElement>
                 <additionalClasspathElement>${project.build.directory}/guice5/guava.jar</additionalClasspathElement>
-                <additionalClasspathElement>${project.build.directory}/guice5/guice.jar</additionalClasspathElement>
+                <additionalClasspathElement>${project.build.directory}/guice5/asm.jar</additionalClasspathElement>
+                <additionalClasspathElement>${project.build.directory}/guice5/guice-classes.jar</additionalClasspathElement>
               </additionalClasspathElements>
               <systemPropertyVariables>
                 <guiceVersion>guice5</guiceVersion>

org.eclipse.sisu.plexus/src/test/java/org/eclipse/sisu/plexus/ComponentAnnotationTest.java

@@ -104,6 +104,7 @@ private static void checkBehaviour( final String name )
         String origToString = orig.toString().replace( "\"", "" ).replace( ".class", "" );
         String cloneToString = clone.toString().replace( '[', '{' ).replace( ']', '}' );
         cloneToString = cloneToString.replace( "class ", "" ).replace( "interface ", "" );
+        cloneToString = cloneToString.replace( "ComponentAnnotationTest$A", "ComponentAnnotationTest.A" );
 
         assertEquals( new HashSet<String>( Arrays.asList( origToString.split( "[(, )]" ) ) ),
                       new HashSet<String>( Arrays.asList( cloneToString.split( "[(, )]" ) ) ) );

org.eclipse.sisu.plexus/src/test/java/org/eclipse/sisu/plexus/PlexusRequirementTest.java

@@ -594,12 +594,6 @@ public void testBadDeferredRole()
     public void testPlexus121Compatibility()
         throws Exception
     {
-        if ( "17".equals( System.getProperty( "java.specification.version", "undefined" ) )
-            && !"guice5".equals( System.getProperty( "guiceVersion", "undefined" ) ) )
-        {
-            return; // skip test on Java17 + guice3/4, is not working
-        }
-
         final List<URL> urls = new ArrayList<URL>();
         urls.add( new File( "target/dependency/plexus-component-annotations-1.2.1.jar" ).toURI().toURL() );
         Collections.addAll( urls, new URLClassSpace( getClass().getClassLoader() ).getURLs() );