This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-jxr.git
The following commit(s) were added to refs/heads/master by this push:
new fef09fa Update Parent to 45, Invoker 3.91, Palantir, Site descriptor
(#342)
fef09fa is described below
commit fef09fa3bb1807f9ff29258d0d2d5c3ac60b206d
Author: Matthias Bünger <[email protected]>
AuthorDate: Thu Dec 18 22:49:05 2025 +0100
Update Parent to 45, Invoker 3.91, Palantir, Site descriptor (#342)
* Update Parent to 45
Including Invoker plugin to 3.9.1 and palantir format for Java 25
* Update site descriptor and download page
* Site-Plugin and Javadoc Plugin
* Fix download links
* Use release version of m-jxr-p
* Use plugin versions from parent
---------
Co-authored-by: Slawomir Jaranowski <[email protected]>
---
maven-jxr-plugin/pom.xml | 2 ++
maven-jxr-plugin/src/site/site.xml | 10 ++++------
.../java/org/apache/maven/jxr/pacman/JavaFileImplTest.java | 6 +++---
pom.xml | 9 ++++-----
src/site/site.xml | 10 ++++------
5 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/maven-jxr-plugin/pom.xml b/maven-jxr-plugin/pom.xml
index 1f84d28..be3ccf5 100644
--- a/maven-jxr-plugin/pom.xml
+++ b/maven-jxr-plugin/pom.xml
@@ -55,6 +55,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
+ <version>${version.maven-plugin-tools}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -256,6 +257,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
+ <version>3.9.1</version>
<configuration>
<writeJunitReport>true</writeJunitReport>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
diff --git a/maven-jxr-plugin/src/site/site.xml
b/maven-jxr-plugin/src/site/site.xml
index 241dac2..2ec39c2 100644
--- a/maven-jxr-plugin/src/site/site.xml
+++ b/maven-jxr-plugin/src/site/site.xml
@@ -19,10 +19,8 @@ specific language governing permissions and limitations
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";
- name="Maven JXR Plugin">
+<site xmlns="http://maven.apache.org/SITE/2.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0
https://maven.apache.org/xsd/site-2.0.0.xsd"; name="Maven JXR Plugin">
<body>
<menu name="Overview">
<item name="Introduction" href="index.html"/>
@@ -30,7 +28,7 @@ under the License.
<item name="Usage" href="usage.html"/>
<item name="FAQ" href="faq.html"/>
<!-- According to https://issues.apache.org/jira/browse/MNGSITE-152 -->
- <item name="License" href="http://www.apache.org/licenses/"/>
+ <item name="License" href="https://www.apache.org/licenses/"/>
<item name="Download" href="../download.html"/>
</menu>
<menu name="Examples">
@@ -41,4 +39,4 @@ under the License.
<item name="JXR Sample Report" href="/xref/index.html"/>
</menu>
</body>
-</project>
+</site>
diff --git
a/maven-jxr/src/test/java/org/apache/maven/jxr/pacman/JavaFileImplTest.java
b/maven-jxr/src/test/java/org/apache/maven/jxr/pacman/JavaFileImplTest.java
index 8445a39..bcc2823 100644
--- a/maven-jxr/src/test/java/org/apache/maven/jxr/pacman/JavaFileImplTest.java
+++ b/maven-jxr/src/test/java/org/apache/maven/jxr/pacman/JavaFileImplTest.java
@@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
class JavaFileImplTest {
@Test
- void jxr_135LotsOfNested() throws IOException {
+ void jxr135LotsOfNested() throws IOException {
JavaFileImpl javaFile = new JavaFileImpl(
Paths.get("src/test/resources/jxr135/org/apache/maven/jxr/pacman/ClassWithNested.java"),
"UTF-8");
final Iterator<ClassType> classTypes =
javaFile.getClassTypes().iterator();
@@ -52,7 +52,7 @@ class JavaFileImplTest {
}
@Test
- void jxr_170MultiLineString() throws IOException {
+ void jxr170MultiLineString() throws IOException {
JavaFileImpl javaFile = new JavaFileImpl(
Paths.get("src/test/resources/jxr170/org/apache/maven/jxr/pacman/ClassWithMultiLineString.java"),
"UTF-8");
@@ -62,7 +62,7 @@ class JavaFileImplTest {
}
@Test
- void jxr_175Java14Record() throws IOException {
+ void jxr175Java14Record() throws IOException {
JavaFileImpl javaFile = new JavaFileImpl(
Paths.get("src/test/resources/jxr175/org/apache/maven/jxr/pacman/Java14Record.java"),
"UTF-8");
assertEquals(1, javaFile.getClassTypes().size());
diff --git a/pom.xml b/pom.xml
index 73fe464..adc5f48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>43</version>
+ <version>45</version>
<relativePath />
</parent>
@@ -77,11 +77,11 @@ under the License.
<properties>
<javaVersion>8</javaVersion>
<slf4jVersion>1.7.36</slf4jVersion>
- <sitePluginVersion>3.20.0</sitePluginVersion>
- <javadocPluginVersion>3.10.1</javadocPluginVersion>
+ <sitePluginVersion>${version.maven-site-plugin}</sitePluginVersion>
+
<javadocPluginVersion>${version.maven-javadoc-plugin}</javadocPluginVersion>
<maven.site.path>jxr-archives/jxr-LATEST</maven.site.path>
- <checkstyle.violation.ignore>None</checkstyle.violation.ignore>
<project.build.outputTimestamp>2024-10-22T14:57:49Z</project.build.outputTimestamp>
+ <version.palantirJavaFormat>2.81.0</version.palantirJavaFormat>
</properties>
<dependencyManagement>
@@ -117,7 +117,6 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>${project.version}</version>
<reportSets>
<reportSet>
<reports>
diff --git a/src/site/site.xml b/src/site/site.xml
index e04383f..9301c77 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -19,17 +19,15 @@ specific language governing permissions and limitations
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";
- name="JXR">
+<site xmlns="http://maven.apache.org/SITE/2.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0
https://maven.apache.org/xsd/site-2.0.0.xsd"; name="JXR">
<body>
<menu name="Overview">
<item name="Introduction" href="index.html"/>
<item name="Maven JXR Plugin" href="./maven-jxr-plugin/"/>
<item name="FAQ" href="faq.html"/>
<!-- According to https://issues.apache.org/jira/browse/MNGSITE-152 -->
- <item name="License" href="http://www.apache.org/licenses/"/>
+ <item name="License" href="https://www.apache.org/licenses/"/>
<item name="Download" href="download.html"/>
</menu>
@@ -39,4 +37,4 @@ under the License.
<menu ref="modules"/>
</body>
-</project>
+</site>
