[MPIR-464] Upgrade to Maven Shared JAR 3.1.1

Co-authored-by: Gabriel Belingueres <belingueres@gmail.com> This closes #73
apache · Jun 22, 2024 · d3159ac · d3159ac
1 parent 9ba89c9
commit d3159ac
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 18 deletions.
diff --git 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
@@ -30,15 +30,15 @@ def summaryLine = '''\
 <tr class="a">
 <td align="left">&#160;&#160;&#160;&#x2022; 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>
 <td align="center">-</td></tr>
 <tr class="b">
 <td align="left">&#160;&#160;&#160;&#x2022; 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,23 +54,23 @@ def summaryLine = '''\
 <tr class="b">
 <td align="left">&#160;&#160;&#160;&#x2022; 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>
 <td align="center">Yes</td></tr>
 <tr class="a">
 <td align="left">&#160;&#160;&#160;&#x2022; 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>
 <td align="center">Yes</td></tr>
 <tr class="b">
 <td align="left">&#160;&#160;&#160;&#x2022; 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,31 +86,31 @@ def summaryLine = '''\
 <tr class="b">
 <td align="left">&#160;&#160;&#160;&#x2022; 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>
 <td align="center">Yes</td></tr>
 <tr class="a">
 <td align="left">&#160;&#160;&#160;&#x2022; 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>
 <td align="center">Yes</td></tr>
 <tr class="b">
 <td align="left">&#160;&#160;&#160;&#x2022; 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>
 <td align="center">Yes</td></tr>
 <tr class="a">
 <td align="left">&#160;&#160;&#160;&#x2022; 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/.../java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java b/.../java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
@@ -632,14 +632,16 @@ private void renderSectionDependencyFileDetails() {
                         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,