You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2018/06/22 17:59:27 UTC

[maven-compiler-plugin] 02/06: [MCOMPILER-342] Unsupported class file major version 55 Upgrade plexus-java to 0.9.10 Replace deprecated methods

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

rfscholte pushed a commit to branch MCOMPILER-323
in repository https://gitbox.apache.org/repos/asf/maven-compiler-plugin.git

commit ce6d8f51aef2a4d5442045134e6d34127204c190
Author: rfscholte <rf...@apache.org>
AuthorDate: Sun Jun 3 22:57:04 2018 +0200

    [MCOMPILER-342] Unsupported class file major version 55
    Upgrade plexus-java to 0.9.10
    Replace deprecated methods
---
 pom.xml                                                     | 13 +++++++++++--
 .../java/org/apache/maven/plugin/compiler/CompilerMojo.java |  2 +-
 .../org/apache/maven/plugin/compiler/TestCompilerMojo.java  |  4 ++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8bb3c4e..960a53e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,6 +84,16 @@ under the License.
     </contributor>
   </contributors>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <!-- to remove when using plexus-java-1.0.0 -->
+        <groupId>com.thoughtworks.qdox</groupId>
+        <artifactId>qdox</artifactId>
+        <version>2.0-M9</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
@@ -120,7 +130,7 @@ under the License.
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-java</artifactId>
-      <version>0.9.7</version>
+      <version>0.9.10</version>
     </dependency>
 
     <dependency>
@@ -182,7 +192,6 @@ under the License.
       <version>4.12</version>
       <scope>test</scope>
     </dependency>
-
   </dependencies>
 
   <build>
diff --git a/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java b/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java
index 37eae70..b36943a 100644
--- a/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java
+++ b/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java
@@ -227,7 +227,7 @@ public class CompilerMojo
                 Collection<File> dependencyArtifacts = getCompileClasspathElements( getProject() );
                 
                 ResolvePathsRequest<File> request =
-                    ResolvePathsRequest.withFiles( dependencyArtifacts )
+                    ResolvePathsRequest.ofFiles( dependencyArtifacts )
                                        .setMainModuleDescriptor( moduleDescriptorPath );
                 
                 Toolchain toolchain = getToolchain();
diff --git a/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java b/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java
index 6fa080e..46c6fc0 100644
--- a/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java
+++ b/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java
@@ -235,7 +235,7 @@ public class TestCompilerMojo
             try
             {
                 ResolvePathsRequest<String> request =
-                        ResolvePathsRequest.withStrings( testPath )
+                        ResolvePathsRequest.ofStrings( testPath )
                                 .setMainModuleDescriptor( mainModuleDescriptorClassFile.getAbsolutePath() );
 
                 Toolchain toolchain = getToolchain();
@@ -268,7 +268,7 @@ public class TestCompilerMojo
             try
             {
                 ResolvePathsRequest<String> request =
-                        ResolvePathsRequest.withStrings( testPath )
+                        ResolvePathsRequest.ofStrings( testPath )
                                 .setMainModuleDescriptor( testModuleDescriptorJavaFile.getAbsolutePath() );
 
                 Toolchain toolchain = getToolchain();