You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2019/12/03 03:34:15 UTC
[maven-compiler-plugin] branch MCOMPILER-405 created (now 1455594)
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a change to branch MCOMPILER-405
in repository https://gitbox.apache.org/repos/asf/maven-compiler-plugin.git.
at 1455594 [MCOMPILER-405] upgrade plexus-java to 1.0.4
This branch includes the following new commits:
new 1455594 [MCOMPILER-405] upgrade plexus-java to 1.0.4
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-compiler-plugin] 01/01: [MCOMPILER-405] upgrade plexus-java
to 1.0.4
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch MCOMPILER-405
in repository https://gitbox.apache.org/repos/asf/maven-compiler-plugin.git
commit 1455594a943791fa14f7a733dbcf48b648100a8d
Author: olivier lamy <ol...@apache.org>
AuthorDate: Tue Dec 3 13:33:57 2019 +1000
[MCOMPILER-405] upgrade plexus-java to 1.0.4
Signed-off-by: olivier lamy <ol...@apache.org>
---
pom.xml | 2 +-
src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java | 6 ++----
.../java/org/apache/maven/plugin/compiler/TestCompilerMojo.java | 4 +---
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index d838a88..8d07e68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,7 +73,7 @@ under the License.
<groovyEclipseCompilerVersion>2.7.0-01</groovyEclipseCompilerVersion>
<groovy-eclipse-batch>2.0.4-04</groovy-eclipse-batch>
<openJpaVersion>2.4.2</openJpaVersion>
- <plexus-java.version>0.9.10</plexus-java.version>
+ <plexus-java.version>1.0.4</plexus-java.version>
<javaVersion>7</javaVersion>
<maven.it.failure.ignore>false</maven.it.failure.ignore>
</properties>
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 78d3908..49a76c1 100644
--- a/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java
+++ b/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java
@@ -33,7 +33,6 @@ import java.util.Map.Entry;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
@@ -48,9 +47,9 @@ import org.codehaus.plexus.compiler.util.scan.SourceInclusionScanner;
import org.codehaus.plexus.compiler.util.scan.StaleSourceScanner;
import org.codehaus.plexus.languages.java.jpms.JavaModuleDescriptor;
import org.codehaus.plexus.languages.java.jpms.LocationManager;
+import org.codehaus.plexus.languages.java.jpms.ModuleNameSource;
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;
/**
* Compiles application sources
@@ -124,8 +123,7 @@ public class CompilerMojo
@Parameter
private boolean multiReleaseOutput;
- @Component
- private LocationManager locationManager;
+ final LocationManager locationManager = new LocationManager();
private List<String> classpathElements;
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 5b0518b..7b3caba 100644
--- a/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java
+++ b/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java
@@ -34,7 +34,6 @@ import java.util.Map.Entry;
import java.util.Set;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
@@ -160,8 +159,7 @@ public class TestCompilerMojo
@Parameter( defaultValue = "${project.testClasspathElements}", readonly = true )
private List<String> testPath;
- @Component
- private LocationManager locationManager;
+ final LocationManager locationManager = new LocationManager();
private Map<String, JavaModuleDescriptor> pathElements;