Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package maven-parent for openSUSE:Factory checked in at 2026-01-07 16:02:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/maven-parent (Old) and /work/SRC/openSUSE:Factory/.maven-parent.new.1928 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-parent" Wed Jan 7 16:02:27 2026 rev:6 rq:1325720 version:46 Changes: -------- --- /work/SRC/openSUSE:Factory/maven-parent/maven-parent.changes 2025-11-04 18:42:49.234597881 +0100 +++ /work/SRC/openSUSE:Factory/.maven-parent.new.1928/maven-parent.changes 2026-01-07 16:03:17.515805206 +0100 @@ -1,0 +2,21 @@ +Wed Jan 7 07:59:36 UTC 2026 - Fridrich Strba <[email protected]> + +- Upgrade to Apache Maven parent POM version 46 + * Breaking changes + + Require Maven 3.6.3+ from plugins + + Update rat plugin configuration + + Use spotless 3 when running on JDK >= 17 + + Drop Doxia Tools parent pom + * New features and improvements + + MPOM-387: Exclude test scope from enforcedBytecodeVersion + + feat: activate Fluido skin's anchorJs + + Enhance target JDK definition for JDK >= 9 + + Always render a GitHub ribbon on the right-hand side + * Maintenance + + MPOM-277: Move maven-invoker-plugin configuration to one + place + + Remove doxia-tools from documentations + + feat: enable prevent branch protection rules + + Add Apache 2.0 LICENSE file + +------------------------------------------------------------------- Old: ---- maven-parent-45-source-release.zip New: ---- maven-parent-46-source-release.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ maven-parent.spec ++++++ --- /var/tmp/diff_new_pack.GPXG56/_old 2026-01-07 16:03:18.079828682 +0100 +++ /var/tmp/diff_new_pack.GPXG56/_new 2026-01-07 16:03:18.079828682 +0100 @@ -1,7 +1,7 @@ # # spec file for package maven-parent # -# Copyright (c) 2025 SUSE LLC and contributors +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: maven-parent -Version: 45 +Version: 46 Release: 0 Summary: Apache Maven parent POM License: Apache-2.0 @@ -55,12 +55,12 @@ %{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom %add_maven_depmap %{name}/%{name}.pom -for i in doxia-tools maven-extensions maven-plugins maven-shared-components maven-skins; do +for i in maven-extensions maven-plugins maven-shared-components maven-skins; do %{mvn_install_pom} ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom %add_maven_depmap %{name}/${i}.pom done %files -f .mfiles -%license LICENSE -%doc NOTICE +%license LICENSE NOTICE +%doc README.md ++++++ _scmsync.obsinfo ++++++ --- /var/tmp/diff_new_pack.GPXG56/_old 2026-01-07 16:03:18.135831013 +0100 +++ /var/tmp/diff_new_pack.GPXG56/_new 2026-01-07 16:03:18.139831179 +0100 @@ -1,6 +1,6 @@ -mtime: 1762206126 -commit: 639e7e0201b4f4a1c0b4f94d42b831b3e9442d4505770360a922534b78e25ae0 +mtime: 1767773149 +commit: f48e4cd39eeaba4ddb8c6b2210a207f434173ac03346cc91da84f005b830e476 url: https://src.opensuse.org/java-packages/maven-parent.git -revision: 639e7e0201b4f4a1c0b4f94d42b831b3e9442d4505770360a922534b78e25ae0 +revision: f48e4cd39eeaba4ddb8c6b2210a207f434173ac03346cc91da84f005b830e476 projectscmsync: https://src.opensuse.org/java-packages/_ObsPrj ++++++ build.specials.obscpio ++++++ ++++++ build.specials.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/.gitignore new/.gitignore --- old/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/.gitignore 2026-01-07 09:06:19.000000000 +0100 @@ -0,0 +1 @@ +.osc ++++++ maven-parent-45-source-release.zip -> maven-parent-46-source-release.zip ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-parent-45/.gitignore new/maven-parent-46/.gitignore --- old/maven-parent-45/.gitignore 2025-06-14 08:21:06.000000000 +0200 +++ new/maven-parent-46/.gitignore 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -target/ -.project -.classpath -.settings/ -.svn/ -bin/ -# Intellij -*.ipr -*.iml -.idea -out/ -.DS_Store -/bootstrap -/dependencies.xml -.java-version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-parent-45/NOTICE new/maven-parent-46/NOTICE --- old/maven-parent-45/NOTICE 2025-06-14 08:21:06.000000000 +0200 +++ new/maven-parent-46/NOTICE 2026-01-03 12:24:58.000000000 +0100 @@ -1,5 +1,5 @@ Apache Maven -Copyright 2002-2025 The Apache Software Foundation +Copyright 2002-2026 The Apache Software Foundation This product includes software developed at diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-parent-45/docs/doxia-tools/pom.xml new/maven-parent-46/docs/doxia-tools/pom.xml --- old/maven-parent-45/docs/doxia-tools/pom.xml 2025-06-14 08:21:06.000000000 +0200 +++ new/maven-parent-46/docs/doxia-tools/pom.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,49 +0,0 @@ -<?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> - - <parent> - <groupId>org.apache.maven</groupId> - <artifactId>docs</artifactId> - <version>45</version> - </parent> - - <groupId>org.apache.maven.doxia</groupId> - <artifactId>doxia-tools-docs</artifactId> - <packaging>pom</packaging> - - <name>Apache Maven Doxia Tools Parent POM</name> - <description>This project consists of a POM that contains settings that are likely to be useful to any Maven Doxia Tool that is building and releasing code with Maven.</description> - <url>https://maven.apache.org/pom/maven/doxia-tools</url> - - <scm> - <tag>maven-parent-45</tag> - <url>https://github.com/apache/maven-parent/tree/${project.scm.tag}/doxia-tools</url> - </scm> - - <distributionManagement> - <site> - <id>apache.website</id> - <url>scm:svn:https://svn.apache.org/repos/asf/maven/website/components/${maven.site.path}/doxia-tools</url> - </site> - </distributionManagement> - -</project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-parent-45/docs/doxia-tools/src/site/apt/index.apt.vm new/maven-parent-46/docs/doxia-tools/src/site/apt/index.apt.vm --- old/maven-parent-45/docs/doxia-tools/src/site/apt/index.apt.vm 2025-06-14 08:21:06.000000000 +0200 +++ new/maven-parent-46/docs/doxia-tools/src/site/apt/index.apt.vm 1970-01-01 01:00:00.000000000 +0100 @@ -1,42 +0,0 @@ - ----- - Introduction - ----- - Hervé Boutemy - ----- - 2015-11-21 - ----- - -~~ 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. - -~~ NOTE: For help with the syntax of this file, see: -~~ https://maven.apache.org/doxia/references/apt-format.html - -${project.name} - - This POM is the common parent of all of the {{{/doxia/doxia-tools/}Maven Doxia Tools}} - in the Apache Maven project. - -* Site Publication - - Since Doxia Tools are always mono-module builds, this parent POM has configured <<<maven-scm-publish-plugin>>> - {{{/plugins/maven-scm-publish-plugin/examples/one-module-configuration.html}mono module optimization}} - to ease site build & deployment in only one integrated and simplified command: - -+-----+ -mvn -Preporting site-deploy -+-----+ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-parent-45/docs/doxia-tools/src/site/site.xml new/maven-parent-46/docs/doxia-tools/src/site/site.xml --- old/maven-parent-45/docs/doxia-tools/src/site/site.xml 2025-06-14 08:21:06.000000000 +0200 +++ new/maven-parent-46/docs/doxia-tools/src/site/site.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,40 +0,0 @@ -<?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. ---> - -<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";> - <body> - <breadcrumbs> - <item name="Maven" href="https://maven.apache.org/pom/maven/index.html"; /> - <item name="Doxia Tools" href="https://maven.apache.org/pom/maven/doxia-tools/index.html"; /> - </breadcrumbs> - - <menu name="Maven Parent POMs"> - <item name="Maven" href="../index.html" /> - <item name="Plugins" href="../maven-plugins/index.html" /> - <item name="Extensions" href="../maven-extensions/index.html" /> - <item name="Shared Components" href="../maven-shared-components/index.html" /> - <item name="Skins" href="../maven-skins/index.html" /> - <item name="Doxia Tools" href="index.html" /> - </menu> - - </body> -</site> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-parent-45/docs/maven-extensions/pom.xml new/maven-parent-46/docs/maven-extensions/pom.xml --- old/maven-parent-45/docs/maven-extensions/pom.xml 2025-06-14 08:21:06.000000000 +0200 +++ new/maven-parent-46/docs/maven-extensions/pom.xml 2026-01-03 12:24:58.000000000 +0100 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.maven</groupId> <artifactId>docs</artifactId> - <version>45</version> + <version>46</version> </parent> <groupId>org.apache.maven.plugins</groupId> @@ -35,7 +35,7 @@ <url>https://maven.apache.org/pom/maven/maven-extensions</url> <scm> - <tag>maven-parent-45</tag> + <tag>maven-parent-46</tag> <url>https://github.com/apache/maven-parent/tree/${project.scm.tag}/maven-extensions</url> </scm> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-parent-45/docs/maven-extensions/src/site/site.xml new/maven-parent-46/docs/maven-extensions/src/site/site.xml --- old/maven-parent-45/docs/maven-extensions/src/site/site.xml 2025-06-14 08:21:06.000000000 +0200 +++ new/maven-parent-46/docs/maven-extensions/src/site/site.xml 2026-01-03 12:24:58.000000000 +0100 @@ -33,7 +33,6 @@ <item name="Extensions" href="index.html" /> <item name="Shared Components" href="../maven-shared-components/index.html" /> <item name="Skins" href="../maven-skins/index.html" /> - <item name="Doxia Tools" href="../doxia-tools/index.html" /> </menu> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-parent-45/docs/maven-plugins/pom.xml new/maven-parent-46/docs/maven-plugins/pom.xml --- old/maven-parent-45/docs/maven-plugins/pom.xml 2025-06-14 08:21:06.000000000 +0200 +++ new/maven-parent-46/docs/maven-plugins/pom.xml 2026-01-03 12:24:58.000000000 +0100 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.maven</groupId> <artifactId>docs</artifactId> - <version>45</version> + <version>46</version> </parent> <groupId>org.apache.maven.plugins</groupId> @@ -35,7 +35,7 @@ <url>https://maven.apache.org/pom/maven/maven-plugins</url> <scm> - <tag>maven-parent-45</tag> + <tag>maven-parent-46</tag> <url>https://github.com/apache/maven-parent/tree/${project.scm.tag}/maven-plugins</url> </scm> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-parent-45/docs/maven-plugins/src/site/site.xml new/maven-parent-46/docs/maven-plugins/src/site/site.xml --- old/maven-parent-45/docs/maven-plugins/src/site/site.xml 2025-06-14 08:21:06.000000000 +0200 +++ new/maven-parent-46/docs/maven-plugins/src/site/site.xml 2026-01-03 12:24:58.000000000 +0100 @@ -34,7 +34,6 @@ <item name="Extensions" href="../maven-extensions/index.html" /> <item name="Shared Components" href="../maven-shared-components/index.html" /> <item name="Skins" href="../maven-skins/index.html" /> - <item name="Doxia Tools" href="../doxia-tools/index.html" /> </menu> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-parent-45/docs/maven-shared-components/pom.xml new/maven-parent-46/docs/maven-shared-components/pom.xml --- old/maven-parent-45/docs/maven-shared-components/pom.xml 2025-06-14 08:21:06.000000000 +0200 +++ new/maven-parent-46/docs/maven-shared-components/pom.xml 2026-01-03 12:24:58.000000000 +0100 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.maven</groupId> <artifactId>docs</artifactId> - <version>45</version> + <version>46</version> </parent> <groupId>org.apache.maven.shared</groupId> @@ -35,7 +35,7 @@ <url>https://maven.apache.org/pom/maven/maven-shared-components</url> <scm> - <tag>maven-parent-45</tag> + <tag>maven-parent-46</tag> <url>https://github.com/apache/maven-parent/tree/${project.scm.tag}/maven-shared-components</url> </scm> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-parent-45/docs/maven-shared-components/src/site/site.xml new/maven-parent-46/docs/maven-shared-components/src/site/site.xml --- old/maven-parent-45/docs/maven-shared-components/src/site/site.xml 2025-06-14 08:21:06.000000000 +0200 +++ new/maven-parent-46/docs/maven-shared-components/src/site/site.xml 2026-01-03 12:24:58.000000000 +0100 @@ -34,7 +34,6 @@ <item name="Extensions" href="../maven-extensions/index.html" /> <item name="Shared Components" href="index.html" /> <item name="Skins" href="../maven-skins/index.html" /> - <item name="Doxia Tools" href="../doxia-tools/index.html" /> </menu> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-parent-45/docs/maven-skins/pom.xml new/maven-parent-46/docs/maven-skins/pom.xml --- old/maven-parent-45/docs/maven-skins/pom.xml 2025-06-14 08:21:06.000000000 +0200 +++ new/maven-parent-46/docs/maven-skins/pom.xml 2026-01-03 12:24:58.000000000 +0100 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.maven</groupId> <artifactId>docs</artifactId> - <version>45</version> + <version>46</version> </parent> <groupId>org.apache.maven.skins</groupId> @@ -35,7 +35,7 @@ <url>https://maven.apache.org/pom/maven/maven-skins</url> <scm> - <tag>maven-parent-45</tag> + <tag>maven-parent-46</tag> <url>https://github.com/apache/maven-parent/tree/${project.scm.tag}/maven-skins</url> </scm> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-parent-45/docs/maven-skins/src/site/site.xml new/maven-parent-46/docs/maven-skins/src/site/site.xml --- old/maven-parent-45/docs/maven-skins/src/site/site.xml 2025-06-14 08:21:06.000000000 +0200 +++ new/maven-parent-46/docs/maven-skins/src/site/site.xml 2026-01-03 12:24:58.000000000 +0100 @@ -34,7 +34,6 @@ <item name="Extensions" href="../maven-extensions/index.html" /> <item name="Shared Components" href="../maven-shared-components/index.html" /> <item name="Skins" href="index.html" /> - <item name="Doxia Tools" href="../doxia-tools/index.html" /> </menu> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-parent-45/docs/pom.xml new/maven-parent-46/docs/pom.xml --- old/maven-parent-45/docs/pom.xml 2025-06-14 08:21:06.000000000 +0200 +++ new/maven-parent-46/docs/pom.xml 2026-01-03 12:24:58.000000000 +0100 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.maven</groupId> <artifactId>maven-parent</artifactId> - <version>45</version> + <version>46</version> </parent> <artifactId>docs</artifactId> @@ -38,11 +38,10 @@ <module>maven-plugins</module> <module>maven-shared-components</module> <module>maven-skins</module> - <module>doxia-tools</module> </modules> <scm> - <tag>maven-parent-45</tag> + <tag>maven-parent-46</tag> <url>https://github.com/apache/maven-parent/tree/${project.scm.tag}/</url> </scm> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-parent-45/docs/src/site/site.xml new/maven-parent-46/docs/src/site/site.xml --- old/maven-parent-45/docs/src/site/site.xml 2025-06-14 08:21:06.000000000 +0200 +++ new/maven-parent-46/docs/src/site/site.xml 2026-01-03 12:24:58.000000000 +0100 @@ -51,6 +51,7 @@ </matomo> <fluidoSkin> <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + <anchorJs /> </fluidoSkin> </custom> @@ -80,7 +81,6 @@ <item name="Extensions" href="maven-extensions/index.html"/> <item name="Shared Components" href="maven-shared-components/index.html"/> <item name="Skins" href="maven-skins/index.html"/> - <item name="Doxia Tools" href="doxia-tools/index.html"/> </menu> <menu ref="reports" inherit="bottom"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-parent-45/doxia-tools/pom.xml new/maven-parent-46/doxia-tools/pom.xml --- old/maven-parent-45/doxia-tools/pom.xml 2025-06-14 08:21:06.000000000 +0200 +++ new/maven-parent-46/doxia-tools/pom.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,114 +0,0 @@ -<?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> - - <parent> - <groupId>org.apache.maven</groupId> - <artifactId>maven-parent</artifactId> - <version>45</version> - </parent> - - <groupId>org.apache.maven.doxia</groupId> - <artifactId>doxia-tools</artifactId> - <packaging>pom</packaging> - - <name>Apache Maven Doxia Tools</name> - <description>A set of tools for working with Doxia documents.</description> - <url>https://maven.apache.org/doxia/doxia-tools/</url> - <inceptionYear>2005</inceptionYear> - - <issueManagement> - <system>jira</system> - <url>https://issues.apache.org/jira/browse/DOXIATOOLS</url> - </issueManagement> - <ciManagement> - <system>Jenkins</system> - <url>https://ci-builds.apache.org/job/Maven/job/maven-box/job/doxia-tools/</url> - </ciManagement> - - <distributionManagement> - <site> - <id>apache.website</id> - <url>scm:svn:https://svn.apache.org/repos/asf/maven/doxia/website/components/doxia-tools-archives/</url> - </site> - </distributionManagement> - - <properties> - <projectVersion>${project.version}</projectVersion> - <maven.site.path>doxia-tools-archives/${project.artifactId}-${maven.site.path.suffix}</maven.site.path> - </properties> - - <build> - <pluginManagement> - <plugins> - <!-- publish mono-module site with "mvn site-deploy" --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <configuration> - <!-- don't deploy site with maven-site-plugin --> - <skipDeploy>true</skipDeploy> - </configuration> - </plugin> - </plugins> - </pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-scm-publish-plugin</artifactId> - <configuration> - <!-- no need for site:stage, use target/site --> - <content>${project.reporting.outputDirectory}</content> - </configuration> - <executions> - <execution> - <!-- deploy site with maven-scm-publish-plugin --> - <id>scm-publish</id> - <goals> - <goal>publish-scm</goal> - </goals> - <phase>site-deploy</phase> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <executions> - <execution> - <id>attach-descriptor</id> - <goals> - <goal>attach-descriptor</goal> - </goals> - <inherited>false</inherited> - </execution> - <execution> - <id>default-site</id> - <inherited>false</inherited> - <configuration> - <skip>true</skip> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-parent-45/doxia-tools/src/site/site.xml new/maven-parent-46/doxia-tools/src/site/site.xml --- old/maven-parent-45/doxia-tools/src/site/site.xml 2025-06-14 08:21:06.000000000 +0200 +++ new/maven-parent-46/doxia-tools/src/site/site.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - -<!-- -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. ---> - -<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";> - - <bannerRight href="https://maven.apache.org/doxia/";> - <image src="images/doxia-logo.png"/> - </bannerRight> - - <body> - <breadcrumbs> - <item name="Doxia" href="https://maven.apache.org/doxia/index.html"; /> - <item name="Doxia Tools" href="https://maven.apache.org/doxia/doxia-tools/index.html"; /> - </breadcrumbs> - - <menu name="Modules"> - <item name="Doxia Book Maven Plugin" href="./doxia-book-maven-plugin/index.html" /> - <item name="Doxia Book Renderer" href="./doxia-book-renderer/index.html" /> - <item name="Doxia Converter" href="./doxia-converter/index.html" /> - <item name="Doxia Linkcheck" href="./doxia-linkcheck/index.html" /> - </menu> - </body> -</site> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-parent-45/maven-extensions/pom.xml new/maven-parent-46/maven-extensions/pom.xml --- old/maven-parent-45/maven-extensions/pom.xml 2025-06-14 08:21:06.000000000 +0200 +++ new/maven-parent-46/maven-extensions/pom.xml 2026-01-03 12:24:58.000000000 +0100 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.maven</groupId> <artifactId>maven-parent</artifactId> - <version>45</version> + <version>46</version> </parent> <groupId>org.apache.maven.extensions</groupId> @@ -128,32 +128,11 @@ <profile> <id>run-its</id> - <properties> - <!-- when testing with JDK9, change these values to 1.6 from cmdline --> - <invoker.maven.compiler.source>${maven.compiler.source}</invoker.maven.compiler.source> - <invoker.maven.compiler.target>${maven.compiler.target}</invoker.maven.compiler.target> - </properties> <build> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-invoker-plugin</artifactId> - <configuration> - <debug>true</debug> - <projectsDirectory>src/it</projectsDirectory> - <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo> - <preBuildHookScript>setup</preBuildHookScript> - <postBuildHookScript>verify</postBuildHookScript> - <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath> - <settingsFile>src/it/settings.xml</settingsFile> - <pomIncludes> - <pomInclude>*/pom.xml</pomInclude> - </pomIncludes> - <properties> - <maven.compiler.source>${invoker.maven.compiler.source}</maven.compiler.source> - <maven.compiler.target>${invoker.maven.compiler.target}</maven.compiler.target> - </properties> - </configuration> <executions> <execution> <id>integration-test</id> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-parent-45/maven-plugins/pom.xml new/maven-parent-46/maven-plugins/pom.xml --- old/maven-parent-45/maven-plugins/pom.xml 2025-06-14 08:21:06.000000000 +0200 +++ new/maven-parent-46/maven-plugins/pom.xml 2026-01-03 12:24:58.000000000 +0100 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.maven</groupId> <artifactId>maven-parent</artifactId> - <version>45</version> + <version>46</version> </parent> <groupId>org.apache.maven.plugins</groupId> @@ -141,7 +141,7 @@ </goals> <configuration> <failOnWarning>${enforce.dependency.declarations}</failOnWarning> - <ignoredUnusedDeclaredDependencies> + <ignoredUnusedDeclaredDependencies combine.children="append"> <ignoredUnusedDeclaredDependency>org.apache.maven:maven-compat</ignoredUnusedDeclaredDependency> <ignoredUnusedDeclaredDependency>org.slf4j:slf4j-simple</ignoredUnusedDeclaredDependency> </ignoredUnusedDeclaredDependencies> @@ -175,32 +175,11 @@ <profiles> <profile> <id>run-its</id> - <properties> - <!-- when testing with JDK9, change these values to 1.6 from cmdline --> - <invoker.maven.compiler.source>${maven.compiler.source}</invoker.maven.compiler.source> - <invoker.maven.compiler.target>${maven.compiler.target}</invoker.maven.compiler.target> - </properties> <build> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-invoker-plugin</artifactId> - <configuration> - <debug>true</debug> - <projectsDirectory>src/it</projectsDirectory> - <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo> - <preBuildHookScript>setup</preBuildHookScript> - <postBuildHookScript>verify</postBuildHookScript> - <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath> - <settingsFile>src/it/settings.xml</settingsFile> - <pomIncludes> - <pomInclude>*/pom.xml</pomInclude> - </pomIncludes> - <properties> - <maven.compiler.source>${invoker.maven.compiler.source}</maven.compiler.source> - <maven.compiler.target>${invoker.maven.compiler.target}</maven.compiler.target> - </properties> - </configuration> <executions> <execution> <id>integration-test</id> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-parent-45/maven-plugins/src/site/site.xml new/maven-parent-46/maven-plugins/src/site/site.xml --- old/maven-parent-45/maven-plugins/src/site/site.xml 2025-06-14 08:21:06.000000000 +0200 +++ new/maven-parent-46/maven-plugins/src/site/site.xml 2026-01-03 12:24:58.000000000 +0100 @@ -21,6 +21,16 @@ <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";> + <custom> + <fluidoSkin> + <gitHub> + <projectId>apache/${project.artifactId}</projectId> + <ribbonOrientation>right</ribbonOrientation> + <ribbonColor>gray</ribbonColor> + </gitHub> + </fluidoSkin> + </custom> + <body> <breadcrumbs> <item name="Plugins" href="https://maven.apache.org/plugins/index.html"; /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-parent-45/maven-shared-components/pom.xml new/maven-parent-46/maven-shared-components/pom.xml --- old/maven-parent-45/maven-shared-components/pom.xml 2025-06-14 08:21:06.000000000 +0200 +++ new/maven-parent-46/maven-shared-components/pom.xml 2026-01-03 12:24:58.000000000 +0100 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.maven</groupId> <artifactId>maven-parent</artifactId> - <version>45</version> + <version>46</version> </parent> <groupId>org.apache.maven.shared</groupId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-parent-45/maven-skins/pom.xml new/maven-parent-46/maven-skins/pom.xml --- old/maven-parent-45/maven-skins/pom.xml 2025-06-14 08:21:06.000000000 +0200 +++ new/maven-parent-46/maven-skins/pom.xml 2026-01-03 12:24:58.000000000 +0100 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.maven</groupId> <artifactId>maven-parent</artifactId> - <version>45</version> + <version>46</version> </parent> <groupId>org.apache.maven.skins</groupId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-parent-45/pom.xml new/maven-parent-46/pom.xml --- old/maven-parent-45/pom.xml 2025-06-14 08:21:06.000000000 +0200 +++ new/maven-parent-46/pom.xml 2026-01-03 12:24:58.000000000 +0100 @@ -24,13 +24,13 @@ <parent> <groupId>org.apache</groupId> <artifactId>apache</artifactId> - <version>35</version> + <version>36</version> <relativePath /> </parent> <groupId>org.apache.maven</groupId> <artifactId>maven-parent</artifactId> - <version>45</version> + <version>46</version> <packaging>pom</packaging> <name>Apache Maven</name> @@ -930,14 +930,13 @@ <module>maven-plugins</module> <module>maven-shared-components</module> <module>maven-skins</module> - <module>doxia-tools</module> <module>docs</module> </modules> <scm> <connection>scm:git:https://gitbox.apache.org/repos/asf/maven-parent.git</connection> <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-parent.git</developerConnection> - <tag>maven-parent-45</tag> + <tag>maven-parent-46</tag> <url>https://github.com/apache/maven-parent/tree/${project.scm.tag}</url> </scm> @@ -962,8 +961,6 @@ <properties> <javaVersion>8</javaVersion> - <maven.compiler.source>${javaVersion}</maven.compiler.source> - <maven.compiler.target>${javaVersion}</maven.compiler.target> <maven.compiler.showDeprecation>true</maven.compiler.showDeprecation> <checkstyle.includeTestSourceDirectory>true</checkstyle.includeTestSourceDirectory> <!-- in order to restore default annotation processing behaviour, please override with empty value --> @@ -975,14 +972,13 @@ <invoker.streamLogsOnFailures>true</invoker.streamLogsOnFailures> <version.sisu-maven-plugin>0.9.0.M4</version.sisu-maven-plugin> <version.plexus-utils>4.0.2</version.plexus-utils> - <version.spotless-maven-plugin>2.44.5</version.spotless-maven-plugin> - <!-- we use version 2.56.0 due to: https://github.com/palantir/palantir-java-format/issues/1320 --> - <version.palantirJavaFormat>2.56.0</version.palantirJavaFormat> + <version.spotless-maven-plugin>3.1.0</version.spotless-maven-plugin> + <version.palantirJavaFormat>2.83.0</version.palantirJavaFormat> <!-- DO NOT UPGRADE to 4: incompatible with Maven 3 --> <version.plexus-xml>3.0.1</version.plexus-xml> - <versions.junit5>5.13.1</versions.junit5> + <versions.junit5>5.14.1</versions.junit5> <version.maven-shared-resources>6</version.maven-shared-resources> - <project.build.outputTimestamp>2025-06-14T08:21:05Z</project.build.outputTimestamp> + <project.build.outputTimestamp>2026-01-03T12:24:58Z</project.build.outputTimestamp> </properties> <dependencyManagement> @@ -1118,9 +1114,9 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-pmd-plugin</artifactId> - <version>3.26.0</version> + <version>3.28.0</version> <configuration> - <targetJdk>${maven.compiler.target}</targetJdk> + <targetJdk>${javaVersion}</targetJdk> <rulesets> <ruleset>rulesets/maven.xml</ruleset> </rulesets> @@ -1138,7 +1134,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>taglist-maven-plugin</artifactId> - <version>3.2.1</version> + <version>3.2.2</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -1175,7 +1171,16 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-invoker-plugin</artifactId> <configuration> + <debug>true</debug> + <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo> + <preBuildHookScript>setup</preBuildHookScript> + <postBuildHookScript>verify</postBuildHookScript> + <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath> + <settingsFile>src/it/settings.xml</settingsFile> <streamLogsOnFailures>${invoker.streamLogsOnFailures}</streamLogsOnFailures> + <pomIncludes> + <pomInclude>*/pom.xml</pomInclude> + </pomIncludes> <environmentVariables> <JENKINS_MAVEN_AGENT_DISABLED>true</JENKINS_MAVEN_AGENT_DISABLED> </environmentVariables> @@ -1188,7 +1193,7 @@ <dependency> <groupId>org.codehaus.mojo</groupId> <artifactId>extra-enforcer-rules</artifactId> - <version>1.10.0</version> + <version>1.11.0</version> </dependency> </dependencies> <executions> @@ -1200,7 +1205,8 @@ <configuration> <rules> <enforceBytecodeVersion> - <maxJdkVersion>${maven.compiler.target}</maxJdkVersion> + <maxJdkVersion>${javaVersion}</maxJdkVersion> + <ignoredScopes>test</ignoredScopes> </enforceBytecodeVersion> </rules> <fail>true</fail> @@ -1218,7 +1224,6 @@ <!-- eg. palantir override importOrder, so should be first --> <palantirJavaFormat> <!-- Declare version so that spotless does not choose a version based on JDK version --> - <!-- https://github.com/diffplug/spotless/issues/2503#issuecomment-2953146277 --> <version>${version.palantirJavaFormat}</version> </palantirJavaFormat> <removeUnusedImports /> @@ -1259,6 +1264,33 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes combine.children="append"> + <exclude>.java-version</exclude> + <!-- Jenkins job with local Maven repository --> + <exclude>.repository/**</exclude> + <!-- Hudson Maven3 integration log --> + <exclude>.maven/spy.log</exclude> + <!-- Maven shade plugin --> + <exclude>dependency-reduced-pom.xml</exclude> + <!-- GitHub Support --> + <exclude>.asf.yaml</exclude> + </excludes> + </configuration> + <executions> + <execution> + <id>rat-check</id> + <goals> + <goal>check</goal> + </goals> + <!-- execute after spotless-maven-plugin --> + <phase>process-resources</phase> + </execution> + </executions> + </plugin> </plugins> </pluginManagement> @@ -1283,29 +1315,6 @@ <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> - <configuration> - <excludes combine.children="append"> - <exclude>.java-version</exclude> - <!-- Jenkins job with local Maven repository --> - <exclude>.repository/**</exclude> - <!-- Hudson Maven3 integration log --> - <exclude>.maven/spy.log</exclude> - <!-- Maven shade plugin --> - <exclude>dependency-reduced-pom.xml</exclude> - <!-- GitHub Support --> - <exclude>.asf.yaml</exclude> - </excludes> - </configuration> - <executions> - <execution> - <id>rat-check</id> - <goals> - <goal>check</goal> - </goals> - <!-- execute after spotless-maven-plugin --> - <phase>process-resources</phase> - </execution> - </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -1362,13 +1371,12 @@ <profiles> <profile> - <id>java11+</id> + <id>java17+</id> <activation> - <!-- TODO check support for JDK 25 after palantirJavaFormat upgraded --> - <jdk>[11,25)</jdk> + <jdk>[17,)</jdk> </activation> <build> - <!--- newer versions of plugins requires JDK 11 --> + <!--- newer versions of plugins requires JDK 17 --> <plugins> <plugin> <groupId>com.diffplug.spotless</groupId> @@ -1450,10 +1458,10 @@ <exclude>org.sonatype.aether:*</exclude> <!-- Various: most probably you want org.codehaus.plexus instead --> <exclude>org.sonatype.plexus:*</exclude> - <!-- Maven: lowest version we support --> - <exclude>org.apache.maven:maven-plugin-api:[,3.2.5)</exclude> - <exclude>org.apache.maven:maven-core:[,3.2.5)</exclude> - <exclude>org.apache.maven:maven-compat:[,3.2.5)</exclude> + <!-- Maven: lowest version we require from our plugins --> + <exclude>org.apache.maven:maven-plugin-api:[,3.6.3)</exclude> + <exclude>org.apache.maven:maven-core:[,3.6.3)</exclude> + <exclude>org.apache.maven:maven-compat:[,3.6.3)</exclude> </excludes> <includes> <!-- This is dead API --> @@ -1482,7 +1490,7 @@ <configuration> <toolchains> <jdk> - <version>${maven.compiler.target}</version> + <version>${javaVersion}</version> </jdk> </toolchains> </configuration> @@ -1670,5 +1678,18 @@ </pluginRepository> </pluginRepositories> </profile> + <profile> + <!-- a profile to allow dependabot to manage palantir-java-format version --> + <id>palantir-javaformat-dependabot</id> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>com.palantir.javaformat</groupId> + <artifactId>palantir-java-format</artifactId> + <version>${version.palantirJavaFormat}</version> + </dependency> + </dependencies> + </dependencyManagement> + </profile> </profiles> </project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-parent-45/src/site/site.xml new/maven-parent-46/src/site/site.xml --- old/maven-parent-45/src/site/site.xml 2025-06-14 08:21:06.000000000 +0200 +++ new/maven-parent-46/src/site/site.xml 2026-01-03 12:24:58.000000000 +0100 @@ -50,6 +50,7 @@ </matomo> <fluidoSkin> <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + <anchorJs /> </fluidoSkin> </custom>
