This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/maven-project-info-reports-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 30dcf68 Include forked Java version in project reports (#108)
30dcf68 is described below
commit 30dcf682277b9367748d093bb9e2e61ae7054ef1
Author: Elliotte Rusty Harold <elh...@users.noreply.github.com>
AuthorDate: Sat Mar 8 20:22:59 2025 +0000
Include forked Java version in project reports (#108)
* Remove moot operations
---
.../report/projectinfo/IssueManagementReport.java | 2 +-
.../maven/report/projectinfo/SummaryReport.java | 22 +++++++---------------
.../renderer/DependenciesRenderer.java | 2 +-
.../projectinfo/AbstractProjectInfoTestCase.java | 7 +------
.../projectinfo/PluginManagementReportTest.java | 2 +-
.../projectinfo/ProjectInfoReportUtilsTest.java | 5 +----
.../stubs/DependencyConvergenceStub.java | 10 ----------
.../projectinfo/stubs/ProjectInfoProjectStub.java | 5 -----
8 files changed, 12 insertions(+), 43 deletions(-)
diff --git
a/src/main/java/org/apache/maven/report/projectinfo/IssueManagementReport.java
b/src/main/java/org/apache/maven/report/projectinfo/IssueManagementReport.java
index cd32541..ea50c82 100644
---
a/src/main/java/org/apache/maven/report/projectinfo/IssueManagementReport.java
+++
b/src/main/java/org/apache/maven/report/projectinfo/IssueManagementReport.java
@@ -128,7 +128,7 @@ public class IssueManagementReport extends
AbstractProjectInfoReport {
sink.paragraph();
linkPatternedText(getI18nString("scarab.intro"));
sink.paragraph_();
- } else if (system == null || "".equals(system.trim())) {
+ } else if (system == null || system.trim().isEmpty()) {
paragraph(getI18nString("general.intro"));
} else {
paragraph(getI18nString("custom.intro").replaceFirst("%issueManagementSystem%",
system));
diff --git
a/src/main/java/org/apache/maven/report/projectinfo/SummaryReport.java
b/src/main/java/org/apache/maven/report/projectinfo/SummaryReport.java
index dd5f196..47f7c9e 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/SummaryReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/SummaryReport.java
@@ -147,26 +147,18 @@ public class SummaryReport extends
AbstractProjectInfoReport {
final String pluginId =
"org.apache.maven.plugins:maven-compiler-plugin";
String sourceConfigured = getPluginParameter(pluginId, "source");
String targetConfigured = getPluginParameter(pluginId, "target");
-
String forkFlag = getPluginParameter(pluginId, "fork");
- String compilerVersionConfigured = null;
- if ("true".equalsIgnoreCase(forkFlag)) {
- compilerVersionConfigured = getPluginParameter(pluginId,
"compilerVersion");
- }
- String minimumJavaVersion = compilerVersionConfigured;
- if (targetConfigured != null) {
- minimumJavaVersion = targetConfigured;
+ if ("true".equalsIgnoreCase(forkFlag)) {
+ return getPluginParameter(pluginId, "compilerVersion");
+ } else if (targetConfigured != null) {
+ return targetConfigured;
} else if (sourceConfigured != null) {
- minimumJavaVersion = sourceConfigured;
+ return sourceConfigured;
} else {
// ${maven.compiler.target} default value
- minimumJavaVersion =
project.getProperties().getProperty("maven.compiler.target");
-
- // default to 1.5 if not set?
+ return
project.getProperties().getProperty("maven.compiler.target");
}
-
- return minimumJavaVersion;
}
private void tableRowWithLink(String[] content) {
@@ -179,7 +171,7 @@ public class SummaryReport extends
AbstractProjectInfoReport {
if (cell == null || cell.isEmpty()) {
sink.text("-");
- } else if (ctr == content.length - 1 && cell.length() > 0) {
+ } else if (ctr == content.length - 1) {
sink.link(cell);
sink.text(cell);
sink.link_();
diff --git
a/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
b/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
index dd0e6ea..ce48a98 100644
---
a/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
+++
b/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
@@ -281,7 +281,7 @@ public class DependenciesRenderer extends
AbstractProjectInfoRenderer {
startSection(getI18nString("transitive.title"));
- if (dependenciesByScope.values().isEmpty()) {
+ if (dependenciesByScope.isEmpty()) {
paragraph(getI18nString("transitive.nolist"));
} else {
paragraph(getI18nString("transitive.intro"));
diff --git
a/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java
b/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java
index 120555f..48dee21 100644
---
a/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java
+++
b/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java
@@ -57,7 +57,7 @@ public abstract class AbstractProjectInfoTestCase extends
AbstractMojoTestCase {
private ArtifactStubFactory artifactStubFactory;
/**
- * The current project to be test.
+ * The current project to be tested.
*/
private MavenProject testMavenProject;
@@ -80,11 +80,6 @@ public abstract class AbstractProjectInfoTestCase extends
AbstractMojoTestCase {
artifactStubFactory.getWorkingDir().mkdirs();
}
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
/**
* Gets a trimmed String for the given key from the resource bundle
defined by Plexus.
*
diff --git
a/src/test/java/org/apache/maven/report/projectinfo/PluginManagementReportTest.java
b/src/test/java/org/apache/maven/report/projectinfo/PluginManagementReportTest.java
index eae4984..0ad6500 100644
---
a/src/test/java/org/apache/maven/report/projectinfo/PluginManagementReportTest.java
+++
b/src/test/java/org/apache/maven/report/projectinfo/PluginManagementReportTest.java
@@ -59,7 +59,7 @@ public class PluginManagementReportTest extends
AbstractProjectInfoTestCase {
.thenAnswer(new Answer<ProjectBuildingResult>() {
@Override
public ProjectBuildingResult answer(InvocationOnMock
invocation) throws Throwable {
- return createProjectBuildingResult((Artifact)
invocation.getArgument(0), "http://m.a.o/";);
+ return
createProjectBuildingResult(invocation.getArgument(0), "http://m.a.o/";);
}
});
diff --git
a/src/test/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtilsTest.java
b/src/test/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtilsTest.java
index 0ff3b55..f703f2a 100644
---
a/src/test/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtilsTest.java
+++
b/src/test/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtilsTest.java
@@ -57,6 +57,7 @@ public class ProjectInfoReportUtilsTest extends
AbstractMojoTestCase {
private Server jettyServer;
+ @Override
protected void setUp() throws Exception {
super.setUp();
@@ -101,10 +102,6 @@ public class ProjectInfoReportUtilsTest extends
AbstractMojoTestCase {
};
}
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
public void testGetInputStreamURL() throws Exception {
assertTrue(ProjectInfoReportUtils.isArtifactUrlValid("http://my.intern.domain:8080/test";));
diff --git
a/src/test/java/org/apache/maven/report/projectinfo/stubs/DependencyConvergenceStub.java
b/src/test/java/org/apache/maven/report/projectinfo/stubs/DependencyConvergenceStub.java
index 74dc765..e088703 100644
---
a/src/test/java/org/apache/maven/report/projectinfo/stubs/DependencyConvergenceStub.java
+++
b/src/test/java/org/apache/maven/report/projectinfo/stubs/DependencyConvergenceStub.java
@@ -18,11 +18,6 @@
*/
package org.apache.maven.report.projectinfo.stubs;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.maven.model.Dependency;
-
/**
* @author <a href="mailto:vincent.sive...@gmail.com";>Vincent Siveton</a>
* @version $Id$
@@ -41,9 +36,4 @@ public class DependencyConvergenceStub extends
ProjectInfoProjectStub {
protected String getPOM() {
return "dependency-convergence-plugin-config.xml";
}
-
- @Override
- public List<Dependency> getDependencies() {
- return Collections.emptyList();
- }
}
diff --git
a/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java
b/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java
index 92143a2..ae10e9b 100644
---
a/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java
+++
b/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java
@@ -130,11 +130,6 @@ public abstract class ProjectInfoProjectStub extends
MavenProjectStub {
return new File(getBasedir(), getPOM());
}
- @Override
- public Set<Artifact> getArtifacts() {
- return Collections.emptySet();
- }
-
@Override
public List<ArtifactRepository> getRemoteArtifactRepositories() {
ArtifactRepository repository = new MavenArtifactRepository(
