You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2023/05/31 15:21:53 UTC
[maven-project-info-reports-plugin] branch simple-fix updated (ca3b99a -> 3c37be2)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch simple-fix
in repository https://gitbox.apache.org/repos/asf/maven-project-info-reports-plugin.git
discard ca3b99a fix2
discard fb20f2f fix
new a38c46b fix
new 3c37be2 fix2
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (ca3b99a)
\
N -- N -- N refs/heads/simple-fix (3c37be2)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 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.
Summary of changes:
.../dependencies/renderer/DependenciesRenderer.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
[maven-project-info-reports-plugin] 01/02: fix
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch simple-fix
in repository https://gitbox.apache.org/repos/asf/maven-project-info-reports-plugin.git
commit a38c46bd149aa0cae39a5abdb5d34106275cb3db
Author: Michael Osipov <mi...@siemens.com>
AuthorDate: Wed May 31 17:21:15 2023 +0200
fix
---
.../projectinfo/dependencies/renderer/DependenciesRenderer.java | 5 +++++
1 file changed, 5 insertions(+)
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 d4c6b84..be6dfa6 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
@@ -533,6 +533,11 @@ public class DependenciesRenderer extends AbstractProjectInfoRenderer {
+ " and won't be listed in dependency files details.");
continue;
}
+ if (SummaryTableRowOrder.fromScope(artifact.getScope()) == null) {
+ log.warn("Artifact " + artifact.getId() + " has invalid scope"
+ + " and won't be listed in dependency files details.");
+ continue;
+ }
File artifactFile = dependencies.getFile(artifact);
[maven-project-info-reports-plugin] 02/02: fix2
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch simple-fix
in repository https://gitbox.apache.org/repos/asf/maven-project-info-reports-plugin.git
commit 3c37be2819cd091cd412792d40edce3947c4b675
Author: Michael Osipov <mi...@siemens.com>
AuthorDate: Wed May 31 10:02:03 2023 +0200
fix2
---
.../renderer/DependenciesRenderer.java | 38 ++++++++++++----------
1 file changed, 21 insertions(+), 17 deletions(-)
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 be6dfa6..bc0a31d 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
@@ -548,34 +548,38 @@ public class DependenciesRenderer extends AbstractProjectInfoRenderer {
try {
JarData jarDetails = dependencies.getJarDependencyDetails(artifact);
- String debugInformationCellValue = debugInformationCellNo;
- if (jarDetails.isDebugPresent()) {
- debugInformationCellValue = debugInformationCellYes;
- totalDebugInformation.incrementTotal(artifact.getScope());
- }
-
totalentries.addTotal(jarDetails.getNumEntries(), artifact.getScope());
totalclasses.addTotal(jarDetails.getNumClasses(), artifact.getScope());
totalpackages.addTotal(jarDetails.getNumPackages(), artifact.getScope());
- try {
- if (jarDetails.getJdkRevision() != null) {
- double jdkRevision = Double.parseDouble(jarDetails.getJdkRevision());
+ String jdkRevisionCellValue = jarDetails.getJdkRevision();
+ String debugInformationCellValue = null;
+ String sealedCellValue = null;
+
+ if (jdkRevisionCellValue != null) {
+ try {
+ double jdkRevision = Double.parseDouble(jdkRevisionCellValue);
boolean isTestScope = Artifact.SCOPE_TEST.equalsIgnoreCase(artifact.getScope());
if (isTestScope) {
highestTestJavaVersion = Math.max(highestTestJavaVersion, jdkRevision);
} else {
highestNonTestJavaVersion = Math.max(highestNonTestJavaVersion, jdkRevision);
}
+ } catch (NumberFormatException e) {
+ // ignore
}
- } catch (NumberFormatException e) {
- // ignore
- }
- String sealedCellValue = sealedCellNo;
- if (jarDetails.isSealed()) {
- sealedCellValue = sealedCellYes;
- totalsealed.incrementTotal(artifact.getScope());
+ debugInformationCellValue = debugInformationCellNo;
+ if (jarDetails.isDebugPresent()) {
+ debugInformationCellValue = debugInformationCellYes;
+ totalDebugInformation.incrementTotal(artifact.getScope());
+ }
+
+ sealedCellValue = sealedCellNo;
+ if (jarDetails.isSealed()) {
+ sealedCellValue = sealedCellYes;
+ totalsealed.incrementTotal(artifact.getScope());
+ }
}
String name = artifactFile.getName();
@@ -593,7 +597,7 @@ public class DependenciesRenderer extends AbstractProjectInfoRenderer {
String.valueOf(jarDetails.getNumEntries()),
String.valueOf(jarDetails.getNumClasses()),
String.valueOf(jarDetails.getNumPackages()),
- jarDetails.getJdkRevision(),
+ jdkRevisionCellValue,
debugInformationCellValue,
sealedCellValue
});