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 652d4614e2f8f7d4157b79cad23b4d9e58b90ad0 Author: Michael Osipov <[email protected]> AuthorDate: Sat Jun 22 12:21:10 2024 +0200 [MPIR-464] Upgrade to Maven Shared JAR 3.1.1 Co-authored-by: Gabriel Belingueres <[email protected]> --- pom.xml | 6 +----- src/it/MPIR-455/verify.groovy | 18 +++++++++--------- .../dependencies/renderer/DependenciesRenderer.java | 10 ++++++---- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml index 8e58571..8930333 100644 --- a/pom.xml +++ b/pom.xml @@ -185,14 +185,10 @@ under the License. <version>3.4.2</version> <scope>test</scope> </dependency> - <!-- - TODO: Correct the JAR root content entries count workaround used - to generate dependencies section when MSHARED-1411 is fixed. - --> <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-shared-jar</artifactId> - <version>3.1.0</version> + <version>3.1.1</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 98bcb88..5d0db2f 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 @@ -632,14 +632,16 @@ public class DependenciesRenderer extends AbstractProjectInfoRenderer { for (JarVersionedRuntime versionedRuntime : versionedRuntimeList) { JarClasses versionedJarClasses = versionedRuntime.getJarClasses(); - debugInformationCellValue = - versionedJarClasses.isDebugPresent() ? debugInformationCellYes : debugInformationCellNo; + debugInformationCellValue = versionedJarClasses.isDebugPresent() + ? debugInformationCellYes + : debugInformationCellNo; tableRow(hasSealed, new String[] { versionedTag, "", - String.valueOf(versionedRuntime.getEntries().size()), - String.valueOf(versionedJarClasses.getClassNames().size()), + String.valueOf(versionedRuntime.getNumEntries()), + String.valueOf( + versionedJarClasses.getClassNames().size()), String.valueOf(versionedJarClasses.getPackages().size()), versionedJarClasses.getJdkRevision(), debugInformationCellValue,
