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 2022/07/07 12:42:23 UTC
[maven-project-info-reports-plugin] branch MPIR-421 updated (089f430 -> 91d0efe)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MPIR-421
in repository https://gitbox.apache.org/repos/asf/maven-project-info-reports-plugin.git
discard 089f430 [MPIR-421] Make all ITs with site.xml use an explicit skin
add eeb81c8 [MPIR-407] Provide a way to map license names
add 3846376 [MPIR-420] Uprade dependencies
new 91d0efe [MPIR-421] Make all ITs with site.xml use an explicit skin
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 (089f430)
\
N -- N -- N refs/heads/MPIR-421 (91d0efe)
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 1 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 | 12 +++----
src/it/{MPIR-412 => MPIR-407}/invoker.properties | 4 +--
src/it/{MPIR-412 => MPIR-407}/pom.xml | 25 +++++++++++---
.../its/main/Main.java => MPIR-407/verify.groovy} | 10 ++----
.../projectinfo/AbstractProjectInfoReport.java | 24 +++++++++++++
.../report/projectinfo/DependenciesReport.java | 2 +-
.../projectinfo/DependencyManagementReport.java | 2 +-
.../maven/report/projectinfo/LicenseMapping.java} | 39 +++++++++++++---------
.../renderer/DependenciesRenderer.java | 18 ++++++++--
.../renderer/DependencyManagementRenderer.java | 21 +++++++++---
10 files changed, 113 insertions(+), 44 deletions(-)
copy src/it/{MPIR-412 => MPIR-407}/invoker.properties (99%)
copy src/it/{MPIR-412 => MPIR-407}/pom.xml (71%)
copy src/it/{multi-module/main/src/main/java/org/apache/maven/its/main/Main.java => MPIR-407/verify.groovy} (78%)
copy src/{test/java/org/apache/maven/report/projectinfo/stubs/ModulesStub.java => main/java/org/apache/maven/report/projectinfo/LicenseMapping.java} (68%)
[maven-project-info-reports-plugin] 01/01: [MPIR-421] Make all ITs with site.xml use an explicit skin
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MPIR-421
in repository https://gitbox.apache.org/repos/asf/maven-project-info-reports-plugin.git
commit 91d0efec3c94f1ad4f58913b5060a0237c66b3c0
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Thu Jul 7 13:01:13 2022 +0200
[MPIR-421] Make all ITs with site.xml use an explicit skin
This closes #40
---
pom.xml | 3 ++-
src/it/MPIR-242/pom.xml | 1 +
src/it/MPIR-242/src/site/site.xml | 5 +++++
src/it/MPIR-362/pom.xml | 1 +
src/it/MPIR-362/src/site/site.xml | 5 +++++
src/it/mpir-229/pom.xml | 1 +
src/it/mpir-229/src/site/site.xml | 5 +++++
src/it/mpir-229/verify.groovy | 40 +++++++++++++++++++--------------------
8 files changed, 40 insertions(+), 21 deletions(-)
diff --git a/pom.xml b/pom.xml
index f3ad756..606a044 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,14 +118,15 @@ under the License.
</distributionManagement>
<properties>
+ <javaVersion>8</javaVersion>
<doxiaVersion>1.11.1</doxiaVersion>
<doxia-sitetoolsVersion>1.11.1</doxia-sitetoolsVersion>
<mavenVersion>3.2.5</mavenVersion>
<scmVersion>1.13.0</scmVersion>
<aetherVersion>1.0.0.v20140518</aetherVersion>
<sitePluginVersion>3.12.0</sitePluginVersion>
+ <fluidoSkinVersion>1.11.1</fluidoSkinVersion>
<surefire.version>2.22.2</surefire.version>
- <javaVersion>8</javaVersion>
<checkstyle.violation.ignore>ParameterNumber,MethodLength</checkstyle.violation.ignore>
<project.build.outputTimestamp>2022-04-23T10:30:05Z</project.build.outputTimestamp>
</properties>
diff --git a/src/it/MPIR-242/pom.xml b/src/it/MPIR-242/pom.xml
index 4a06464..55224d1 100644
--- a/src/it/MPIR-242/pom.xml
+++ b/src/it/MPIR-242/pom.xml
@@ -32,6 +32,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<artifacts.url>http://maven.apache.org/plugins/it/${project.artifactId}</artifacts.url>
+ <fluidoSkinVersion>@fluidoSkinVersion@</fluidoSkinVersion>
</properties>
<url>${artifacts.url}</url>
diff --git a/src/it/MPIR-242/src/site/site.xml b/src/it/MPIR-242/src/site/site.xml
index 962e451..29850a8 100644
--- a/src/it/MPIR-242/src/site/site.xml
+++ b/src/it/MPIR-242/src/site/site.xml
@@ -21,6 +21,11 @@ under the License.
<project xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
<publishDate position="right" />
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>${fluidoSkinVersion}</version>
+ </skin>
<body>
<breadcrumbs>
<item name="MPIR" href="http://maven.apache.org/plugins/maven-project-info-reports-plugin/index.html" />
diff --git a/src/it/MPIR-362/pom.xml b/src/it/MPIR-362/pom.xml
index adc6e05..f310333 100644
--- a/src/it/MPIR-362/pom.xml
+++ b/src/it/MPIR-362/pom.xml
@@ -34,6 +34,7 @@
<maven.compiler.target>1.7</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <fluidoSkinVersion>@fluidoSkinVersion@</fluidoSkinVersion>
</properties>
<dependencyManagement>
diff --git a/src/it/MPIR-362/src/site/site.xml b/src/it/MPIR-362/src/site/site.xml
index 962e451..29850a8 100644
--- a/src/it/MPIR-362/src/site/site.xml
+++ b/src/it/MPIR-362/src/site/site.xml
@@ -21,6 +21,11 @@ under the License.
<project xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
<publishDate position="right" />
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>${fluidoSkinVersion}</version>
+ </skin>
<body>
<breadcrumbs>
<item name="MPIR" href="http://maven.apache.org/plugins/maven-project-info-reports-plugin/index.html" />
diff --git a/src/it/mpir-229/pom.xml b/src/it/mpir-229/pom.xml
index 9181d33..5153345 100644
--- a/src/it/mpir-229/pom.xml
+++ b/src/it/mpir-229/pom.xml
@@ -32,6 +32,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<some.property>TEST</some.property>
<artifacts.url>http://maven.apache.org/plugins/it/${some.property}</artifacts.url>
+ <fluidoSkinVersion>@fluidoSkinVersion@</fluidoSkinVersion>
</properties>
<url>${artifacts.url}</url>
diff --git a/src/it/mpir-229/src/site/site.xml b/src/it/mpir-229/src/site/site.xml
index 227c9e5..4538ed5 100644
--- a/src/it/mpir-229/src/site/site.xml
+++ b/src/it/mpir-229/src/site/site.xml
@@ -21,6 +21,11 @@ under the License.
<project xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
<publishDate position="right"/>
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>${fluidoSkinVersion}</version>
+ </skin>
<body>
<breadcrumbs>
<item name="MPIR" href="http://maven.apache.org/plugins/maven-project-info-reports-plugin/index.html" />
diff --git a/src/it/mpir-229/verify.groovy b/src/it/mpir-229/verify.groovy
index efd9543..4d7db4b 100644
--- a/src/it/mpir-229/verify.groovy
+++ b/src/it/mpir-229/verify.groovy
@@ -1,20 +1,20 @@
-/*
- * 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.
- */
-File modulesPage = new File( basedir, 'target/site/modules.html' )
-assert modulesPage.text.contains( '<a href="mpir-229-module1-1.0-SNAPSHOT/index.html" title="mpir-229-module1">mpir-229-module1</a>' )
\ No newline at end of file
+/*
+ * 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.
+ */
+File modulesPage = new File( basedir, 'target/site/modules.html' )
+assert modulesPage.text.contains( '<a href="mpir-229-module1-1.0-SNAPSHOT/index.html" title="mpir-229-module1"><span class="none"></span>mpir-229-module1</a>' )
\ No newline at end of file