This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-artifact-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new c0ab513 replace reactorProjects pseudo-parameter with
session.getProjects()
c0ab513 is described below
commit c0ab5135f9208b72e58a7b89bba48593a31674f1
Author: Hervé Boutemy <hbout...@apache.org>
AuthorDate: Sat Dec 2 19:52:03 2023 +0100
replace reactorProjects pseudo-parameter with session.getProjects()
---
.../artifact/buildinfo/AbstractBuildinfoMojo.java | 22 ++++++++--------------
.../artifact/buildinfo/CheckBuildPlanMojo.java | 9 +++------
.../plugins/artifact/buildinfo/CompareMojo.java | 2 +-
3 files changed, 12 insertions(+), 21 deletions(-)
diff --git
a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/AbstractBuildinfoMojo.java
b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/AbstractBuildinfoMojo.java
index e9543af..2c0b632 100644
---
a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/AbstractBuildinfoMojo.java
+++
b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/AbstractBuildinfoMojo.java
@@ -58,12 +58,6 @@ public abstract class AbstractBuildinfoMojo extends
AbstractMojo {
@Component
protected MavenProject project;
- /**
- * The reactor projects.
- */
- @Parameter(defaultValue = "${reactorProjects}", required = true, readonly
= true)
- protected List<MavenProject> reactorProjects;
-
/**
* Location of the generated buildinfo file.
*/
@@ -114,7 +108,7 @@ public abstract class AbstractBuildinfoMojo extends
AbstractMojo {
* The current build session instance. This is used for toolchain manager
API calls.
*/
@Component
- private MavenSession session;
+ protected MavenSession session;
/**
* Timestamp for reproducible output archive entries, either formatted as
ISO 8601
@@ -140,9 +134,9 @@ public abstract class AbstractBuildinfoMojo extends
AbstractMojo {
@Override
public void execute() throws MojoExecutionException {
- boolean mono = reactorProjects.size() == 1;
+ boolean mono = session.getProjects().size() == 1;
- hasBadOutputTimestamp(outputTimestamp, getLog(), project,
reactorProjects);
+ hasBadOutputTimestamp(outputTimestamp, getLog(), project,
session.getProjects());
if (!mono) {
// if module skips install and/or deploy
@@ -213,7 +207,7 @@ public abstract class AbstractBuildinfoMojo extends
AbstractMojo {
}
protected void copyAggregateToRoot(File aggregate) throws
MojoExecutionException {
- if (reactorProjects.size() == 1) {
+ if (session.getProjects().size() == 1) {
// mono-module, no aggregate file to deal with
return;
}
@@ -257,7 +251,7 @@ public abstract class AbstractBuildinfoMojo extends
AbstractMojo {
if (mono) {
bi.printArtifacts(project);
} else {
- for (MavenProject project : reactorProjects) {
+ for (MavenProject project : session.getProjects()) {
if (!isSkip(project)) {
bi.printArtifacts(project);
}
@@ -275,7 +269,7 @@ public abstract class AbstractBuildinfoMojo extends
AbstractMojo {
}
protected MavenProject getExecutionRoot() {
- for (MavenProject p : reactorProjects) {
+ for (MavenProject p : session.getProjects()) {
if (p.isExecutionRoot()) {
return p;
}
@@ -284,9 +278,9 @@ public abstract class AbstractBuildinfoMojo extends
AbstractMojo {
}
private MavenProject getLastProject() {
- int i = reactorProjects.size();
+ int i = session.getProjects().size();
while (i > 0) {
- MavenProject project = reactorProjects.get(--i);
+ MavenProject project = session.getProjects().get(--i);
if (!isSkip(project)) {
return project;
}
diff --git
a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/CheckBuildPlanMojo.java
b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/CheckBuildPlanMojo.java
index d74249a..1f29371 100644
---
a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/CheckBuildPlanMojo.java
+++
b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/CheckBuildPlanMojo.java
@@ -23,7 +23,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
import java.util.HashSet;
-import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
@@ -49,9 +48,6 @@ import org.apache.maven.project.MavenProject;
*/
@Mojo(name = "check-buildplan", threadSafe = true, requiresProject = true)
public class CheckBuildPlanMojo extends AbstractMojo {
- @Parameter(defaultValue = "${reactorProjects}", required = true, readonly
= true)
- private List<MavenProject> reactorProjects;
-
@Component
private MavenProject project;
@@ -95,7 +91,8 @@ public class CheckBuildPlanMojo extends AbstractMojo {
@Override
public void execute() throws MojoExecutionException {
- boolean fail =
AbstractBuildinfoMojo.hasBadOutputTimestamp(outputTimestamp, getLog(), project,
reactorProjects);
+ boolean fail =
+ AbstractBuildinfoMojo.hasBadOutputTimestamp(outputTimestamp,
getLog(), project, session.getProjects());
// TODO check maven-jar-plugin module-info.class?
@@ -145,7 +142,7 @@ public class CheckBuildPlanMojo extends AbstractMojo {
MavenProject parent = project;
while (true) {
parent = parent.getParent();
- if ((parent == null) || !reactorProjects.contains(parent)) {
+ if ((parent == null) ||
!session.getProjects().contains(parent)) {
break;
}
getLog().info(" parent pom.xml is " +
parent.getBasedir() + "/pom.xml");
diff --git
a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/CompareMojo.java
b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/CompareMojo.java
index 02a5cf8..c6d913e 100644
--- a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/CompareMojo.java
+++ b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/CompareMojo.java
@@ -110,7 +110,7 @@ public class CompareMojo extends AbstractBuildinfoMojo {
@Override
public void execute(Map<Artifact, String> artifacts) throws
MojoExecutionException {
getLog().info("Checking against reference build from " + referenceRepo
+ "...");
- checkAgainstReference(artifacts, reactorProjects.size() == 1);
+ checkAgainstReference(artifacts, session.getProjects().size() == 1);
}
@Override
