New Upstream Release - maven-parent
Ready changes
Summary
Merged new upstream version: 39 (was: 35).
Resulting package
Built on 2022-12-15T14:02 (took 14m38s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-releases libmaven-parent-java
Lintian Result
Diff
diff --git a/.asf.yaml b/.asf.yaml
index 1a1cbb8..514d16f 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -22,3 +22,9 @@ github:
- java
- build-management
- maven
+ enabled_merge_buttons:
+ squash: true
+ merge: false
+ rebase: true
+ autolink_jira:
+ - MPOM
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
index d9f2bfa..e3b18f7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -16,5 +16,5 @@
* specific language governing permissions and limitations
* under the License.
*/
-
-asfMavenTlpStdBuild(jdks:['8'])
+// jdk 17 is used for deploy artifacts
+asfMavenTlpStdBuild(jdks:['8', '17'])
diff --git a/README.md b/README.md
index 519b070..e8ea603 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,7 @@ Contributing to [Apache Maven Parent POMs](https://maven.apache.org/pom/maven/)
[][jira]
[][license]
[](https://search.maven.org/artifact/org.apache.maven/maven-parent)
+[](https://github.com/jvm-repo-rebuild/reproducible-central/blob/master/content/org/apache/maven/parent/README.md)
[][build]
diff --git a/apache-resource-bundles/pom.xml b/apache-resource-bundles/pom.xml
index e8306e2..53b05f4 100644
--- a/apache-resource-bundles/pom.xml
+++ b/apache-resource-bundles/pom.xml
@@ -1,5 +1,4 @@
<?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
@@ -18,14 +17,13 @@
~ 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>35</version>
+ <version>39</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -42,60 +40,17 @@
</issueManagement>
<ciManagement>
- <url>https://ci-builds.apache.org/job/Maven/job/maven-box/job/maven-project-resources/</url>
<system>Jenkins</system>
+ <url>https://ci-builds.apache.org/job/Maven/job/maven-box/job/maven-project-resources/</url>
</ciManagement>
<!-- There is no distributionManagement for this project. The site is a part of the main Maven site. -->
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin</artifactId>
- <configuration>
- <issueManagementSystems>
- <issueManagementSystem>JIRA</issueManagementSystem>
- </issueManagementSystems>
- <maxEntries>1000</maxEntries>
- <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
- <versionPrefix>${project.artifactId}-</versionPrefix>
- <!-- Used by announcement-generate goal -->
-<!-- TODO Which template should we use for Apache Resource Bundles?
- <templateDirectory>org/apache/maven/shared</templateDirectory>
--->
- <!-- Used by announcement-mail goal -->
- <subject>[ANN] ${project.name} ${project.version} Released</subject>
- <toAddresses>
- <toAddress implementation="java.lang.String">announce@apache.org</toAddress>
- <toAddress implementation="java.lang.String">announce@maven.apache.org</toAddress>
- <toAddress implementation="java.lang.String">users@maven.apache.org</toAddress>
- </toAddresses>
- <ccAddresses>
- <ccAddress implementation="java.lang.String">dev@maven.apache.org</ccAddress>
- </ccAddresses>
- <!-- These values need to be specified as properties in the profile apache-release in your settings.xml -->
- <fromDeveloperId>${apache.availid}</fromDeveloperId>
- <smtpHost>${smtp.host}</smtpHost>
- </configuration>
- <dependencies>
- <!-- Used by announcement-generate goal -->
-<!-- Uncomment this when we have decided which template to use
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-shared-resources</artifactId>
- <version>1</version>
- </dependency>
--->
- </dependencies>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
<!-- Turn this into a lifecycle -->
- <plugin>
- <artifactId>maven-remote-resources-plugin</artifactId>
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
<executions>
<execution>
<goals>
diff --git a/debian/changelog b/debian/changelog
index e1ffad9..e7194e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+maven-parent (39-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Debian Janitor <janitor@jelmer.uk> Thu, 15 Dec 2022 13:48:21 -0000
+
maven-parent (35-1) unstable; urgency=medium
* Team upload.
diff --git a/doxia-tools/pom.xml b/doxia-tools/pom.xml
index fd6846a..4c17184 100644
--- a/doxia-tools/pom.xml
+++ b/doxia-tools/pom.xml
@@ -1,5 +1,4 @@
<?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
@@ -18,14 +17,13 @@ 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>35</version>
+ <version>39</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -67,7 +65,8 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<configuration>
- <skipDeploy>true</skipDeploy><!-- don't deploy site with maven-site-plugin -->
+ <!-- don't deploy site with maven-site-plugin -->
+ <skipDeploy>true</skipDeploy>
</configuration>
</plugin>
</plugins>
@@ -77,15 +76,17 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
<configuration>
- <content>${project.reporting.outputDirectory}</content><!-- no need for site:stage, use target/site -->
+ <!-- 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>
- <phase>site-deploy</phase><!-- deploy site with maven-scm-publish-plugin -->
<goals>
<goal>publish-scm</goal>
</goals>
+ <phase>site-deploy</phase>
</execution>
</executions>
</plugin>
diff --git a/doxia-tools/site-pom.xml b/doxia-tools/site-pom.xml
index cfa559d..6b8e2d1 100644
--- a/doxia-tools/site-pom.xml
+++ b/doxia-tools/site-pom.xml
@@ -24,8 +24,10 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
+ <!-- we need to have a different gav for pom.xml and site-pom.xml -->
+ <!-- dot at the end is on purpose -->
<artifactId>maven-parent.</artifactId>
- <version>35</version>
+ <version>39</version>
<relativePath>../site-pom.xml</relativePath>
</parent>
diff --git a/doxia-tools/src/site-docs/site.xml b/doxia-tools/src/site-docs/site.xml
index 2aae710..0f48b8a 100644
--- a/doxia-tools/src/site-docs/site.xml
+++ b/doxia-tools/src/site-docs/site.xml
@@ -37,6 +37,15 @@ under the License.
<item name="Doxia Tools" href="../doxia-tools/index.html"/>
</menu>
- <menu ref="parent" />
+ <menu ref="reports" />
+
+ <menu name="ASF">
+ <item name="How Apache Works" href="https://www.apache.org/foundation/how-it-works.html"/>
+ <item name="Foundation" href="https://www.apache.org/foundation/"/>
+ <item name="Data Privacy" href="https://privacy.apache.org/policies/privacy-policy-public.html"/>
+ <item name="Sponsoring Apache" href="https://www.apache.org/foundation/sponsorship.html"/>
+ <item name="Thanks" href="https://www.apache.org/foundation/thanks.html"/>
+ </menu>
+
</body>
-</project>
\ No newline at end of file
+</project>
diff --git a/maven-extensions/pom.xml b/maven-extensions/pom.xml
index ee6ae5d..dc6e086 100644
--- a/maven-extensions/pom.xml
+++ b/maven-extensions/pom.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?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
@@ -17,14 +17,13 @@ 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>35</version>
+ <version>39</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -50,39 +49,6 @@ under the License.
<build>
<pluginManagement>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin</artifactId>
- <configuration>
- <issueManagementSystems>
- <issueManagementSystem>JIRA</issueManagementSystem>
- </issueManagementSystems>
- <maxEntries>1000</maxEntries>
- <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
- <!-- Used by announcement-generate goal -->
- <templateDirectory>org/apache/maven/extensions</templateDirectory>
- <!-- Used by announcement-mail goal -->
- <subject>[ANN] ${project.name} ${project.version} Released</subject>
- <toAddresses>
- <toAddress implementation="java.lang.String">announce@maven.apache.org</toAddress>
- <toAddress implementation="java.lang.String">users@maven.apache.org</toAddress>
- </toAddresses>
- <ccAddresses>
- <ccAddress implementation="java.lang.String">dev@maven.apache.org</ccAddress>
- </ccAddresses>
- <!-- These values need to be specified as properties in the profile apache-release in your settings.xml -->
- <fromDeveloperId>${apache.availid}</fromDeveloperId>
- <smtpHost>${smtp.host}</smtpHost>
- </configuration>
- <dependencies>
- <!-- Used by announcement-generate goal -->
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-shared-resources</artifactId>
- <version>2</version>
- </dependency>
- </dependencies>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
@@ -95,22 +61,25 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<configuration>
- <skipDeploy>true</skipDeploy><!-- don't deploy site with maven-site-plugin -->
+ <skipDeploy>true</skipDeploy>
+ <!-- don't deploy site with maven-site-plugin -->
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
<configuration>
- <content>${project.reporting.outputDirectory}</content><!-- no need for site:stage, use target/site -->
+ <!-- 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>
- <phase>site-deploy</phase><!-- deploy site with maven-scm-publish-plugin -->
<goals>
<goal>publish-scm</goal>
</goals>
+ <phase>site-deploy</phase>
</execution>
</executions>
</plugin>
@@ -122,10 +91,10 @@ under the License.
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
+ <id>ensure-no-container-api</id>
<goals>
<goal>enforce</goal>
</goals>
- <id>ensure-no-container-api</id>
<configuration>
<rules>
<bannedDependencies>
@@ -160,10 +129,10 @@ under the License.
<executions>
<execution>
<id>docck-check</id>
- <phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
+ <phase>verify</phase>
</execution>
</executions>
</plugin>
@@ -176,7 +145,6 @@ under the License.
<!-- 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>
- <maven.it.failure.ignore>false</maven.it.failure.ignore>
</properties>
<build>
<plugins>
@@ -197,10 +165,7 @@ under the License.
<properties>
<maven.compiler.source>${invoker.maven.compiler.source}</maven.compiler.source>
<maven.compiler.target>${invoker.maven.compiler.target}</maven.compiler.target>
- <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->
- <https.protocols>${https.protocols}</https.protocols>
</properties>
- <ignoreFailures>${maven.it.failure.ignore}</ignoreFailures>
</configuration>
<executions>
<execution>
diff --git a/maven-extensions/site-pom.xml b/maven-extensions/site-pom.xml
index 79cace3..983b4c9 100644
--- a/maven-extensions/site-pom.xml
+++ b/maven-extensions/site-pom.xml
@@ -25,8 +25,10 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
+ <!-- we need to have a different gav for pom.xml and site-pom.xml -->
+ <!-- dot at the end is on purpose -->
<artifactId>maven-parent.</artifactId>
- <version>35</version>
+ <version>39</version>
<relativePath>../site-pom.xml</relativePath>
</parent>
@@ -39,6 +41,6 @@ under the License.
<issueManagement>
<system>jira</system>
- <url>https://issues.apache.org/jira/issues/?jql=project%20%3D%20MPOM%20AND%20component%20%3D%20maven-extensions</url>
+ <url>https://issues.apache.org/jira/projects/MPOM</url>
</issueManagement>
</project>
diff --git a/maven-extensions/src/site-docs/site.xml b/maven-extensions/src/site-docs/site.xml
index 56911fd..e713e0b 100644
--- a/maven-extensions/src/site-docs/site.xml
+++ b/maven-extensions/src/site-docs/site.xml
@@ -37,6 +37,14 @@ under the License.
<item name="Doxia Tools" href="../doxia-tools/index.html"/>
</menu>
- <menu ref="parent" />
+ <menu ref="reports" />
+
+ <menu name="ASF">
+ <item name="How Apache Works" href="https://www.apache.org/foundation/how-it-works.html"/>
+ <item name="Foundation" href="https://www.apache.org/foundation/"/>
+ <item name="Data Privacy" href="https://privacy.apache.org/policies/privacy-policy-public.html"/>
+ <item name="Sponsoring Apache" href="https://www.apache.org/foundation/sponsorship.html"/>
+ <item name="Thanks" href="https://www.apache.org/foundation/thanks.html"/>
+ </menu>
</body>
-</project>
\ No newline at end of file
+</project>
diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml
index da0ba46..32cacdb 100644
--- a/maven-plugins/pom.xml
+++ b/maven-plugins/pom.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?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
@@ -17,14 +17,13 @@ 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>35</version>
+ <version>39</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -63,39 +62,6 @@ under the License.
<build>
<pluginManagement>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin</artifactId>
- <configuration>
- <issueManagementSystems>
- <issueManagementSystem>JIRA</issueManagementSystem>
- </issueManagementSystems>
- <maxEntries>1000</maxEntries>
- <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
- <!-- Used by announcement-generate goal -->
- <templateDirectory>org/apache/maven/plugins</templateDirectory>
- <!-- Used by announcement-mail goal -->
- <subject>[ANN] ${project.name} ${project.version} Released</subject>
- <toAddresses>
- <toAddress implementation="java.lang.String">announce@maven.apache.org</toAddress>
- <toAddress implementation="java.lang.String">users@maven.apache.org</toAddress>
- </toAddresses>
- <ccAddresses>
- <ccAddress implementation="java.lang.String">dev@maven.apache.org</ccAddress>
- </ccAddresses>
- <!-- These values need to be specified as properties in the profile apache-release in your settings.xml -->
- <fromDeveloperId>${apache.availid}</fromDeveloperId>
- <smtpHost>${smtp.host}</smtpHost>
- </configuration>
- <dependencies>
- <!-- Used by announcement-generate goal -->
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-shared-resources</artifactId>
- <version>2</version>
- </dependency>
- </dependencies>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
@@ -110,6 +76,9 @@ under the License.
<execution>
<id>default-descriptor</id>
<phase>process-classes</phase>
+ <configuration>
+ <internalJavadocBaseUrl>./apidocs/</internalJavadocBaseUrl>
+ </configuration>
</execution>
<execution>
<id>generate-helpmojo</id>
@@ -124,7 +93,8 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<configuration>
- <skipDeploy>true</skipDeploy><!-- don't deploy site with maven-site-plugin -->
+ <!-- don't deploy site with maven-site-plugin -->
+ <skipDeploy>true</skipDeploy>
</configuration>
</plugin>
</plugins>
@@ -138,15 +108,17 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
<configuration>
- <content>${project.reporting.outputDirectory}</content><!-- no need for site:stage, use target/site -->
+ <!-- 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>
- <phase>site-deploy</phase><!-- deploy site with maven-scm-publish-plugin -->
<goals>
<goal>publish-scm</goal>
</goals>
+ <phase>site-deploy</phase>
</execution>
</executions>
</plugin>
@@ -155,10 +127,10 @@ under the License.
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
+ <id>ensure-no-container-api</id>
<goals>
<goal>enforce</goal>
</goals>
- <id>ensure-no-container-api</id>
<configuration>
<rules>
<bannedDependencies>
@@ -176,15 +148,6 @@ under the License.
</plugins>
</build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
-
<profiles>
<profile>
<id>quality-checks</id>
@@ -202,10 +165,10 @@ under the License.
<executions>
<execution>
<id>docck-check</id>
- <phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
+ <phase>verify</phase>
</execution>
</executions>
</plugin>
@@ -218,7 +181,6 @@ under the License.
<!-- 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>
- <maven.it.failure.ignore>false</maven.it.failure.ignore>
</properties>
<build>
<plugins>
@@ -239,10 +201,7 @@ under the License.
<properties>
<maven.compiler.source>${invoker.maven.compiler.source}</maven.compiler.source>
<maven.compiler.target>${invoker.maven.compiler.target}</maven.compiler.target>
- <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->
- <https.protocols>${https.protocols}</https.protocols>
</properties>
- <ignoreFailures>${maven.it.failure.ignore}</ignoreFailures>
</configuration>
<executions>
<execution>
@@ -262,6 +221,10 @@ under the License.
<id>reporting</id>
<reporting>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-report-plugin</artifactId>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
diff --git a/maven-plugins/site-pom.xml b/maven-plugins/site-pom.xml
index 31558ec..ddab2b4 100644
--- a/maven-plugins/site-pom.xml
+++ b/maven-plugins/site-pom.xml
@@ -25,8 +25,10 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
+ <!-- we need to have a different gav for pom.xml and site-pom.xml -->
+ <!-- dot at the end is on purpose -->
<artifactId>maven-parent.</artifactId>
- <version>35</version>
+ <version>39</version>
<relativePath>../site-pom.xml</relativePath>
</parent>
diff --git a/maven-plugins/src/site-docs/apt/index.apt.vm b/maven-plugins/src/site-docs/apt/index.apt.vm
index 14a68c6..83d859a 100644
--- a/maven-plugins/src/site-docs/apt/index.apt.vm
+++ b/maven-plugins/src/site-docs/apt/index.apt.vm
@@ -56,7 +56,7 @@ mvn -Preporting site-deploy
* History
#if( $project.version.endsWith( "SNAPSHOT" ) )
-#**##set( $prev = 35 )
+#**##set( $prev = 39 )
master: {{{https://github.com/apache/maven-parent/tree/master/maven-plugins/pom.xml}$project.version}}
({{{https://github.com/apache/maven-parent/compare/maven-parent-$prev...master#diff}diff}})
#end
@@ -66,12 +66,21 @@ mvn -Preporting site-deploy
| ({{{https://github.com/apache/maven-parent/compare/maven-parent-$prev...maven-parent-$version#diff}diff}}) | $date |
#end
- As of version 34, this POM sets the Java source and target versions to 1.7. Thus, as any plugin (or other component)
- moved to version 34+ of this POM, it moves to requiring Java 1.7 (was Java 1.5 since version 21, and Java 1.6 since version 27).
+ As of version 38, this POM sets the Java source and target versions to 1.8. Thus, as any plugin (or other component)
+ moved to version 38+ of this POM, it moves to requiring Java 1.8 (was Java 1.5 since version 21, Java 1.6 since
+ version 27, and Java 1.7 since version 34).
*--------------+------------+
|| <<Version>> || <<Release Date>> ||
*--------------+------------+
+#display( 39, '2022-12-11' )
+*--------------+------------+
+#display( 38, '2022-11-21' )
+*--------------+------------+
+#display( 37, '2022-07-20' )
+*--------------+------------+
+#display( 36, '2022-04-18' )
+*--------------+------------+
#display( 35, '2022-03-02' )
*--------------+------------+
#display( 34, '2020-01-30' )
diff --git a/maven-plugins/src/site-docs/site.xml b/maven-plugins/src/site-docs/site.xml
index 2e6ecee..c8cb969 100644
--- a/maven-plugins/src/site-docs/site.xml
+++ b/maven-plugins/src/site-docs/site.xml
@@ -37,6 +37,14 @@ under the License.
<item name="Doxia Tools" href="../doxia-tools/index.html"/>
</menu>
- <menu ref="parent" />
+ <menu ref="reports" />
+
+ <menu name="ASF">
+ <item name="How Apache Works" href="https://www.apache.org/foundation/how-it-works.html"/>
+ <item name="Foundation" href="https://www.apache.org/foundation/"/>
+ <item name="Data Privacy" href="https://privacy.apache.org/policies/privacy-policy-public.html"/>
+ <item name="Sponsoring Apache" href="https://www.apache.org/foundation/sponsorship.html"/>
+ <item name="Thanks" href="https://www.apache.org/foundation/thanks.html"/>
+ </menu>
</body>
-</project>
\ No newline at end of file
+</project>
diff --git a/maven-shared-components/pom.xml b/maven-shared-components/pom.xml
index d88e4d0..5db8c18 100644
--- a/maven-shared-components/pom.xml
+++ b/maven-shared-components/pom.xml
@@ -1,5 +1,4 @@
<?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
@@ -18,14 +17,13 @@ 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>35</version>
+ <version>39</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -59,46 +57,13 @@ under the License.
<build>
<pluginManagement>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin</artifactId>
- <configuration>
- <issueManagementSystems>
- <issueManagementSystem>JIRA</issueManagementSystem>
- </issueManagementSystems>
- <maxEntries>1000</maxEntries>
- <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
- <versionPrefix>${project.artifactId}-</versionPrefix>
- <!-- Used by announcement-generate goal -->
- <templateDirectory>org/apache/maven/shared</templateDirectory>
- <!-- Used by announcement-mail goal -->
- <subject>[ANN] ${project.name} ${project.version} Released</subject>
- <toAddresses>
- <toAddress implementation="java.lang.String">announce@maven.apache.org</toAddress>
- <toAddress implementation="java.lang.String">users@maven.apache.org</toAddress>
- </toAddresses>
- <ccAddresses>
- <ccAddress implementation="java.lang.String">dev@maven.apache.org</ccAddress>
- </ccAddresses>
- <!-- These values need to be specified as properties in the profile apache-release in your settings.xml -->
- <fromDeveloperId>${apache.availid}</fromDeveloperId>
- <smtpHost>${smtp.host}</smtpHost>
- </configuration>
- <dependencies>
- <!-- Used by announcement-generate goal -->
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-shared-resources</artifactId>
- <version>2</version>
- </dependency>
- </dependencies>
- </plugin>
<!-- publish mono-module site with "mvn site-deploy" -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<configuration>
- <skipDeploy>true</skipDeploy><!-- don't deploy site with maven-site-plugin -->
+ <!-- don't deploy site with maven-site-plugin -->
+ <skipDeploy>true</skipDeploy>
</configuration>
</plugin>
</plugins>
@@ -108,15 +73,17 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
<configuration>
- <content>${project.reporting.outputDirectory}</content><!-- no need for site:stage, use target/site -->
+ <!-- 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>
- <phase>site-deploy</phase><!-- deploy site with maven-scm-publish-plugin -->
<goals>
<goal>publish-scm</goal>
</goals>
+ <phase>site-deploy</phase>
</execution>
</executions>
</plugin>
diff --git a/maven-shared-components/site-pom.xml b/maven-shared-components/site-pom.xml
index 79d197e..2a5e2be 100644
--- a/maven-shared-components/site-pom.xml
+++ b/maven-shared-components/site-pom.xml
@@ -25,8 +25,10 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
+ <!-- we need to have a different gav for pom.xml and site-pom.xml -->
+ <!-- dot at the end is on purpose -->
<artifactId>maven-parent.</artifactId>
- <version>35</version>
+ <version>39</version>
<relativePath>../site-pom.xml</relativePath>
</parent>
diff --git a/maven-shared-components/src/site-docs/apt/index.apt.vm b/maven-shared-components/src/site-docs/apt/index.apt.vm
index ddc09ae..ecf2492 100644
--- a/maven-shared-components/src/site-docs/apt/index.apt.vm
+++ b/maven-shared-components/src/site-docs/apt/index.apt.vm
@@ -44,7 +44,7 @@ mvn -Preporting site-deploy
* History
#if( $project.version.endsWith( "SNAPSHOT" ) )
-#**##set( $prev = 35 )
+#**##set( $prev = 39 )
master: {{{https://github.com/apache/maven-parent/tree/master/maven-shared-components/pom.xml}$project.version}}
({{{https://github.com/apache/maven-parent/compare/maven-parent-$prev...master#diff}diff}})
#end
@@ -54,12 +54,21 @@ mvn -Preporting site-deploy
| ({{{https://github.com/apache/maven-parent/compare/maven-parent-$prev...maven-parent-$version#diff}diff}}) | $date |
#end
- As of version 34, this POM sets the Java source and target versions to 1.7. Thus, as any plugin (or other component)
- moved to version 34+ of this POM, it moves to requiring Java 1.7 (was Java 1.5 since version 21, and Java 1.6 since version 27).
+ As of version 38, this POM sets the Java source and target versions to 1.8. Thus, as any plugin (or other component)
+ moved to version 38+ of this POM, it moves to requiring Java 1.8 (was Java 1.5 since version 21, Java 1.6 since
+ version 27, and Java 1.7 since version 34).
*--------------+------------+
|| <<Version>> || <<Release Date>> ||
*--------------+------------+
+#display( 39, '2022-12-11' )
+*--------------+------------+
+#display( 38, '2022-11-21' )
+*--------------+------------+
+#display( 37, '2022-07-20' )
+*--------------+------------+
+#display( 36, '2022-04-18' )
+*--------------+------------+
#display( 35, '2022-03-02' )
*--------------+------------+
#display( 34, '2020-01-30' )
diff --git a/maven-shared-components/src/site-docs/site.xml b/maven-shared-components/src/site-docs/site.xml
index a0c70ae..ea5d133 100644
--- a/maven-shared-components/src/site-docs/site.xml
+++ b/maven-shared-components/src/site-docs/site.xml
@@ -37,6 +37,15 @@ under the License.
<item name="Doxia Tools" href="../doxia-tools/index.html"/>
</menu>
- <menu ref="parent" />
+ <menu ref="reports" />
+
+ <menu name="ASF">
+ <item name="How Apache Works" href="https://www.apache.org/foundation/how-it-works.html"/>
+ <item name="Foundation" href="https://www.apache.org/foundation/"/>
+ <item name="Data Privacy" href="https://privacy.apache.org/policies/privacy-policy-public.html"/>
+ <item name="Sponsoring Apache" href="https://www.apache.org/foundation/sponsorship.html"/>
+ <item name="Thanks" href="https://www.apache.org/foundation/thanks.html"/>
+ </menu>
+
</body>
-</project>
\ No newline at end of file
+</project>
diff --git a/maven-skins/pom.xml b/maven-skins/pom.xml
index 98b650a..ae92609 100644
--- a/maven-skins/pom.xml
+++ b/maven-skins/pom.xml
@@ -1,5 +1,4 @@
<?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
@@ -18,14 +17,13 @@ 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>35</version>
+ <version>39</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -71,7 +69,8 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<configuration>
- <skipDeploy>true</skipDeploy><!-- don't deploy site with maven-site-plugin -->
+ <!-- don't deploy site with maven-site-plugin -->
+ <skipDeploy>true</skipDeploy>
</configuration>
</plugin>
</plugins>
@@ -81,15 +80,17 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
<configuration>
- <content>${project.reporting.outputDirectory}</content><!-- no need for site:stage, use target/site -->
+ <!-- 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>
- <phase>site-deploy</phase><!-- deploy site with maven-scm-publish-plugin -->
<goals>
<goal>publish-scm</goal>
</goals>
+ <phase>site-deploy</phase>
</execution>
</executions>
</plugin>
diff --git a/maven-skins/site-pom.xml b/maven-skins/site-pom.xml
index f3e4bf8..a48ebc8 100644
--- a/maven-skins/site-pom.xml
+++ b/maven-skins/site-pom.xml
@@ -25,8 +25,10 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
+ <!-- we need to have a different gav for pom.xml and site-pom.xml -->
+ <!-- dot at the end is on purpose -->
<artifactId>maven-parent.</artifactId>
- <version>35</version>
+ <version>39</version>
<relativePath>../site-pom.xml</relativePath>
</parent>
diff --git a/maven-skins/src/site-docs/apt/index.apt.vm b/maven-skins/src/site-docs/apt/index.apt.vm
index e494419..10ee220 100644
--- a/maven-skins/src/site-docs/apt/index.apt.vm
+++ b/maven-skins/src/site-docs/apt/index.apt.vm
@@ -34,7 +34,7 @@ Maven Skins Parent POM
History
#if( $project.version.endsWith( "SNAPSHOT" ) )
-#**##set( $prev = 35 )
+#**##set( $prev = 39 )
master: {{{https://github.com/apache/maven-parent/tree/master/maven-skins/pom.xml}$project.version}}
({{{https://github.com/apache/maven-parent/compare/maven-parent-$prev...master#diff}diff}})
#end
@@ -47,6 +47,14 @@ History
*--------------+------------+
|| <<Version>> || <<Release Date>> ||
*--------------+------------+
+#display( 39, '2022-12-11' )
+*--------------+------------+
+#display( 38, '2022-11-21' )
+*--------------+------------+
+#display( 37, '2022-07-20' )
+*--------------+------------+
+#display( 36, '2022-04-18' )
+*--------------+------------+
#display( 35, '2022-03-02' )
*--------------+------------+
#display( 34, '2020-01-30' )
diff --git a/maven-skins/src/site-docs/site.xml b/maven-skins/src/site-docs/site.xml
index f9d372f..4adb803 100644
--- a/maven-skins/src/site-docs/site.xml
+++ b/maven-skins/src/site-docs/site.xml
@@ -37,6 +37,14 @@ under the License.
<item name="Doxia Tools" href="../doxia-tools/index.html"/>
</menu>
- <menu ref="parent" />
+ <menu ref="reports" />
+
+ <menu name="ASF">
+ <item name="How Apache Works" href="https://www.apache.org/foundation/how-it-works.html"/>
+ <item name="Foundation" href="https://www.apache.org/foundation/"/>
+ <item name="Data Privacy" href="https://privacy.apache.org/policies/privacy-policy-public.html"/>
+ <item name="Sponsoring Apache" href="https://www.apache.org/foundation/sponsorship.html"/>
+ <item name="Thanks" href="https://www.apache.org/foundation/thanks.html"/>
+ </menu>
</body>
-</project>
\ No newline at end of file
+</project>
diff --git a/pom.xml b/pom.xml
index 6fb6ba0..028b8fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,4 @@
<?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
@@ -18,7 +17,6 @@ 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>
@@ -26,13 +24,13 @@ under the License.
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>25</version>
+ <version>29</version>
<relativePath>../asf/pom.xml</relativePath>
</parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>35</version>
+ <version>39</version>
<packaging>pom</packaging>
<name>Apache Maven</name>
@@ -43,15 +41,15 @@ under the License.
<!-- Developers listed by PMC Chair, PMC, Committers, Contributers, all alphabetical-->
<developers>
<developer>
- <id>rfscholte</id>
- <name>Robert Scholte</name>
- <email>rfscholte@apache.org</email>
+ <id>khmarbaise</id>
+ <name>Karl Heinz Marbaise</name>
+ <email>khmarbaise@apache.org</email>
<roles>
<role>PMC Chair</role>
</roles>
- <timezone>Europe/Amsterdam</timezone>
+ <timezone>+1</timezone>
<properties>
- <twitter>@rfscholte</twitter>
+ <twitter>@khmarbaise</twitter>
</properties>
</developer>
<developer>
@@ -104,10 +102,10 @@ under the License.
<id>cstamas</id>
<name>Tamas Cservenak</name>
<email>cstamas@apache.org</email>
- <timezone>+1</timezone>
<roles>
<role>PMC Member</role>
</roles>
+ <timezone>+1</timezone>
</developer>
<developer>
<id>dennisl</id>
@@ -148,6 +146,16 @@ under the License.
</roles>
<timezone>Europe/Paris</timezone>
</developer>
+ <developer>
+ <id>gnodet</id>
+ <name>Guillaume Nodet</name>
+ <email>gnodet@apache.org</email>
+ <organization>Red Hat</organization>
+ <roles>
+ <role>PMC Member</role>
+ </roles>
+ <timezone>Europe/Paris</timezone>
+ </developer>
<developer>
<id>hboutemy</id>
<name>Hervé Boutemy</name>
@@ -177,18 +185,6 @@ under the License.
</roles>
<timezone>-5</timezone>
</developer>
- <developer>
- <id>khmarbaise</id>
- <name>Karl Heinz Marbaise</name>
- <email>khmarbaise@apache.org</email>
- <roles>
- <role>PMC Member</role>
- </roles>
- <timezone>+1</timezone>
- <properties>
- <twitter>@khmarbaise</twitter>
- </properties>
- </developer>
<developer>
<id>krosenvold</id>
<name>Kristian Rosenvold</name>
@@ -223,15 +219,36 @@ under the License.
</roles>
<timezone>Europe/Berlin</timezone>
</developer>
+ <developer>
+ <id>rfscholte</id>
+ <name>Robert Scholte</name>
+ <email>rfscholte@apache.org</email>
+ <roles>
+ <role>PMC Member</role>
+ </roles>
+ <timezone>Europe/Amsterdam</timezone>
+ <properties>
+ <twitter>@rfscholte</twitter>
+ </properties>
+ </developer>
<developer>
<id>rgoers</id>
<name>Ralph Goers</name>
<email>rgoers@apache.org</email>
<organization>Intuit</organization>
+ <roles>
+ <role>PMC Member</role>
+ </roles>
<timezone>-8</timezone>
+ </developer>
+ <developer>
+ <id>sjaranowski</id>
+ <name>Slawomir Jaranowski</name>
+ <email>sjaranowski@apache.org</email>
<roles>
<role>PMC Member</role>
</roles>
+ <timezone>Europe/Warsaw</timezone>
</developer>
<developer>
<id>stephenc</id>
@@ -285,20 +302,20 @@ under the License.
<id>adangel</id>
<name>Andreas Dangel</name>
<email>adangel@apache.org</email>
- <timezone>Europe/Berlin</timezone>
<roles>
<role>Committer</role>
</roles>
+ <timezone>Europe/Berlin</timezone>
</developer>
<developer>
<id>bdemers</id>
<name>Brian Demers</name>
- <organization>Sonatype</organization>
<email>bdemers@apache.org</email>
- <timezone>-5</timezone>
+ <organization>Sonatype</organization>
<roles>
<role>Committer</role>
</roles>
+ <timezone>-5</timezone>
</developer>
<developer>
<id>bellingard</id>
@@ -330,20 +347,20 @@ under the License.
<id>dantran</id>
<name>Dan Tran</name>
<email>dantran@apache.org</email>
- <timezone>-8</timezone>
<roles>
<role>Committer</role>
</roles>
+ <timezone>-8</timezone>
</developer>
<developer>
<id>dbradicich</id>
<name>Damian Bradicich</name>
- <organization>Sonatype</organization>
<email>dbradicich@apache.org</email>
- <timezone>-5</timezone>
+ <organization>Sonatype</organization>
<roles>
<role>Committer</role>
</roles>
+ <timezone>-5</timezone>
</developer>
<developer>
<id>brett</id>
@@ -384,21 +401,11 @@ under the License.
</roles>
<timezone>+1</timezone>
</developer>
- <developer>
- <id>gnodet</id>
- <name>Guillaume Nodet</name>
- <email>gnodet@apache.org</email>
- <organization>Red Hat</organization>
- <roles>
- <role>Committer</role>
- </roles>
- <timezone>Europe/Paris</timezone>
- </developer>
<developer>
<id>godin</id>
<name>Evgeny Mandrikov</name>
- <organization>SonarSource</organization>
<email>godin@apache.org</email>
+ <organization>SonarSource</organization>
<roles>
<role>Committer</role>
</roles>
@@ -421,7 +428,7 @@ under the License.
<role>Committer</role>
</roles>
<timezone>Europe/Zurich</timezone>
- </developer>
+ </developer>
<developer>
<id>jjensen</id>
<name>Jeff Jensen</name>
@@ -429,6 +436,16 @@ under the License.
<role>Committer</role>
</roles>
</developer>
+ <developer>
+ <id>kwin</id>
+ <name>Konrad Windszus</name>
+ <email>kwin@apache.org</email>
+ <organization>Cognizant Netcentric</organization>
+ <roles>
+ <role>Committer</role>
+ </roles>
+ <timezone>Europe/Berlin</timezone>
+ </developer>
<developer>
<id>ltheussl</id>
<name>Lukas Theussl</name>
@@ -562,15 +579,6 @@ under the License.
</roles>
<timezone>+1</timezone>
</developer>
- <developer>
- <id>sjaranowski</id>
- <name>Slawomir Jaranowski</name>
- <email>sjaranowski@apache.org</email>
- <roles>
- <role>Committer</role>
- </roles>
- <timezone>Europe/Warsaw</timezone>
- </developer>
<developer>
<id>sor</id>
<name>Christian Stein</name>
@@ -868,9 +876,9 @@ under the License.
</mailingList>
<mailingList>
<name>Maven Announcements List</name>
- <post>announce@maven.apache.org</post>
<subscribe>mailto:announce-subscribe@maven.apache.org</subscribe>
<unsubscribe>mailto:announce-unsubscribe@maven.apache.org</unsubscribe>
+ <post>announce@maven.apache.org</post>
<archive>https://lists.apache.org/list.html?announce@maven.apache.org</archive>
<otherArchives>
<otherArchive>https://mail-archives.apache.org/mod_mbox/maven-announce/</otherArchive>
@@ -901,8 +909,8 @@ under the License.
<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-39</tag>
<url>https://github.com/apache/maven-parent/tree/${project.scm.tag}</url>
- <tag>maven-parent-35</tag>
</scm>
<ciManagement>
@@ -925,16 +933,22 @@ under the License.
</distributionManagement>
<properties>
- <javaVersion>7</javaVersion>
+ <javaVersion>8</javaVersion>
<maven.compiler.source>1.${javaVersion}</maven.compiler.source>
- <maven.compiler.target>1.${javaVersion}</maven.compiler.target>
+ <maven.compiler.target>1.${javaVersion}</maven.compiler.target>
<sonar.host.url>https://builds.apache.org/analysis/</sonar.host.url>
<maven.site.cache>${user.home}/maven-sites</maven.site.cache>
- <maven.site.path>../..</maven.site.path><!-- to be overridden -->
+ <!-- to be overridden -->
+ <maven.site.path>../..</maven.site.path>
+ <invoker.streamLogsOnFailures>true</invoker.streamLogsOnFailures>
<sisuVersion>0.3.5</sisuVersion>
- <!-- don't fail check for some rules that are too hard to enforce (could even be told broken for some) -->
- <checkstyle.violation.ignore>RedundantThrows,NewlineAtEndOfFile,ParameterNumber,MethodLength,FileLength</checkstyle.violation.ignore>
- <project.build.outputTimestamp>2022-02-27T18:03:24Z</project.build.outputTimestamp>
+ <fluidoSkinVersion>1.11.1</fluidoSkinVersion>
+ <!-- for surefire, failsafe and surefire-report -->
+ <surefire.version>3.0.0-M7</surefire.version>
+ <!-- don't fail check for some rules that are too hard to enforce (could even be told broken for some)
+ and those that are enforced by the formatting checks from spotless -->
+ <checkstyle.violation.ignore>ParameterNumber,MethodLength,FileLength</checkstyle.violation.ignore>
+ <project.build.outputTimestamp>2022-12-11T20:07:23Z</project.build.outputTimestamp>
</properties>
<dependencyManagement>
@@ -950,28 +964,23 @@ under the License.
<artifactId>org.eclipse.sisu.plexus</artifactId>
<version>${sisuVersion}</version>
</dependency>
- <!-- Commonly shared: last Java7 -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.3.0</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-annotations</artifactId>
- <version>2.1.1</version>
+ <version>3.5.0</version>
</dependency>
</dependencies>
</dependencyManagement>
<repositories>
- <repository><!-- useful to resolve parent pom when it is a SNAPSHOT -->
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>https://repository.apache.org/snapshots</url>
+ <!-- useful to resolve parent pom when it is a SNAPSHOT -->
+ <repository>
<releases>
<enabled>false</enabled>
</releases>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>https://repository.apache.org/snapshots</url>
</repository>
</repositories>
@@ -1004,10 +1013,7 @@ under the License.
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
- <version>1.11</version>
- <configuration>
- <useJava5>true</useJava5>
- </configuration>
+ <version>2.0.0</version>
</plugin>
<!-- site publishing configuration -->
<plugin>
@@ -1030,10 +1036,9 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.2.0</version>
<configuration>
- <configLocation>config/maven_checks.xml</configLocation>
- <headerLocation>config/maven-header.txt</headerLocation>
+ <configLocation>config/maven_checks_nocodestyle.xml</configLocation>
<!-- workaround to avoid analysing generated content (Modello, plugin help mojo, ...) -->
<sourceDirectories>
<sourceDirectory>src/main/java</sourceDirectory>
@@ -1047,19 +1052,19 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-resources</artifactId>
- <version>2</version>
+ <version>5</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>3.1.1</version>
+ <version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>3.15.0</version>
+ <version>3.19.0</version>
<configuration>
<targetJdk>${maven.compiler.target}</targetJdk>
<rulesets>
@@ -1081,17 +1086,12 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-toolchains-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin</artifactId>
- <version>2.12.1</version>
+ <version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -1128,7 +1128,7 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<configuration>
- <streamLogsOnFailures>true</streamLogsOnFailures>
+ <streamLogsOnFailures>${invoker.streamLogsOnFailures}</streamLogsOnFailures>
<environmentVariables>
<JENKINS_MAVEN_AGENT_DISABLED>true</JENKINS_MAVEN_AGENT_DISABLED>
</environmentVariables>
@@ -1141,7 +1141,7 @@ under the License.
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>extra-enforcer-rules</artifactId>
- <version>1.5.1</version>
+ <version>1.6.1</version>
</dependency>
</dependencies>
<executions>
@@ -1161,9 +1161,57 @@ under the License.
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>com.diffplug.spotless</groupId>
+ <artifactId>spotless-maven-plugin</artifactId>
+ <version>2.28.0</version>
+ <configuration>
+ <java>
+ <!-- orders of used formatters are important MPOM-376 -->
+ <!-- eg. palantir override importOrder, so should be first -->
+ <palantirJavaFormat />
+ <removeUnusedImports />
+ <importOrder>
+ <file>config/maven-eclipse-importorder.txt</file>
+ </importOrder>
+ <licenseHeader>
+ <file>config/maven-header-plain.txt</file>
+ </licenseHeader>
+ </java>
+ <pom>
+ <sortPom>
+ <expandEmptyElements>false</expandEmptyElements>
+ <!-- https://issues.apache.org/jira/browse/MRELEASE-1111 -->
+ <spaceBeforeCloseEmptyElement>true</spaceBeforeCloseEmptyElement>
+ </sortPom>
+ </pom>
+ <upToDateChecking>
+ <enabled>true</enabled>
+ </upToDateChecking>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-shared-resources</artifactId>
+ <version>5</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <goals>
+ <goal>${spotless.action}</goal>
+ </goals>
+ <phase>process-sources</phase>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
+ <plugin>
+ <groupId>com.diffplug.spotless</groupId>
+ <artifactId>spotless-maven-plugin</artifactId>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
@@ -1173,6 +1221,7 @@ under the License.
<goals>
<goal>check</goal>
</goals>
+ <phase>process-sources</phase>
</execution>
</executions>
</plugin>
@@ -1185,11 +1234,15 @@ under the License.
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludes combine.children="append">
- <exclude>.repository/**</exclude><!-- Jenkins job with local Maven repository -->
- <exclude>.maven/spy.log</exclude><!-- Hudson Maven3 integration log -->
- <exclude>dependency-reduced-pom.xml</exclude><!-- Maven shade plugin -->
- <exclude>.asf.yaml</exclude><!-- GitHub Support -->
<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>
@@ -1198,6 +1251,8 @@ under the License.
<goals>
<goal>check</goal>
</goals>
+ <!-- execute after spotless-maven-plugin -->
+ <phase>process-resources</phase>
</execution>
</executions>
</plugin>
@@ -1235,6 +1290,28 @@ under the License.
</reporting>
<profiles>
+ <profile>
+ <id>format-check</id>
+ <activation>
+ <property>
+ <name>!format</name>
+ </property>
+ </activation>
+ <properties>
+ <spotless.action>check</spotless.action>
+ </properties>
+ </profile>
+ <profile>
+ <id>format</id>
+ <activation>
+ <property>
+ <name>format</name>
+ </property>
+ </activation>
+ <properties>
+ <spotless.action>apply</spotless.action>
+ </properties>
+ </profile>
<profile>
<!-- "utility" profile allowing all downstream projects to prepare for upcoming bans: drop legacy -->
<id>drop-legacy-dependencies</id>
@@ -1329,10 +1406,10 @@ under the License.
<executions>
<execution>
<id>cpd-check</id>
- <phase>verify</phase>
<goals>
<goal>cpd-check</goal>
</goals>
+ <phase>verify</phase>
</execution>
</executions>
</plugin>
@@ -1366,6 +1443,15 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <id>default</id>
+ <reports>
+ <report>cpd</report>
+ <report>pmd</report>
+ </reports>
+ </reportSet>
+ </reportSets>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -1434,7 +1520,6 @@ under the License.
<id>default</id>
<reports>
<report>javadoc</report>
- <report>test-javadoc</report>
</reports>
</reportSet>
</reportSets>
diff --git a/site-pom.xml b/site-pom.xml
index 0bd1277..d5ea406 100644
--- a/site-pom.xml
+++ b/site-pom.xml
@@ -25,10 +25,12 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>35</version>
+ <version>39</version>
<relativePath>./pom.xml</relativePath>
</parent>
+ <!-- we need to have a different gav for pom.xml and site-pom.xml -->
+ <!-- dot at the end is on purpose -->
<artifactId>maven-parent.</artifactId>
<packaging>pom</packaging>
@@ -56,7 +58,7 @@ under the License.
</issueManagement>
<ciManagement>
<system>Jenkins</system>
- <url>https://builds.apache.org/view/M-R/view/Maven/job/maven-box/job/maven-parent/</url>
+ <url>https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven-parent/</url>
</ciManagement>
<distributionManagement>
<site>
diff --git a/src/site-docs/apt/index.apt.vm b/src/site-docs/apt/index.apt.vm
index 18809e0..ce8be02 100644
--- a/src/site-docs/apt/index.apt.vm
+++ b/src/site-docs/apt/index.apt.vm
@@ -56,6 +56,17 @@ mvn -Preporting site
This POM provides <<<jdk-toolchain>>> profile to activate JDK selection as a toolchain with version
requirement configured as minimum java version for the project.
+* The <<<format>>> Profile
+
+ Since version 38 the <<<format>>> profile can be used to explicitly format source files with
+ {{{https://github.com/diffplug/spotless/tree/main/plugin-maven}spotless-maven-plugin}} according to
+ {{{/developers/conventions/code.html}Maven standards}}.
+ This requires the phase {{{/guides/introduction/introduction-to-the-lifecycle.html#default-lifecycle}process-sources}}.
+ After applying bigger reformatting it is recommended to add or update a <<<.git-blame-ignore-revs>>> file in the root of the repository
+ containing a line with the SHA1 of the formatting commit to ignore those changes when using <<<git blame>>> (or equivalent concepts).
+ This is automatically considered by {{{https://docs.github.com/en/repositories/working-with-files/using-files/viewing-a-file#bypassing-git-blame-ignore-revs-in-the-blame-view}GitHub}}
+ and can optionally be considered with {{{https://git-scm.com/docs/git-blame#Documentation/git-blame.txt---ignore-revs-fileltfilegt}local <<<git blame>>>}}
+
* Site Publication
This POM prepares site publication to {{{/developers/website/index.html}Apache Maven's site svnpubsub}}.
@@ -88,7 +99,7 @@ mvn scm-publish:publish-scm
* History
#if( $project.version.endsWith( "SNAPSHOT" ) )
-#**##set( $prev = 35 )
+#**##set( $prev = 39 )
master: {{{https://github.com/apache/maven-parent/tree/master/pom.xml}$project.version}}
({{{https://github.com/apache/maven-parent/compare/maven-parent-$prev...master#diff}diff}},
{{{https://github.com/apache/maven-parent/compare/maven-parent-$prev...master}commits}})
@@ -100,12 +111,21 @@ mvn scm-publish:publish-scm
| {{{https://github.com/apache/maven-parent/compare/maven-parent-$prev...maven-parent-$version}commits}}) | $date |
#end
- As of version 34, this POM sets the Java source and target versions to 1.7. Thus, as any plugin (or other component)
- moved to version 34+ of this POM, it moves to requiring Java 1.7 (was Java 1.5 since version 21, and Java 1.6 since version 27).
+ As of version 38, this POM sets the Java source and target versions to 1.8. Thus, as any plugin (or other component)
+ moved to version 38+ of this POM, it moves to requiring Java 1.8 (was Java 1.5 since version 21, Java 1.6 since
+ version 27, and Java 1.7 since version 34).
*--------------+------------+
|| <<Version>> || <<Release Date>> ||
*--------------+------------+
+#display( 39, '2022-12-11' )
+*--------------+------------+
+#display( 38, '2022-11-21' )
+*--------------+------------+
+#display( 37, '2022-07-20' )
+*--------------+------------+
+#display( 36, '2022-04-18' )
+*--------------+------------+
#display( 35, '2022-03-02' )
*--------------+------------+
#display( 34, '2020-01-30' )
diff --git a/src/site-docs/site.xml b/src/site-docs/site.xml
index 7785fc9..f6a441f 100644
--- a/src/site-docs/site.xml
+++ b/src/site-docs/site.xml
@@ -37,22 +37,23 @@ under the License.
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
- <version>1.10.0</version>
+ <version>${fluidoSkinVersion}</version>
</skin>
<edit>${project.scm.url}</edit>
- <googleAnalyticsAccountId>UA-140879-1</googleAnalyticsAccountId>
<custom>
+ <matomo>
+ <siteId>3</siteId>
+ <url>https://analytics.apache.org/</url>
+ <options>
+ <disableCookies/>
+ <trackPageView/>
+ <enableLinkTracking/>
+ </options>
+ </matomo>
<fluidoSkin>
<sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
- <twitter>
- <user>ASFMavenProject</user>
- <showUser>true</showUser>
- </twitter>
- <googleSearch>
- <sitesearch/>
- </googleSearch>
</fluidoSkin>
</custom>
@@ -85,7 +86,15 @@ under the License.
<item name="Doxia Tools" href="doxia-tools/index.html"/>
</menu>
- <menu ref="reports" inherit="bottom" />
+ <menu ref="reports" />
+
+ <menu name="ASF">
+ <item name="How Apache Works" href="https://www.apache.org/foundation/how-it-works.html"/>
+ <item name="Foundation" href="https://www.apache.org/foundation/"/>
+ <item name="Data Privacy" href="https://privacy.apache.org/policies/privacy-policy-public.html"/>
+ <item name="Sponsoring Apache" href="https://www.apache.org/foundation/sponsorship.html"/>
+ <item name="Thanks" href="https://www.apache.org/foundation/thanks.html"/>
+ </menu>
</body>
-</project>
\ No newline at end of file
+</project>
diff --git a/src/site-docs/xdoc/download.xml.vm b/src/site-docs/xdoc/download.xml.vm
index eeb2481..fc564f1 100644
--- a/src/site-docs/xdoc/download.xml.vm
+++ b/src/site-docs/xdoc/download.xml.vm
@@ -23,102 +23,51 @@ under the License.
<properties>
<title>Download ${project.name} Source</title>
</properties>
+
<body>
<section name="Download ${project.name} ${project.version} Source">
- <p>${project.name} ${project.version} is distributed in source format. Use a source archive if you intend to build
- ${project.name} yourself. Otherwise, simply use the ready-made binary artifacts from central repository.</p>
-
- <p>You will be prompted for a mirror - if the file is not found on yours, please be patient, as it may take 24
- hours to reach all mirrors.<p/>
-
- <p>In order to guard against corrupted downloads/installations, it is highly recommended to
- <a href="https://www.apache.org/dev/release-signing#verifying-signature">verify the signature</a>
- of the release bundles against the public <a href="https://www.apache.org/dist/maven/KEYS">KEYS</a> used by the Apache Maven
- developers.</p>
+ <p><strong>${project.name} ${project.version}</strong> is distributed in source format.</p>
- <p>${project.name} is distributed under the <a href="https://www.apache.org/licenses/">Apache License, version 2.0</a>.</p>
+ <p>Use a source archive if you intend to build <strong>${project.name}</strong> yourself.</p>
- <p></p>We <b>strongly</b> encourage our users to configure a Maven repository mirror closer to their location, please read <a href="./guides/mini/guide-mirror-settings.html">How to Use Mirrors for Repositories</a>.</p>
-
- <a name="mirror"/>
- <subsection name="Mirror">
-
- <p>
- [if-any logo]
- <a href="[link]">
- <img align="right" src="[logo]" border="0"
- alt="logo"/>
- </a>
- [end]
- The currently selected mirror is
- <b>[preferred]</b>.
- If you encounter a problem with this mirror,
- please select another mirror.
- If all mirrors are failing, there are
- <i>backup</i>
- mirrors
- (at the end of the mirrors list) that should be available.
- </p>
+ <p>Otherwise, simply use the ready-made binary artifacts from <strong>central repository</strong>.</p>
- <form action="[location]" method="get" id="SelectMirror">
- Other mirrors:
- <select name="Preferred">
- [if-any http]
- [for http]
- <option value="[http]">[http]</option>
- [end]
- [end]
- [if-any ftp]
- [for ftp]
- <option value="[ftp]">[ftp]</option>
- [end]
- [end]
- [if-any backup]
- [for backup]
- <option value="[backup]">[backup] (backup)</option>
- [end]
- [end]
- </select>
- <input type="submit" value="Change"/>
- </form>
+ <p><strong>${project.name}</strong> is distributed under the <a href="https://www.apache.org/licenses/">Apache License, version 2.0</a>.</p>
- <p>
- You may also consult the
- <a href="https://www.apache.org/mirrors/">complete list of
- mirrors.</a>
+ <subsection name="Files">
+
+ <p>This is the current stable version of <strong>${project.name}</strong>.</p>
+
+ <table>
+ <thead>
+ <tr>
+ <th></th>
+ <th>Link</th>
+ <th>Checksum</th>
+ <th>Signature</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>${project.name} ${project.version} (Source zip)</td>
+ <td><a href="[preferred]maven/pom/maven-parent-${project.version}-source-release.zip">maven-parent-${project.version}-source-release.zip</a></td>
+ <td><a href="https://downloads.apache.org/maven/pom/maven-parent-${project.version}-source-release.zip.sha512">maven-parent-${project.version}-source-release.zip.sha512</a></td>
+ <td><a href="https://downloads.apache.org/maven/pom/maven-parent-${project.version}-source-release.zip.asc">maven-parent-${project.version}-source-release.zip.asc</a></td>
+ </tr>
+ </tbody>
+ </table>
+
+ <p>It is essential that you <a href="https://www.apache.org/info/verification.html">verify the integrity</a> of the downloaded file
+ using the checksum (.sha512 file)
+ or using the signature (.asc file) against the public <a href="https://downloads.apache.org/maven/KEYS">KEYS</a> used by the Apache Maven developers.
</p>
</subsection>
-
- <subsection name="${project.name} ${project.version}">
-
- <p>This is the current stable version of ${project.name}.</p>
-
- <table>
- <thead>
- <tr>
- <th></th>
- <th>Link</th>
- <th>Checksum</th>
- <th>Signature</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>${project.name} ${project.version} (Source zip)</td>
- <td><a href="[preferred]maven/pom/maven-parent-${project.version}-source-release.zip">maven/pom/maven-parent-${project.version}-source-release.zip</a></td>
- <td><a href="https://www.apache.org/dist/maven/pom/maven-parent-${project.version}-source-release.zip.sha512">maven/pom/maven-parent-${project.version}-source-release.zip.sha512</a></td>
- <td><a href="https://www.apache.org/dist/maven/pom/maven-parent-${project.version}-source-release.zip.asc">maven/pom/maven-parent-${project.version}-source-release.zip.asc</a></td>
- </tr>
- </tbody>
- </table>
- </subsection>
<subsection name="Previous Versions">
-
- <p>Older non-recommended releases can be found on our <a href="https://archive.apache.org/dist/maven/pom/">archive site</a>.</p>
-
+ <p>It is strongly recommended to use the latest release version of <strong>${project.name}</strong> to take advantage of the newest features and bug fixes.</p>
+ <p>Older non-recommended releases can be found on our <a href="https://archive.apache.org/dist/maven/pom/">archive site</a>.</p>
</subsection>
</section>
</body>
diff --git a/src/site/site.xml b/src/site/site.xml
index 1eaa610..8ffcd85 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -36,20 +36,23 @@ under the License.
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
- <version>1.10.0</version>
+ <version>${fluidoSkinVersion}</version>
</skin>
<edit>${project.scm.url}</edit>
- <googleAnalyticsAccountId>UA-140879-1</googleAnalyticsAccountId>
<custom>
+ <matomo>
+ <siteId>3</siteId>
+ <url>https://analytics.apache.org/</url>
+ <options>
+ <disableCookies/>
+ <trackPageView/>
+ <enableLinkTracking/>
+ </options>
+ </matomo>
<fluidoSkin>
<sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
- <twitter>
- <user>ASFMavenProject</user>
- <showUser>true</showUser>
- </twitter>
- <googleSearch />
</fluidoSkin>
</custom>
@@ -88,6 +91,7 @@ under the License.
<menu name="ASF" inherit="bottom">
<item name="How Apache Works" href="https://www.apache.org/foundation/how-it-works.html"/>
<item name="Foundation" href="https://www.apache.org/foundation/"/>
+ <item name="Data Privacy" href="https://privacy.apache.org/policies/privacy-policy-public.html"/>
<item name="Sponsoring Apache" href="https://www.apache.org/foundation/sponsorship.html"/>
<item name="Thanks" href="https://www.apache.org/foundation/thanks.html"/>
</menu>
Debdiff
[The following lists of changes regard files as different if they have different names, permissions or owners.]
Files in second set of .debs but not in first
-rw-r--r-- root/root /usr/share/maven-repo/org/apache/maven/doxia/doxia-tools/39/doxia-tools-39.pom -rw-r--r-- root/root /usr/share/maven-repo/org/apache/maven/extensions/maven-extensions/39/maven-extensions-39.pom -rw-r--r-- root/root /usr/share/maven-repo/org/apache/maven/maven-parent/39/maven-parent-39-site.xml -rw-r--r-- root/root /usr/share/maven-repo/org/apache/maven/maven-parent/39/maven-parent-39.pom -rw-r--r-- root/root /usr/share/maven-repo/org/apache/maven/plugins/maven-plugins/39/maven-plugins-39.pom -rw-r--r-- root/root /usr/share/maven-repo/org/apache/maven/shared/maven-shared-components/39/maven-shared-components-39.pom
Files in first set of .debs but not in second
-rw-r--r-- root/root /usr/share/maven-repo/org/apache/maven/doxia/doxia-tools/35/doxia-tools-35.pom -rw-r--r-- root/root /usr/share/maven-repo/org/apache/maven/extensions/maven-extensions/35/maven-extensions-35.pom -rw-r--r-- root/root /usr/share/maven-repo/org/apache/maven/maven-parent/35/maven-parent-35-site.xml -rw-r--r-- root/root /usr/share/maven-repo/org/apache/maven/maven-parent/35/maven-parent-35.pom -rw-r--r-- root/root /usr/share/maven-repo/org/apache/maven/plugins/maven-plugins/35/maven-plugins-35.pom -rw-r--r-- root/root /usr/share/maven-repo/org/apache/maven/shared/maven-shared-components/35/maven-shared-components-35.pom
No differences were encountered in the control files