Upgrade Guice to 6 - Add support to run test with jakarta @Inject annotations

.github/workflows/maven.yml

@@ -25,7 +25,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest,windows-latest, macOS-latest]
-        java: [8, 11, 17]
+        java: [8, 11, 17, 20]
         jdk: [temurin]
       fail-fast: false
 
@@ -43,4 +43,7 @@ jobs:
           cache: 'maven'
 
       - name: Build with Maven
-        run: mvn install javadoc:javadoc -e -B -V -Pno-tests-if-not-on-osx
+        run: mvn install javadoc:javadoc -e -B -V
+
+      - name: Build with Maven and target Java level - ${{ matrix.java }}
+        run: mvn clean install javadoc:javadoc -e -DjavaVersion=${{ matrix.java }}

pom.xml

@@ -31,6 +31,9 @@
   </distributionManagement>
 
   <properties>
+    <!-- remove with parent upgrade -->
+    <maven.compiler.source>${javaVersion}</maven.compiler.source>
+    <maven.compiler.target>${javaVersion}</maven.compiler.target>
     <project.build.outputTimestamp>2021-09-21T23:45:11Z</project.build.outputTimestamp>
   </properties>
 
@@ -43,7 +46,7 @@
     <dependency>
       <groupId>com.google.inject</groupId>
       <artifactId>guice</artifactId>
-      <version>5.1.0</version>
+      <version>6.0.0</version>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>

src/test/java/org/codehaus/plexus/testing/PlexusTestJakartaTest.java

@@ -0,0 +1,39 @@
+package org.codehaus.plexus.testing;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import jakarta.inject.Inject;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+@PlexusTest
+class PlexusTestJakartaTest {
+
+    @Inject
+    private TestJakartaComponent testJakartaComponent;
+
+    @Test
+    void dependencyShouldBeInjected() {
+        assertNotNull(testJakartaComponent);
+        assertNotNull(testJakartaComponent.getTestJakartaComponent2());
+        assertNotNull(testJakartaComponent.getTestJavaxComponent2());
+    }
+}

src/test/java/org/codehaus/plexus/testing/PlexusTestTest.java → src/test/java/org/codehaus/plexus/testing/PlexusTestJavaxTest.java

@@ -26,14 +26,14 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 @PlexusTest
-class PlexusTestTest {
+class PlexusTestJavaxTest {
 
     @Inject
-    private TestComponent testComponent;
+    private TestJavaxComponent testJavaxComponent;
 
     @Test
     void dependencyShouldBeInjected() {
-        assertNotNull(testComponent);
-        assertNotNull(testComponent.getTestComponent2());
+        assertNotNull(testJavaxComponent);
+        assertNotNull(testJavaxComponent.getTestComponent2());
     }
 }

src/test/java/org/codehaus/plexus/testing/TestJakartaComponent.java

@@ -0,0 +1,40 @@
+package org.codehaus.plexus.testing;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
+@Named
+public class TestJakartaComponent {
+    @Inject
+    private TestJavaxComponent2 testJavaxComponent2;
+
+    @Inject
+    private TestJakartaComponent2 testJakartaComponent2;
+
+    public TestJavaxComponent2 getTestJavaxComponent2() {
+        return testJavaxComponent2;
+    }
+
+    public TestJakartaComponent2 getTestJakartaComponent2() {
+        return testJakartaComponent2;
+    }
+}

src/test/java/org/codehaus/plexus/testing/TestJakartaComponent2.java

@@ -0,0 +1,25 @@
+package org.codehaus.plexus.testing;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import javax.inject.Named;
+
+@Named
+public class TestJakartaComponent2 {}

src/test/java/org/codehaus/plexus/testing/TestComponent.java → src/test/java/org/codehaus/plexus/testing/TestJavaxComponent.java

@@ -23,11 +23,11 @@
 import javax.inject.Named;
 
 @Named
-public class TestComponent {
+public class TestJavaxComponent {
     @Inject
-    private TestComponent2 testComponent2;
+    private TestJavaxComponent2 testJavaxComponent2;
 
-    public TestComponent2 getTestComponent2() {
-        return testComponent2;
+    public TestJavaxComponent2 getTestComponent2() {
+        return testJavaxComponent2;
     }
 }

src/test/java/org/codehaus/plexus/testing/TestComponent2.java → src/test/java/org/codehaus/plexus/testing/TestJavaxComponent2.java

@@ -22,4 +22,4 @@
 import javax.inject.Named;
 
 @Named
-public class TestComponent2 {}
+public class TestJavaxComponent2 {}