This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-source-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new fb28055 Replace deprecated @Component with JSR 330 injection
fb28055 is described below
commit fb28055cce3fb59a4151e2d86dbadb77126b63b7
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Thu Oct 29 23:46:08 2026 +0000
Replace deprecated @Component with JSR 330 injection
---
pom.xml | 2 +-
.../apache/maven/plugins/source/AbstractSourceJarMojo.java | 14 +++++++++-----
.../maven/plugins/source/AggregatorSourceJarMojo.java | 10 ++++++++++
.../org/apache/maven/plugins/source/SourceJarMojo.java | 10 +++++++++-
.../apache/maven/plugins/source/SourceJarNoForkMojo.java | 10 ++++++++++
.../maven/plugins/source/TestSourceGeneratedJarMojo.java | 10 +++++++++-
.../org/apache/maven/plugins/source/TestSourceJarMojo.java | 10 +++++++++-
.../maven/plugins/source/TestSourceJarNoForkMojo.java | 10 ++++++++++
8 files changed, 67 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index a5608db..6986189 100644
--- a/pom.xml
+++ b/pom.xml
@@ -148,7 +148,7 @@ under the License.
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>1</version>
- <scope>test</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
diff --git
a/src/main/java/org/apache/maven/plugins/source/AbstractSourceJarMojo.java
b/src/main/java/org/apache/maven/plugins/source/AbstractSourceJarMojo.java
index 74696ea..6f160d0 100644
--- a/src/main/java/org/apache/maven/plugins/source/AbstractSourceJarMojo.java
+++ b/src/main/java/org/apache/maven/plugins/source/AbstractSourceJarMojo.java
@@ -18,6 +18,8 @@
*/
package org.apache.maven.plugins.source;
+import javax.inject.Named;
+
import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
@@ -35,7 +37,6 @@ import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Resource;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectHelper;
@@ -56,6 +57,11 @@ public abstract class AbstractSourceJarMojo extends
AbstractMojo {
private static final String[] DEFAULT_EXCLUDES = new String[] {};
+ protected AbstractSourceJarMojo(MavenProjectHelper projectHelper,
@Named("jar") JarArchiver jarArchiver) {
+ this.projectHelper = projectHelper;
+ this.jarArchiver = jarArchiver;
+ }
+
/**
* List of files to include. Specified as fileset patterns which are
relative to the input directory whose contents
* is being packaged into the JAR.
@@ -102,8 +108,7 @@ public abstract class AbstractSourceJarMojo extends
AbstractMojo {
/**
* The Jar archiver.
*/
- @Component(role = Archiver.class, hint = "jar")
- private JarArchiver jarArchiver;
+ private final JarArchiver jarArchiver;
/**
* The archive configuration to use. See <a
href="http://maven.apache.org/shared/maven-archiver/index.html";>Maven
@@ -165,8 +170,7 @@ public abstract class AbstractSourceJarMojo extends
AbstractMojo {
/**
* Used for attaching the source jar to the project.
*/
- @Component
- private MavenProjectHelper projectHelper;
+ private final MavenProjectHelper projectHelper;
/**
* The directory where the generated archive file will be put.
diff --git
a/src/main/java/org/apache/maven/plugins/source/AggregatorSourceJarMojo.java
b/src/main/java/org/apache/maven/plugins/source/AggregatorSourceJarMojo.java
index 2186bad..3be424c 100644
--- a/src/main/java/org/apache/maven/plugins/source/AggregatorSourceJarMojo.java
+++ b/src/main/java/org/apache/maven/plugins/source/AggregatorSourceJarMojo.java
@@ -18,10 +18,15 @@
*/
package org.apache.maven.plugins.source;
+import javax.inject.Inject;
+import javax.inject.Named;
+
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Execute;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.project.MavenProjectHelper;
+import org.codehaus.plexus.archiver.jar.JarArchiver;
/**
* Aggregate sources for all modules in an aggregator project.
@@ -31,6 +36,11 @@ import org.apache.maven.plugins.annotations.Mojo;
@Mojo(name = "aggregate", defaultPhase = LifecyclePhase.PACKAGE, aggregator =
true, threadSafe = true)
@Execute(phase = LifecyclePhase.GENERATE_SOURCES)
public class AggregatorSourceJarMojo extends SourceJarMojo {
+ @Inject
+ public AggregatorSourceJarMojo(MavenProjectHelper projectHelper,
@Named("jar") JarArchiver jarArchiver) {
+ super(projectHelper, jarArchiver);
+ }
+
/**
* {@inheritDoc}
*/
diff --git a/src/main/java/org/apache/maven/plugins/source/SourceJarMojo.java
b/src/main/java/org/apache/maven/plugins/source/SourceJarMojo.java
index 10dac7e..875fcf9 100644
--- a/src/main/java/org/apache/maven/plugins/source/SourceJarMojo.java
+++ b/src/main/java/org/apache/maven/plugins/source/SourceJarMojo.java
@@ -18,9 +18,14 @@
*/
package org.apache.maven.plugins.source;
+import javax.inject.Inject;
+import javax.inject.Named;
+
import org.apache.maven.plugins.annotations.Execute;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.project.MavenProjectHelper;
+import org.codehaus.plexus.archiver.jar.JarArchiver;
/**
* This plugin bundles all the sources into a jar archive.
@@ -31,5 +36,8 @@ import org.apache.maven.plugins.annotations.Mojo;
@Mojo(name = "jar", defaultPhase = LifecyclePhase.PACKAGE, threadSafe = true)
@Execute(phase = LifecyclePhase.GENERATE_SOURCES)
public class SourceJarMojo extends SourceJarNoForkMojo {
- // no op
+ @Inject
+ public SourceJarMojo(MavenProjectHelper projectHelper, @Named("jar")
JarArchiver jarArchiver) {
+ super(projectHelper, jarArchiver);
+ }
}
diff --git
a/src/main/java/org/apache/maven/plugins/source/SourceJarNoForkMojo.java
b/src/main/java/org/apache/maven/plugins/source/SourceJarNoForkMojo.java
index e621c74..442c6fc 100644
--- a/src/main/java/org/apache/maven/plugins/source/SourceJarNoForkMojo.java
+++ b/src/main/java/org/apache/maven/plugins/source/SourceJarNoForkMojo.java
@@ -18,6 +18,9 @@
*/
package org.apache.maven.plugins.source;
+import javax.inject.Inject;
+import javax.inject.Named;
+
import java.util.Collections;
import java.util.List;
@@ -26,6 +29,8 @@ import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.MavenProjectHelper;
+import org.codehaus.plexus.archiver.jar.JarArchiver;
/**
* This goal bundles all the sources into a jar archive. This goal functions
the same as the jar goal but does not fork
@@ -36,6 +41,11 @@ import org.apache.maven.project.MavenProject;
*/
@Mojo(name = "jar-no-fork", defaultPhase = LifecyclePhase.PACKAGE, threadSafe
= true)
public class SourceJarNoForkMojo extends AbstractSourceJarMojo {
+ @Inject
+ public SourceJarNoForkMojo(MavenProjectHelper projectHelper, @Named("jar")
JarArchiver jarArchiver) {
+ super(projectHelper, jarArchiver);
+ }
+
/**
* @since 2.2
*/
diff --git
a/src/main/java/org/apache/maven/plugins/source/TestSourceGeneratedJarMojo.java
b/src/main/java/org/apache/maven/plugins/source/TestSourceGeneratedJarMojo.java
index b04022d..a2caf28 100644
---
a/src/main/java/org/apache/maven/plugins/source/TestSourceGeneratedJarMojo.java
+++
b/src/main/java/org/apache/maven/plugins/source/TestSourceGeneratedJarMojo.java
@@ -18,9 +18,14 @@
*/
package org.apache.maven.plugins.source;
+import javax.inject.Inject;
+import javax.inject.Named;
+
import org.apache.maven.plugins.annotations.Execute;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.project.MavenProjectHelper;
+import org.codehaus.plexus.archiver.jar.JarArchiver;
/**
* This plugin bundles all the test sources into a jar archive.
@@ -30,5 +35,8 @@ import org.apache.maven.plugins.annotations.Mojo;
@Mojo(name = "generated-test-jar", defaultPhase = LifecyclePhase.PACKAGE,
threadSafe = true)
@Execute(phase = LifecyclePhase.GENERATE_TEST_SOURCES)
public class TestSourceGeneratedJarMojo extends TestSourceJarNoForkMojo {
- // no op
+ @Inject
+ public TestSourceGeneratedJarMojo(MavenProjectHelper projectHelper,
@Named("jar") JarArchiver jarArchiver) {
+ super(projectHelper, jarArchiver);
+ }
}
diff --git
a/src/main/java/org/apache/maven/plugins/source/TestSourceJarMojo.java
b/src/main/java/org/apache/maven/plugins/source/TestSourceJarMojo.java
index 5e4de06..099bb13 100644
--- a/src/main/java/org/apache/maven/plugins/source/TestSourceJarMojo.java
+++ b/src/main/java/org/apache/maven/plugins/source/TestSourceJarMojo.java
@@ -18,9 +18,14 @@
*/
package org.apache.maven.plugins.source;
+import javax.inject.Inject;
+import javax.inject.Named;
+
import org.apache.maven.plugins.annotations.Execute;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.project.MavenProjectHelper;
+import org.codehaus.plexus.archiver.jar.JarArchiver;
/**
* This plugin bundles all the test sources into a jar archive.
@@ -30,5 +35,8 @@ import org.apache.maven.plugins.annotations.Mojo;
@Mojo(name = "test-jar", defaultPhase = LifecyclePhase.PACKAGE, threadSafe =
true)
@Execute(phase = LifecyclePhase.GENERATE_SOURCES)
public class TestSourceJarMojo extends TestSourceJarNoForkMojo {
- // no op
+ @Inject
+ public TestSourceJarMojo(MavenProjectHelper projectHelper, @Named("jar")
JarArchiver jarArchiver) {
+ super(projectHelper, jarArchiver);
+ }
}
diff --git
a/src/main/java/org/apache/maven/plugins/source/TestSourceJarNoForkMojo.java
b/src/main/java/org/apache/maven/plugins/source/TestSourceJarNoForkMojo.java
index f9126c6..8b336a8 100644
--- a/src/main/java/org/apache/maven/plugins/source/TestSourceJarNoForkMojo.java
+++ b/src/main/java/org/apache/maven/plugins/source/TestSourceJarNoForkMojo.java
@@ -18,6 +18,9 @@
*/
package org.apache.maven.plugins.source;
+import javax.inject.Inject;
+import javax.inject.Named;
+
import java.util.Collections;
import java.util.List;
@@ -26,6 +29,8 @@ import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.MavenProjectHelper;
+import org.codehaus.plexus.archiver.jar.JarArchiver;
/**
* This goal bundles all the test sources into a jar archive. This goal
functions the same
@@ -36,6 +41,11 @@ import org.apache.maven.project.MavenProject;
*/
@Mojo(name = "test-jar-no-fork", defaultPhase = LifecyclePhase.PACKAGE,
threadSafe = true)
public class TestSourceJarNoForkMojo extends AbstractSourceJarMojo {
+ @Inject
+ public TestSourceJarNoForkMojo(MavenProjectHelper projectHelper,
@Named("jar") JarArchiver jarArchiver) {
+ super(projectHelper, jarArchiver);
+ }
+
/**
* @since 2.2
*/
