You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2022/01/23 21:51:27 UTC

[maven-surefire] 03/13: [SUREFIRE-1924] Upgrade plexus-java to Version 1.0.7

This is an automated email from the ASF dual-hosted git repository.

tibordigana pushed a commit to branch release/2.22.3
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git

commit 40d4e7a53653f7a802704f76db0df5b9d2a53398
Author: Tibor Digaňa <ti...@apache.org>
AuthorDate: Fri Dec 31 20:25:01 2021 +0100

    [SUREFIRE-1924] Upgrade plexus-java to Version 1.0.7
    
    (cherry picked from commit 773451c6874b02e26854a8763e0889e2126d4f95)
---
 maven-surefire-common/pom.xml                                    | 4 ++++
 .../maven/plugin/surefire/AbstractSurefireMojoJava7PlusTest.java | 2 +-
 pom.xml                                                          | 9 +++++++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml
index 409e28f..98ee90b 100644
--- a/maven-surefire-common/pom.xml
+++ b/maven-surefire-common/pom.xml
@@ -108,6 +108,10 @@
       <artifactId>plexus-java</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoJava7PlusTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoJava7PlusTest.java
index 96a2a5c..731ef46 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoJava7PlusTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoJava7PlusTest.java
@@ -35,7 +35,7 @@ import org.apache.maven.surefire.util.DefaultScanResult;
 import org.codehaus.plexus.languages.java.jpms.LocationManager;
 import org.codehaus.plexus.languages.java.jpms.ResolvePathsRequest;
 import org.codehaus.plexus.languages.java.jpms.ResolvePathsResult;
-import org.codehaus.plexus.languages.java.jpms.ResolvePathsResult.ModuleNameSource;
+import org.codehaus.plexus.languages.java.jpms.ModuleNameSource;
 import org.codehaus.plexus.logging.Logger;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/pom.xml b/pom.xml
index 8da630b..aa4a1ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -256,7 +256,12 @@
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-java</artifactId>
-        <version>0.9.10</version>
+        <version>1.0.7</version>
+      </dependency>
+      <dependency>
+        <groupId>org.ow2.asm</groupId>
+        <artifactId>asm</artifactId>
+        <version>9.2</version>
       </dependency>
       <dependency>
         <groupId>org.mockito</groupId>
@@ -635,7 +640,7 @@
           <plugins>
             <!-- Moving to a profile, since these dependencies won't exist the first
                  time a new snapshot version is built. This prevents the first
-                 snapshot build from proceeding beyond the build for the top-level 
+                 snapshot build from proceeding beyond the build for the top-level
                  Surefire parent POM.
             -->
             <plugin>