You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2024/06/22 10:27:23 UTC
(maven-project-info-reports-plugin) branch maven-shared-jar-3.1.1 updated (4336a4f -> 46602c2)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch maven-shared-jar-3.1.1
in repository https://gitbox.apache.org/repos/asf/maven-project-info-reports-plugin.git
discard 4336a4f [MPIR-462] IT for MR-jar troubling :dependencies goal
discard 866684c maven-shared-jar-3.1.1
add b08af0c Improve variable name
add 870d7bf Improve variable name (2)
add 9ba89c9 Fix SCM tag
new 652d461 [MPIR-464] Upgrade to Maven Shared JAR 3.1.1
new be549e9 [MPIR-463] Remove workaround to count the number of root content entries in JAR files
new 46602c2 [MPIR-462] IT for MRJAR issue with dependencies goal
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (4336a4f)
\
N -- N -- N refs/heads/maven-shared-jar-3.1.1 (46602c2)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
(maven-project-info-reports-plugin) 01/03: [MPIR-464] Upgrade to Maven Shared JAR 3.1.1
Posted by mi...@apache.org.
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 <mi...@apache.org>
AuthorDate: Sat Jun 22 12:21:10 2024 +0200
[MPIR-464] Upgrade to Maven Shared JAR 3.1.1
Co-authored-by: Gabriel Belingueres <be...@gmail.com>
---
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,
(maven-project-info-reports-plugin) 02/03: [MPIR-463] Remove workaround to count the number of root content entries in JAR files
Posted by mi...@apache.org.
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 be549e9553269158964658eb5588b56544cf725d
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Jun 22 12:21:39 2024 +0200
[MPIR-463] Remove workaround to count the number of root content entries in JAR files
Co-authored-by: Gabriel Belingueres <be...@gmail.com>
---
.../dependencies/renderer/DependenciesRenderer.java | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
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 5d0db2f..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
@@ -609,19 +609,11 @@ public class DependenciesRenderer extends AbstractProjectInfoRenderer {
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 = jarData.getNumEntries() - versionedNumEntries;
-
// root content information row
tableRow(hasSealed, new String[] {
rootTag,
"",
- String.valueOf(rootContentNumEntries),
+ String.valueOf(jarData.getNumRootEntries()),
String.valueOf(jarData.getNumClasses()),
String.valueOf(jarData.getNumPackages()),
jdkRevisionCellValue,
(maven-project-info-reports-plugin) 03/03: [MPIR-462] IT for MRJAR issue with dependencies goal
Posted by mi...@apache.org.
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 46602c2a12eae387c68d0efa1f1cc919c4342242
Author: Piotrek Żygieło <pz...@users.noreply.github.com>
AuthorDate: Mon Jun 17 13:55:49 2024 +0200
[MPIR-462] IT for MRJAR issue with dependencies goal
This closes #72
---
src/it/MPIR-462/invoker.properties | 18 +++++++++
src/it/MPIR-462/pom.xml | 75 ++++++++++++++++++++++++++++++++++++++
2 files changed, 93 insertions(+)
diff --git a/src/it/MPIR-462/invoker.properties b/src/it/MPIR-462/invoker.properties
new file mode 100644
index 0000000..4afd7fd
--- /dev/null
+++ b/src/it/MPIR-462/invoker.properties
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+invoker.goals = ${project.groupId}:${project.artifactId}:${project.version}:dependencies
diff --git a/src/it/MPIR-462/pom.xml b/src/it/MPIR-462/pom.xml
new file mode 100644
index 0000000..001fd94
--- /dev/null
+++ b/src/it/MPIR-462/pom.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.project-info-reports.its</groupId>
+ <artifactId>MPIR-462</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <url>http://maven.apache.org/plugins/it/${project.artifactId}</url>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ </properties>
+
+ <dependencies>
+ <!-- an example of a dependency with a problematic MR classes -->
+ <dependency>
+ <groupId>io.projectreactor</groupId>
+ <artifactId>reactor-core</artifactId>
+ <version>3.6.7</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>@sitePluginVersion@</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>@project.version@</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>dependencies</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>