Skip to content

Commit 790b646

Browse files
committed
[MPIR-464] Upgrade to Maven Shared JAR 3.1.1
Co-authored-by: Gabriel Belingueres <[email protected]> This closes #73
1 parent 740536d commit 790b646

File tree

3 files changed

+11
-15
lines changed

3 files changed

+11
-15
lines changed

pom.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -185,14 +185,10 @@ under the License.
185185
<version>3.4.2</version>
186186
<scope>test</scope>
187187
</dependency>
188-
<!--
189-
TODO: Correct the JAR root content entries count workaround used
190-
to generate dependencies section when MSHARED-1411 is fixed.
191-
-->
192188
<dependency>
193189
<groupId>org.apache.maven.shared</groupId>
194190
<artifactId>maven-shared-jar</artifactId>
195-
<version>3.1.0</version>
191+
<version>3.1.1</version>
196192
</dependency>
197193
<dependency>
198194
<groupId>org.apache.maven.resolver</groupId>

src/it/MPIR-455/verify.groovy

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ def summaryLine = '''\
3030
<tr class="a">
3131
<td align="left">&#160;&#160;&#160;&#x2022; Root</td>
3232
<td align="right">-</td>
33-
<td align="right">9</td>
33+
<td align="right">8</td>
3434
<td align="right">0</td>
3535
<td align="right">0</td>
3636
<td align="center">-</td>
3737
<td align="center">-</td></tr>
3838
<tr class="b">
3939
<td align="left">&#160;&#160;&#160;&#x2022; Versioned</td>
4040
<td align="right">-</td>
41-
<td align="right">1</td>
41+
<td align="right">2</td>
4242
<td align="right">1</td>
4343
<td align="right">1</td>
4444
<td align="center">11</td>
@@ -54,23 +54,23 @@ def summaryLine = '''\
5454
<tr class="b">
5555
<td align="left">&#160;&#160;&#160;&#x2022; Root</td>
5656
<td align="right">-</td>
57-
<td align="right">19</td>
57+
<td align="right">17</td>
5858
<td align="right">1</td>
5959
<td align="right">1</td>
6060
<td align="center">1.8</td>
6161
<td align="center">Yes</td></tr>
6262
<tr class="a">
6363
<td align="left">&#160;&#160;&#160;&#x2022; Versioned</td>
6464
<td align="right">-</td>
65-
<td align="right">9</td>
65+
<td align="right">10</td>
6666
<td align="right">1</td>
6767
<td align="right">1</td>
6868
<td align="center">9</td>
6969
<td align="center">Yes</td></tr>
7070
<tr class="b">
7171
<td align="left">&#160;&#160;&#160;&#x2022; Versioned</td>
7272
<td align="right">-</td>
73-
<td align="right">9</td>
73+
<td align="right">10</td>
7474
<td align="right">1</td>
7575
<td align="right">1</td>
7676
<td align="center">11</td>
@@ -86,31 +86,31 @@ def summaryLine = '''\
8686
<tr class="b">
8787
<td align="left">&#160;&#160;&#160;&#x2022; Root</td>
8888
<td align="right">-</td>
89-
<td align="right">113</td>
89+
<td align="right">110</td>
9090
<td align="right">86</td>
9191
<td align="right">7</td>
9292
<td align="center">1.8</td>
9393
<td align="center">Yes</td></tr>
9494
<tr class="a">
9595
<td align="left">&#160;&#160;&#160;&#x2022; Versioned</td>
9696
<td align="right">-</td>
97-
<td align="right">5</td>
97+
<td align="right">6</td>
9898
<td align="right">1</td>
9999
<td align="right">1</td>
100100
<td align="center">9</td>
101101
<td align="center">Yes</td></tr>
102102
<tr class="b">
103103
<td align="left">&#160;&#160;&#160;&#x2022; Versioned</td>
104104
<td align="right">-</td>
105-
<td align="right">5</td>
105+
<td align="right">6</td>
106106
<td align="right">1</td>
107107
<td align="right">1</td>
108108
<td align="center">10</td>
109109
<td align="center">Yes</td></tr>
110110
<tr class="a">
111111
<td align="left">&#160;&#160;&#160;&#x2022; Versioned</td>
112112
<td align="right">-</td>
113-
<td align="right">5</td>
113+
<td align="right">6</td>
114114
<td align="right">1</td>
115115
<td align="right">1</td>
116116
<td align="center">11</td>

src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ private void renderSectionDependencyFileDetails() {
639639
tableRow(hasSealed, new String[] {
640640
versionedTag,
641641
"",
642-
String.valueOf(versionedRuntime.getEntries().size()),
642+
String.valueOf(versionedRuntime.getNumEntries()),
643643
String.valueOf(
644644
versionedJarClasses.getClassNames().size()),
645645
String.valueOf(versionedJarClasses.getPackages().size()),

0 commit comments

Comments
 (0)