Skip to content

Commit

Permalink
[MPIR-464] Upgrade to Maven Shared JAR 3.1.1
Browse files Browse the repository at this point in the history
Co-authored-by: Gabriel Belingueres <belingueres@gmail.com>

This closes #73
  • Loading branch information
michael-o committed Jun 23, 2024
1 parent 740536d commit 790b646
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 15 deletions.
6 changes: 1 addition & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
18 changes: 9 additions & 9 deletions src/it/MPIR-455/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,7 @@ private void renderSectionDependencyFileDetails() {
tableRow(hasSealed, new String[] {
versionedTag,
"",
String.valueOf(versionedRuntime.getEntries().size()),
String.valueOf(versionedRuntime.getNumEntries()),
String.valueOf(
versionedJarClasses.getClassNames().size()),
String.valueOf(versionedJarClasses.getPackages().size()),
Expand Down

0 comments on commit 790b646

Please sign in to comment.