This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch maven-shared-jar-3.1.1 in repository https://gitbox.apache.org/repos/asf/maven-project-info-reports-plugin.git
commit 866684ce5ecb085b1b0d2a992177932a795a84d1 Author: Michael Osipov <[email protected]> AuthorDate: Thu Jun 20 22:29:19 2024 +0200 maven-shared-jar-3.1.1 --- pom.xml | 2 +- src/it/MPIR-455/verify.groovy | 18 +++---- .../renderer/DependenciesRenderer.java | 63 +++++++++------------- 3 files changed, 35 insertions(+), 48 deletions(-) diff --git a/pom.xml b/pom.xml index 8a246cf..e307d05 100644 --- a/pom.xml +++ b/pom.xml @@ -192,7 +192,7 @@ under the License. <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-shared-jar</artifactId> - <version>3.1.0</version> + <version>3.1.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.maven.resolver</groupId> diff --git a/src/it/MPIR-455/verify.groovy b/src/it/MPIR-455/verify.groovy index eb695df..f8f2f00 100644 --- a/src/it/MPIR-455/verify.groovy +++ b/src/it/MPIR-455/verify.groovy @@ -30,7 +30,7 @@ def summaryLine = '''\ <tr class="a"> <td align="left">   • Root</td> <td align="right">-</td> -<td align="right">9</td> +<td align="right">8</td> <td align="right">0</td> <td align="right">0</td> <td align="center">-</td> @@ -38,7 +38,7 @@ def summaryLine = '''\ <tr class="b"> <td align="left">   • Versioned</td> <td align="right">-</td> -<td align="right">1</td> +<td align="right">2</td> <td align="right">1</td> <td align="right">1</td> <td align="center">11</td> @@ -54,7 +54,7 @@ def summaryLine = '''\ <tr class="b"> <td align="left">   • Root</td> <td align="right">-</td> -<td align="right">19</td> +<td align="right">17</td> <td align="right">1</td> <td align="right">1</td> <td align="center">1.8</td> @@ -62,7 +62,7 @@ def summaryLine = '''\ <tr class="a"> <td align="left">   • Versioned</td> <td align="right">-</td> -<td align="right">9</td> +<td align="right">10</td> <td align="right">1</td> <td align="right">1</td> <td align="center">9</td> @@ -70,7 +70,7 @@ def summaryLine = '''\ <tr class="b"> <td align="left">   • Versioned</td> <td align="right">-</td> -<td align="right">9</td> +<td align="right">10</td> <td align="right">1</td> <td align="right">1</td> <td align="center">11</td> @@ -86,7 +86,7 @@ def summaryLine = '''\ <tr class="b"> <td align="left">   • Root</td> <td align="right">-</td> -<td align="right">113</td> +<td align="right">110</td> <td align="right">86</td> <td align="right">7</td> <td align="center">1.8</td> @@ -94,7 +94,7 @@ def summaryLine = '''\ <tr class="a"> <td align="left">   • Versioned</td> <td align="right">-</td> -<td align="right">5</td> +<td align="right">6</td> <td align="right">1</td> <td align="right">1</td> <td align="center">9</td> @@ -102,7 +102,7 @@ def summaryLine = '''\ <tr class="b"> <td align="left">   • Versioned</td> <td align="right">-</td> -<td align="right">5</td> +<td align="right">6</td> <td align="right">1</td> <td align="right">1</td> <td align="center">10</td> @@ -110,7 +110,7 @@ def summaryLine = '''\ <tr class="a"> <td align="left">   • Versioned</td> <td align="right">-</td> -<td align="right">5</td> +<td align="right">6</td> <td align="right">1</td> <td align="right">1</td> <td align="center">11</td> 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 81d8128..9fc57ce 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 @@ -550,13 +550,13 @@ public class DependenciesRenderer extends AbstractProjectInfoRenderer { if (JAR_SUBTYPE.contains(artifact.getType().toLowerCase())) { try { - JarData jarDetails = dependencies.getJarDependencyDetails(artifact); + JarData jarData = dependencies.getJarDependencyDetails(artifact); - totalentries.addTotal(jarDetails.getNumEntries(), artifact.getScope()); - totalclasses.addTotal(jarDetails.getNumClasses(), artifact.getScope()); - totalpackages.addTotal(jarDetails.getNumPackages(), artifact.getScope()); + totalentries.addTotal(jarData.getNumEntries(), artifact.getScope()); + totalclasses.addTotal(jarData.getNumClasses(), artifact.getScope()); + totalpackages.addTotal(jarData.getNumPackages(), artifact.getScope()); - String jdkRevisionCellValue = jarDetails.getJdkRevision(); + String jdkRevisionCellValue = jarData.getJdkRevision(); String debugInformationCellValue = null; String sealedCellValue = null; @@ -574,13 +574,13 @@ public class DependenciesRenderer extends AbstractProjectInfoRenderer { } debugInformationCellValue = debugInformationCellNo; - if (jarDetails.isDebugPresent()) { + if (jarData.isDebugPresent()) { debugInformationCellValue = debugInformationCellYes; totalDebugInformation.incrementTotal(artifact.getScope()); } sealedCellValue = sealedCellNo; - if (jarDetails.isSealed()) { + if (jarData.isSealed()) { sealedCellValue = sealedCellYes; totalsealed.incrementTotal(artifact.getScope()); } @@ -595,60 +595,47 @@ public class DependenciesRenderer extends AbstractProjectInfoRenderer { fileLength = "-"; } - if (jarDetails.isMultiRelease()) { + if (jarData.isMultiRelease()) { String htmlBullet = "   • "; String rootTag = htmlBullet + getI18nString("file.details.multirelease.root"); String versionedTag = htmlBullet + getI18nString("file.details.multirelease.versioned"); // general jar information row tableRow(hasSealed, new String[] { - name, - fileLength, - String.valueOf(jarDetails.getNumEntries()), - "", - "", - "", - "", - sealedCellValue + name, fileLength, String.valueOf(jarData.getNumEntries()), "", "", "", "", sealedCellValue }); - JarVersionedRuntimes versionedRuntimes = jarDetails.getVersionedRuntimes(); + JarVersionedRuntimes versionedRuntimes = jarData.getVersionedRuntimes(); Collection<JarVersionedRuntime> versionedRuntimeList = versionedRuntimes.getVersionedRuntimeMap().values(); - // workaround to count the number of root content entries - // TODO: rework this when MSHARED-1411 is fixed - Integer versionedNumEntries = versionedRuntimeList.stream() - .map(versionedRuntime -> - versionedRuntime.getEntries().size()) - .reduce(0, Integer::sum); - Integer rootContentNumEntries = jarDetails.getNumEntries() - versionedNumEntries; - // root content information row tableRow(hasSealed, new String[] { rootTag, "", - String.valueOf(rootContentNumEntries), - String.valueOf(jarDetails.getNumClasses()), - String.valueOf(jarDetails.getNumPackages()), + String.valueOf(jarData.getNumRootEntries()), + String.valueOf(jarData.getNumClasses()), + String.valueOf(jarData.getNumPackages()), jdkRevisionCellValue, debugInformationCellValue, "" }); for (JarVersionedRuntime versionedRuntime : versionedRuntimeList) { - JarClasses rtJarClasses = versionedRuntime.getJarClasses(); + JarClasses versionedJarClasses = versionedRuntime.getJarClasses(); - debugInformationCellValue = - rtJarClasses.isDebugPresent() ? debugInformationCellYes : debugInformationCellNo; + debugInformationCellValue = versionedJarClasses.isDebugPresent() + ? debugInformationCellYes + : debugInformationCellNo; tableRow(hasSealed, new String[] { versionedTag, "", - String.valueOf(versionedRuntime.getEntries().size()), - String.valueOf(rtJarClasses.getClassNames().size()), - String.valueOf(rtJarClasses.getPackages().size()), - rtJarClasses.getJdkRevision(), + String.valueOf(versionedRuntime.getNumEntries()), + String.valueOf( + versionedJarClasses.getClassNames().size()), + String.valueOf(versionedJarClasses.getPackages().size()), + versionedJarClasses.getJdkRevision(), debugInformationCellValue, "" }); @@ -657,9 +644,9 @@ public class DependenciesRenderer extends AbstractProjectInfoRenderer { tableRow(hasSealed, new String[] { name, fileLength, - String.valueOf(jarDetails.getNumEntries()), - String.valueOf(jarDetails.getNumClasses()), - String.valueOf(jarDetails.getNumPackages()), + String.valueOf(jarData.getNumEntries()), + String.valueOf(jarData.getNumClasses()), + String.valueOf(jarData.getNumPackages()), jdkRevisionCellValue, debugInformationCellValue, sealedCellValue
