[Git][java-team/apache-pom][master] 16 commits: Standards-Version updated to 4.6.1

Emmanuel Bourg (@ebourg) gitlab at salsa.debian.org
Wed Sep 28 08:05:38 BST 2022



Emmanuel Bourg pushed to branch master at Debian Java Maintainers / apache-pom


Commits:
c1d7911e by Emmanuel Bourg at 2022-09-28T01:11:39+02:00
Standards-Version updated to 4.6.1

- - - - -
522eeb66 by Emmanuel Bourg at 2022-09-28T01:11:52+02:00
Switch to debhelper level 13

- - - - -
83385e25 by Emmanuel Bourg at 2022-09-28T01:12:02+02:00
Use salsa.debian.org Vcs-* URLs

- - - - -
1a255671 by Emmanuel Bourg at 2022-09-28T01:13:15+02:00
Wrap and sort

- - - - -
23bbc1ac by Emmanuel Bourg at 2022-09-28T01:14:45+02:00
Removed Damien Raude-Morvan from the uploaders (Closes: #889440)

- - - - -
c4683878 by Emmanuel Bourg at 2022-09-28T01:20:44+02:00
Track and download the new releases from GitHub

- - - - -
4211b68d by Emmanuel Bourg at 2022-09-28T01:22:01+02:00
New upstream version 19
- - - - -
0dd453b6 by Emmanuel Bourg at 2022-09-28T01:22:06+02:00
New upstream version 20
- - - - -
030318a2 by Emmanuel Bourg at 2022-09-28T01:22:10+02:00
New upstream version 21
- - - - -
44979bf0 by Emmanuel Bourg at 2022-09-28T01:22:14+02:00
New upstream version 22
- - - - -
95b609f4 by Emmanuel Bourg at 2022-09-28T01:22:17+02:00
New upstream version 23
- - - - -
11cc98a7 by Emmanuel Bourg at 2022-09-28T01:22:20+02:00
New upstream version 24
- - - - -
93908afc by Emmanuel Bourg at 2022-09-28T01:22:33+02:00
New upstream version 25
- - - - -
f7f1eb9c by Emmanuel Bourg at 2022-09-28T01:22:33+02:00
Update upstream source from tag 'upstream/25'

Update to upstream version '25'
with Debian dir 896d408cc1b225abb84fb55d441ce4f4a267f6e0
- - - - -
f2578170 by Emmanuel Bourg at 2022-09-28T09:04:44+02:00
Updated the Maven rules

- - - - -
1639076d by Emmanuel Bourg at 2022-09-28T09:04:52+02:00
Upload to unstable

- - - - -


20 changed files:

- + .asf.yaml
- + .github/dependabot.yml
- + .github/workflows/maven-verify.yml
- + .gitignore
- + .maven-apache-parent.marker
- + Jenkinsfile
- + README.md
- debian/changelog
- − debian/compat
- debian/control
- debian/copyright
- debian/maven.ignoreRules
- − debian/orig-tar.sh
- debian/rules
- debian/watch
- pom.xml
- site-pom.xml
- src/site-docs/apt/index.apt.vm
- src/site-docs/site.xml
- src/site-docs/xdoc/download.xml.vm


Changes:

=====================================
.asf.yaml
=====================================
@@ -0,0 +1,24 @@
+# 
+#  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.
+#
+# see https://s.apache.org/asfyaml
+github:
+  description: "Apache Software Foundation Parent POM"
+  homepage: https://maven.apache.org/pom/asf/
+  labels:
+    - java
+    - build-management
+    - maven


=====================================
.github/dependabot.yml
=====================================
@@ -0,0 +1,24 @@
+#
+#  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.
+#
+version: 2
+updates:
+- package-ecosystem: maven
+  directory: "/"
+  schedule:
+    interval: daily
+    time: '04:00'
+  open-pull-requests-limit: 10


=====================================
.github/workflows/maven-verify.yml
=====================================
@@ -0,0 +1,27 @@
+# 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.
+
+name: Verify
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+    name: Verify
+    uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml at v2


=====================================
.gitignore
=====================================
@@ -0,0 +1,15 @@
+target/
+.project
+.classpath
+.settings/
+.svn/
+bin/
+# Intellij
+*.ipr
+*.iml
+.idea
+out/
+.DS_Store
+/bootstrap
+/dependencies.xml
+.java-version


=====================================
.maven-apache-parent.marker
=====================================
@@ -0,0 +1,17 @@
+<!---
+ 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.
+-->
+This is just a marker file to make sure that profile "enforce-output-timestamp-property" is not active for builds of this project.


=====================================
Jenkinsfile
=====================================
@@ -0,0 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+asfMavenTlpStdBuild(jdks:['8'])


=====================================
README.md
=====================================
@@ -0,0 +1,96 @@
+<!---
+ 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.
+-->
+Contributing to [Apache Software Foundation Parent POM](https://maven.apache.org/pom/asf/)
+======================
+
+[![ASF Jira](https://img.shields.io/endpoint?url=https%3A%2F%2Fmaven.apache.org%2Fbadges%2Fasf_jira-MPOM.json)][jira]
+[![Apache License, Version 2.0, January 2004](https://img.shields.io/github/license/apache/maven.svg?label=License)][license]
+[![Maven Central](https://img.shields.io/maven-central/v/org.apache/apache.svg?label=Maven%20Central)](https://search.maven.org/artifact/org.apache/apache)
+[![Jenkins Status](https://img.shields.io/jenkins/s/https/ci-maven.apache.org/job/Maven/job/maven-box/job/maven-apache-parent/job/master.svg)][build]
+
+Have you found a bug or have an idea for a cool new feature? Contributing
+code is a great way to give something back to the open source community. Before
+you dig right into the code, there are a few guidelines that we need
+contributors to follow so that we can have a chance of keeping on top of
+things.
+
+Getting Started
+---------------
+
++ Make sure you have a [JIRA account](https://issues.apache.org/jira/).
++ Make sure you have a [GitHub account](https://github.com/signup/free).
++ If you're planning to implement a new feature, please discuss your changes 
+  on the [developer mailing list][ml-list] first. 
+  This way you can make sure you're not wasting your time on something that isn't 
+  considered to be in Apache Maven's scope.
++ Submit a ticket for your issue, assuming one does not already exist.
+  + Clearly describe the issue, including steps to reproduce when it is a bug.
+  + Make sure you fill in the earliest version that you know has the issue.
++ Fork the repository on GitHub.
+
+Making and Submitting Changes
+--------------
+
+We accept Pull Requests via GitHub. The [developer mailing list][ml-list] is the
+main channel of communication for contributors.  
+There are some guidelines which will make applying PRs easier for us:
++ Create a topic branch from where you want to base your work (this is usually the master branch).
+  Push your changes to a topic branch in your fork of the repository.
++ Make commits of logical units.
++ Respect the original code style: by using the same [codestyle][code-style],
+  patches should only highlight the actual difference, not being disturbed by any formatting issues:
+  + Only use spaces for indentation.
+  + Create minimal diffs - disable on save actions like reformat source code or organize imports. 
+    If you feel the source code should be reformatted, create a separate PR for this change.
+  + Check for unnecessary whitespace with `git diff --check` before committing.
++ Make sure your commit messages are in the proper format. Your commit message should contain the key of the JIRA issue.
+```
+[MPOM-XXX] - Subject of the JIRA Ticket
+ Optional supplemental description.
+```
++ Make sure you have added the necessary tests (JUnit/IT) for your changes.
++ Run all the tests with `mvn -Prun-its verify` to assure nothing else was accidentally broken.
++ Submit a pull request to the repository in the Apache organization.
++ Update your JIRA ticket and include a link to the pull request in the ticket.
+
+If you plan to contribute on a regular basis, please consider filing a [contributor license agreement][cla].
+
+Making Trivial Changes
+----------------------
+
+For changes of a trivial nature to comments and documentation, it is not always
+necessary to create a new ticket in JIRA.  In this case, it is appropriate to
+start the first line of a commit with '(doc)' instead of a ticket number..
+
+Additional Resources
+--------------------
+
++ [Contributing patches](https://maven.apache.org/guides/development/guide-maven-development.html#Creating_and_submitting_a_patch)
++ [Apache Maven POMs JIRA project page][jira]
++ [Contributor License Agreement][cla]
++ [General GitHub documentation](https://help.github.com/)
++ [GitHub pull request documentation](https://help.github.com/send-pull-requests/)
++ [Apache Maven Twitter Account](https://twitter.com/ASFMavenProject)
++ #Maven IRC channel on freenode.org
+
+[jira]: https://issues.apache.org/jira/projects/MPOM/
+[license]: https://www.apache.org/licenses/LICENSE-2.0
+[ml-list]: https://maven.apache.org/mailing-lists.html
+[code-style]: https://maven.apache.org/developers/conventions/code.html
+[cla]: https://www.apache.org/licenses/#clas
+[maven-wiki]: https://cwiki.apache.org/confluence/display/MAVEN/Index
+[build]: https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven-apache-parent/job/master/


=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+apache-pom (25-1) unstable; urgency=medium
+
+  * New upstream release
+    - Updated the Maven rules
+  * Removed Damien Raude-Morvan from the uploaders (Closes: #889440)
+  * Standards-Version updated to 4.6.1
+  * Switch to debhelper level 13
+  * Use salsa.debian.org Vcs-* URLs
+  * Track and download the new releases from GitHub
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 28 Sep 2022 09:04:48 +0200
+
 apache-pom (18-1) unstable; urgency=low
 
   * Team upload.


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-10


=====================================
debian/control
=====================================
@@ -2,12 +2,14 @@ Source: apache-pom
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Ludovic Claude <ludovic.claude at laposte.net>,
-           Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: debhelper (>= 10), default-jdk, maven-repo-helper (>= 1.7)
-Standards-Version: 4.0.0
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/apache-pom.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/apache-pom.git
+Uploaders: Ludovic Claude <ludovic.claude at laposte.net>
+Build-Depends:
+ debhelper-compat (= 13),
+ default-jdk,
+ maven-repo-helper (>= 1.7)
+Standards-Version: 4.6.1
+Vcs-Git: https://salsa.debian.org/java-team/apache-pom.git
+Vcs-Browser: https://salsa.debian.org/java-team/apache-pom
 Homepage: http://maven.apache.org/pom/asf/
 
 Package: libapache-pom-java


=====================================
debian/copyright
=====================================
@@ -1,6 +1,6 @@
 Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
 Upstream-Name: Apache Software Foundation root POM
-Source: http://svn.apache.org/repos/asf/maven/pom/trunk/asf/
+Source: https://github.com/apache/maven-apache-parent/
 
 Files: *
 Copyright: 2010, The Apache Software Foundation


=====================================
debian/maven.ignoreRules
=====================================
@@ -21,9 +21,11 @@ org.apache.maven.plugins maven-compiler-plugin
 org.apache.maven.plugins maven-dependency-plugin
 org.apache.maven.plugins maven-deploy-plugin
 org.apache.maven.plugins maven-docck-plugin
+org.apache.maven.plugins maven-ear-plugin
 org.apache.maven.plugins maven-enforcer-plugin
 org.apache.maven.plugins maven-failsafe-plugin
 org.apache.maven.plugins maven-gpg-plugin
+org.apache.maven.plugins maven-help-plugin
 org.apache.maven.plugins maven-install-plugin
 org.apache.maven.plugins maven-invoker-plugin
 org.apache.maven.plugins maven-javadoc-plugin
@@ -34,10 +36,12 @@ org.apache.maven.plugins maven-remote-resources-plugin
 org.apache.maven.plugins maven-resources-plugin
 org.apache.maven.plugins maven-scm-plugin
 org.apache.maven.plugins maven-scm-publish-plugin
+org.apache.maven.plugins maven-shade-plugin
 org.apache.maven.plugins maven-site-plugin
 org.apache.maven.plugins maven-source-plugin
 org.apache.maven.plugins maven-surefire-plugin
 org.apache.maven.plugins maven-surefire-report-plugin
 org.apache.maven.plugins maven-war-plugin
+org.apache.maven.plugin-tools maven-plugin-annotations
 org.apache.rat apache-rat-plugin
 org.codehaus.mojo clirr-maven-plugin


=====================================
debian/orig-tar.sh deleted
=====================================
@@ -1,10 +0,0 @@
-#!/bin/sh -e
-
-VERSION=$2
-TAR=../apache-pom_$VERSION.orig.tar.gz
-DIR=apache-pom-$VERSION
-TAG=$(echo "apache-$VERSION" | sed -re's/~(alpha|beta)/-\1-/')
-
-svn export http://svn.apache.org/repos/asf/maven/pom/tags/${TAG}/ $DIR
-GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.class' $DIR
-rm -rf $DIR ../$TAG


=====================================
debian/rules
=====================================
@@ -2,7 +2,3 @@
 
 %:
 	dh $@ --with maven_repo_helper
-
-get-orig-source:
-	uscan --download-current-version --force-download --rename
-


=====================================
debian/watch
=====================================
@@ -1,4 +1,2 @@
-version=3
-opts="uversionmangle=s/-(alpha|beta)-/~$1/" \
-  http://svn.apache.org/repos/asf/maven/pom/tags/ \
-  apache-(\d.*)/ debian debian/orig-tar.sh
+version=4
+https://github.com/apache/maven-apache-parent/tags .*/apache-([\d\.]+).tar.gz


=====================================
pom.xml
=====================================
@@ -25,7 +25,7 @@ under the License.
   <!-- for more information, see the documentation of this POM: http://maven.apache.org/pom/asf/ -->
   <groupId>org.apache</groupId>
   <artifactId>apache</artifactId>
-  <version>18</version>
+  <version>25</version>
   <packaging>pom</packaging>
 
   <name>The Apache Software Foundation</name>
@@ -59,14 +59,11 @@ under the License.
     </mailingList>
   </mailingLists>
 
-  <prerequisites><!-- just for information: not inherited in child poms -->
-    <maven>3.0</maven><!-- prerequisite of some plugins -->
-  </prerequisites>
-
   <scm>
-    <connection>scm:svn:https://svn.apache.org/repos/asf/maven/pom/tags/apache-18</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/pom/tags/apache-18</developerConnection>
-    <url>https://svn.apache.org/viewvc/maven/pom/tags/apache-18</url>
+    <connection>scm:git:https://gitbox.apache.org/repos/asf/maven-apache-parent.git</connection>
+    <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-apache-parent.git</developerConnection>
+    <url>https://github.com/apache/maven-apache-parent/tree/${project.scm.tag}</url>
+    <tag>apache-25</tag>
   </scm>
 
   <distributionManagement>
@@ -85,17 +82,31 @@ under the License.
   <properties>
     <distMgmtSnapshotsName>Apache Development Snapshot Repository</distMgmtSnapshotsName>
     <distMgmtSnapshotsUrl>https://repository.apache.org/content/repositories/snapshots</distMgmtSnapshotsUrl>
-    <organization.logo>https://www.apache.org/images/asf_logo_wide.gif</organization.logo>
+    <organization.logo>https://www.apache.org/images/asf_logo_wide_2016.png</organization.logo>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <sourceReleaseAssemblyDescriptor>source-release</sourceReleaseAssemblyDescriptor>
     <gpg.useagent>true</gpg.useagent>
-    <arguments />
-    <maven.compiler.source>1.6</maven.compiler.source>
-    <maven.compiler.target>1.6</maven.compiler.target>
-    <surefire.version>2.19.1</surefire.version>
+    <minimalMavenBuildVersion>3.1.1</minimalMavenBuildVersion>
+    <minimalJavaBuildVersion>1.8</minimalJavaBuildVersion>
+    <maven.compiler.source>${maven.compiler.target}</maven.compiler.source>
+    <maven.compiler.target>1.7</maven.compiler.target>
+    <surefire.version>2.22.2</surefire.version><!-- for surefire, failsafe and surefire-report -->
+    <maven.plugin.tools.version>3.6.4</maven.plugin.tools.version><!-- for m-plugin-p and maven-plugin-annotations -->
+    <assembly.tarLongFileMode>posix</assembly.tarLongFileMode>
+    <project.build.outputTimestamp>2022-02-17T22:08:13Z</project.build.outputTimestamp>
   </properties>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.apache.maven.plugin-tools</groupId>
+        <artifactId>maven-plugin-annotations</artifactId>
+        <version>${maven.plugin.tools.version}</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <repositories>
     <repository>
       <id>apache.snapshots</id>
@@ -106,6 +117,16 @@ under the License.
       </releases>
     </repository>
   </repositories>
+  <pluginRepositories>
+    <pluginRepository>
+      <id>apache.snapshots</id>
+      <name>Apache Snapshot Repository</name>
+      <url>https://repository.apache.org/snapshots</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+    </pluginRepository>
+  </pluginRepositories>
 
   <build>
     <pluginManagement>
@@ -114,27 +135,27 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-antrun-plugin</artifactId>
-          <version>1.8</version>
+          <version>3.0.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-assembly-plugin</artifactId>
-          <version>2.6</version>
+          <version>3.3.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-clean-plugin</artifactId>
-          <version>3.0.0</version>
+          <version>3.1.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.5.1</version>
+          <version>3.10.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
-          <version>2.10</version>
+          <version>3.2.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -146,10 +167,15 @@ under the License.
           <artifactId>maven-docck-plugin</artifactId>
           <version>1.1</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-ear-plugin</artifactId>
+          <version>3.2.0</version>
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-enforcer-plugin</artifactId>
-          <version>1.4.1</version>
+          <version>3.0.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -159,7 +185,17 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-gpg-plugin</artifactId>
-          <version>1.6</version>
+          <version>3.0.1</version>
+          <configuration>
+            <gpgArguments>
+              <arg>--digest-algo=SHA512</arg>
+            </gpgArguments>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-help-plugin</artifactId>
+          <version>3.2.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -169,12 +205,12 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-invoker-plugin</artifactId>
-          <version>2.0.0</version>
+          <version>3.2.2</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>3.0.0</version>
+          <version>3.2.2</version>
           <configuration>
             <archive>
               <manifest>
@@ -187,60 +223,67 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.10.3</version>
+          <version>3.3.2</version>
+          <configuration>
+            <notimestamp>true</notimestamp><!-- avoid noise for svn/gitpubsub -->
+          </configuration>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-plugin-plugin</artifactId>
-          <version>3.4</version>
+          <version>${maven.plugin.tools.version}</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-project-info-reports-plugin</artifactId>
-          <version>2.9</version>
+          <version>3.1.2</version>
+          <configuration>
+            <pluginManagementExcludes>
+              <exclude>org.eclipse.m2e:lifecycle-mapping</exclude>
+            </pluginManagementExcludes>
+          </configuration>
         </plugin>
         <!-- START SNIPPET: release-plugin-configuration -->
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-release-plugin</artifactId>
-          <version>2.5.3</version>
+          <version>3.0.0-M5</version>
           <configuration>
             <useReleaseProfile>false</useReleaseProfile>
             <goals>deploy</goals>
-            <arguments>-Papache-release ${arguments}</arguments>
-            <waitBeforeTagging>10</waitBeforeTagging>
+            <releaseProfiles>apache-release</releaseProfiles>
           </configuration>
         </plugin>
         <!-- END SNIPPET: release-plugin-configuration -->
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-remote-resources-plugin</artifactId>
-          <version>1.5</version>
+          <version>1.7.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-resources-plugin</artifactId>
-          <version>2.7</version>
+          <version>3.2.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-scm-plugin</artifactId>
-          <version>1.9.4</version>
+          <version>1.12.2</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-scm-publish-plugin</artifactId>
-          <version>1.1</version>
+          <version>3.1.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
-          <version>3.5.1</version>
+          <version>3.11.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-source-plugin</artifactId>
-          <version>3.0.0</version>
+          <version>3.2.1</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -255,40 +298,17 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-war-plugin</artifactId>
-          <version>2.6</version>
+          <version>3.3.2</version>
         </plugin>
         <plugin>
-          <groupId>org.apache.rat</groupId>
-          <artifactId>apache-rat-plugin</artifactId>
-          <version>0.11</version>
-          <configuration>
-            <!--
-              The following configuration is needed, otherwise a release source package can't be
-              built without changing its content: https://issues.apache.org/jira/browse/RAT-184
-              TODO: remove when upgrading to 0.12
-            -->
-            <excludes>
-              <exclude>DEPENDENCIES</exclude>
-            </excludes>
-          </configuration>
-          <dependencies><!-- TODO: remove when upgrading to 0.12, see https://issues.apache.org/jira/browse/RAT-158 -->
-            <dependency>
-              <groupId>org.apache.maven.doxia</groupId>
-              <artifactId>doxia-core</artifactId>
-              <version>1.2</version>
-              <exclusions>
-                <exclusion><!-- see https://issues.apache.org/jira/browse/DOXIA-526 -->
-                  <groupId>xerces</groupId>
-                  <artifactId>xercesImpl</artifactId>
-                </exclusion>
-              </exclusions>
-            </dependency>
-          </dependencies>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-shade-plugin</artifactId>
+          <version>3.2.4</version>
         </plugin>
         <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>clirr-maven-plugin</artifactId>
-          <version>2.7</version>
+          <groupId>org.apache.rat</groupId>
+          <artifactId>apache-rat-plugin</artifactId>
+          <version>0.13</version>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -311,6 +331,38 @@ under the License.
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>enforce-maven-version</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <requireMavenVersion>
+                  <version>${minimalMavenBuildVersion}</version>
+                </requireMavenVersion>
+              </rules>
+            </configuration>
+          </execution>
+          <execution>
+            <id>enforce-java-version</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <requireJavaVersion>
+                  <version>${minimalJavaBuildVersion}</version>
+                </requireJavaVersion>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
@@ -357,7 +409,7 @@ under the License.
                   <descriptorRefs>
                     <descriptorRef>${sourceReleaseAssemblyDescriptor}</descriptorRef>
                   </descriptorRefs>
-                  <tarLongFileMode>gnu</tarLongFileMode>
+                  <tarLongFileMode>posix</tarLongFileMode>
                 </configuration>
               </execution>
             </executions>
@@ -395,7 +447,35 @@ under the License.
               </execution>
             </executions>
           </plugin>
-          <!-- We want to sign the artifact, the POM, and all attached artifacts -->
+          <!-- calculate checksums of source release for Apache dist area -->
+          <plugin>
+            <groupId>net.nicoulaj.maven.plugins</groupId>
+            <artifactId>checksum-maven-plugin</artifactId>
+            <version>1.11</version>
+            <executions>
+              <execution>
+                <id>source-release-checksum</id>
+                <goals>
+                  <goal>artifacts</goal>
+                </goals>
+                <!-- execute prior to maven-gpg-plugin:sign due to https://github.com/nicoulaj/checksum-maven-plugin/issues/112 -->
+                <phase>post-integration-test</phase>
+                <configuration>
+                  <algorithms>
+                    <algorithm>SHA-512</algorithm>
+                  </algorithms>
+                  <!-- https://maven.apache.org/apache-resource-bundles/#source-release-assembly-descriptor -->
+                  <includeClassifiers>source-release</includeClassifiers>
+                  <excludeMainArtifact>true</excludeMainArtifact>
+                  <csvSummary>false</csvSummary>
+                  <!-- attach SHA-512 checksum as well to upload to Maven Staging Repo, 
+                       as this eases uploading from stage to dist and doesn't do harm in Maven Central -->
+                  <attachChecksums>true</attachChecksums>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <!-- We want to sign the artifact, the POM, and all attached artifacts (except for SHA-512 checksum) -->
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
@@ -412,5 +492,45 @@ under the License.
       </build>
     </profile>
     <!-- END SNIPPET: release-profile -->
+    <profile>
+      <id>only-eclipse</id>
+      <activation>
+        <property>
+          <name>m2e.version</name>
+        </property>
+      </activation>
+      <build>
+        <pluginManagement>
+          <plugins>
+            <!-- Disable execution of some plugins in m2e (https://www.eclipse.org/m2e/documentation/m2e-execution-not-covered.html) -->
+            <plugin>
+              <groupId>org.eclipse.m2e</groupId>
+              <artifactId>lifecycle-mapping</artifactId>
+              <version>1.0.0</version><!-- as this is an artificial artifact only use in a profile (https://bugs.eclipse.org/bugs/show_bug.cgi?id=367870#c18) -->
+              <configuration>
+                <lifecycleMappingMetadata>
+                  <pluginExecutions>
+                    <pluginExecution>
+                      <!-- no native m2e support yet (https://issues.apache.org/jira/browse/MRRESOURCES-85) -->
+                      <pluginExecutionFilter>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-remote-resources-plugin</artifactId>
+                        <versionRange>[0,1.8.0)</versionRange>
+                        <goals>
+                          <goal>process</goal>
+                        </goals>
+                      </pluginExecutionFilter>
+                      <action>
+                        <ignore />
+                      </action>
+                    </pluginExecution>
+                  </pluginExecutions>
+                </lifecycleMappingMetadata>
+              </configuration>
+            </plugin>
+          </plugins>
+        </pluginManagement>
+      </build>
+    </profile>
   </profiles>
 </project>


=====================================
site-pom.xml
=====================================
@@ -25,7 +25,7 @@ under the License.
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>18</version>
+    <version>25</version>
     <relativePath>./pom.xml</relativePath>
   </parent>
 
@@ -36,23 +36,42 @@ under the License.
   <description>This project consists of a POM that contains settings that are likely to be useful to any Apache project that is building and releasing code with Maven 2/3.</description>
   <url>https://maven.apache.org/pom/asf/</url>
 
+  <mailingLists>
+    <mailingList>
+      <name>Apache Release Discuss</name>
+      <subscribe>mailto:release-discuss-subscribe at apache.org</subscribe>
+      <unsubscribe>mailto:release-discuss-unsubscribe at apache.org</unsubscribe>
+      <post>mailto:release-discuss at apache.org</post>
+      <archive>https://lists.apache.org/list.html?release-discuss@apache.org</archive>
+    </mailingList>
+  </mailingLists>
+
   <scm>
-    <connection>scm:svn:https://svn.apache.org/repos/asf/maven/pom/trunk/asf</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/pom/trunk/asf</developerConnection>
-    <url>https://svn.apache.org/viewvc/maven/pom/trunk/asf</url>
+    <connection>scm:git:https://gitbox.apache.org/repos/asf/maven-apache-parent.git</connection>
+    <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-apache-parent.git</developerConnection>
+    <url>https://github.com/apache/maven-apache-parent/tree/${project.scm.tag}</url>
+    <tag>apache-${project.version}</tag>
   </scm>
   <issueManagement>
     <system>jira</system>
-    <url>https://issues.apache.org/jira/browse/MPOM/component/12314370</url>
+    <url>https://issues.apache.org/jira/issues/?jql=project%3DMPOM+AND+component%3Dasf</url>
   </issueManagement>
   <ciManagement>
     <system>Jenkins</system>
-    <url>https://builds.apache.org/view/M-R/view/Maven/job/ASF%20Parent%20Pom/</url>
+    <url>https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven-parent/</url>
+    <notifiers>
+      <notifier>
+        <type>mail</type>
+        <configuration>
+          <address>notifications at maven.apache.org</address>
+        </configuration>
+      </notifier>
+    </notifiers>
   </ciManagement>
   <distributionManagement>
     <site>
       <id>apache.website</id>
-      <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/components/${maven.site.path}</url>
+      <url>scm:svn:https://svn.apache.org/repos/asf/maven/website/components/${maven.site.path}</url>
     </site>
   </distributionManagement>
 
@@ -68,16 +87,26 @@ under the License.
         <artifactId>maven-site-plugin</artifactId>
         <configuration>
           <siteDirectory>${basedir}/src/site-docs</siteDirectory>
+          <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>
+          <content>${project.reporting.outputDirectory}</content><!-- mono-module doesn't require site:stage -->
           <checkoutDirectory>${maven.site.cache}/${maven.site.path}</checkoutDirectory>
           <tryUpdate>true</tryUpdate>
         </configuration>
+        <executions>
+          <execution>
+            <id>scm-publish</id>
+            <phase>site-deploy</phase><!-- deploy site with maven-scm-publish-plugin -->
+            <goals>
+              <goal>publish-scm</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
   </build>


=====================================
src/site-docs/apt/index.apt.vm
=====================================
@@ -32,10 +32,10 @@ Apache Software Foundation Parent POM
 
     This project consists of a POM that contains settings that are
     likely to be useful to any Apache project that is building and
-    releasing code with Maven 3 (Maven 2.x is not supported any more since version 17). By using this project as a parent,
+    releasing code with Maven. By using this project as a parent,
     a project gets these settings.
 
-    Most project will want to override some of these settings.
+    Most projects will want to override some of these settings.
 
     The following is a list of the items configured in this POM:
 
@@ -45,7 +45,7 @@ Apache Software Foundation Parent POM
     
   ** <<organization>>: The Apache Software Foundation
     
-  ** <<url>>: {{<<<http://www.apache.org/>>>}}. You should override this..
+  ** <<url>>: {{<<<https://www.apache.org/>>>}}. You should override this.
     
   ** <<repositories>>: The pom adds the Apache snapshot
      repository ({{<<<https://repository.apache.org/snapshots>>>}})
@@ -54,50 +54,78 @@ Apache Software Foundation Parent POM
      instance at
      {{<<<https://repository.apache.org/service/local/staging/deploy/maven2>>>}}
      and snapshots to
-     {{<<<https://repository.apache.org/content/repositories/snapshots>>>}}. Note
-     that there are POM parameters (<<<distMgmtSnapshotsName>>> and <<<distMgmtSnapshotsUrl>>>)
+     {{<<<https://repository.apache.org/content/repositories/snapshots>>>}}.\
+     Note that there are POM properties (<<<distMgmtSnapshotsName>>> and <<<distMgmtSnapshotsUrl>>>)
      that you can override to change the snapshot location. 
     
   ** <<mailingLists>>: The POM sets up generic Apache announcement
      lists. You should override this.
-    
+
  * <<pluginManagement>>: The plugin management section specifies versions
     of a list of plugins. See the {{{./plugin-management.html}Plugin Management report}} for
     the complete list with versions. 
     
-  ** The compiler plugin is set to default to Java 1.4 and UTF-8 source.
+  ** The compiler plugin is set to default to <<Java $context.get("maven.compiler.target")>> (<<<maven.compiler.target>>> property)
+     and $context.get("project.build.sourceEncoding") source (<<<project.build.sourceEncoding>>> property).
     
-  ** the jar plugin is set to add default specification and implementation entries.
+  ** The jar plugin is set to add default specification and implementation entries.
     
-  ** the resources plugin is set for UTF-8.
+  ** The resources plugin is set for $context.get("project.build.sourceEncoding").
     
-  ** the release plugin: the release plugin is set, via the
+  ** The release plugin is set, via the
     \<arguments\> configuration element, to enable the
     <<apache-release>> profile for <<all>> executions and to disable
     \<useReleaseProfiles\>.  You can remove this with an empty
     \<arguments/\> element in the configuration of the release plugin.
 
- * <<plugins>>: The plugins section configures one execution:
+ * <<plugins>>: The plugins section configures three executions:
     
   ** maven-remote-resources-plugin for {{{/apache-resource-bundles/}org.apache:apache-jar-resource-bundle:1.4}}.
 
   ** maven-site-plugin:attach-descriptor
 
+  ** maven-enforcer-plugin to check Maven and Java build prerequisites, configured via properties:
+ 
+    *** <<<minimalMavenBuildVersion>>> property: default value is <<Maven $context.get("minimalMavenBuildVersion")>>
+
+    *** <<<minimalJavaBuildVersion>>> property: default value is <<Java $context.get("minimalJavaBuildVersion")>>
+
+    []
+
+ * <<Reproducible Builds>>: since version 22 of this parent POM, managed plugins versions are expected to be compliant with {{{https://reproducible-builds.org/}Reproducible Builds}}.
+
+   To choose the timestamp in output archives, projects using this POM as parent should define a property in their root POM:
+
++------+
+  <properties>
+    <project.build.outputTimestamp>10</project.build.outputTimestamp>
+  </properties>
++------+
+
+   The value will be updated by Maven Release Plugin during releases. If a project wants to disable Reproducible Builds, just define
+   the property value with any single non-numeric character.
+
+ []
+
 The <<<apache-release>>> Profile
 
    As noted above, this pom configures the release plugin to enable
     the <<<apache-release>>> profile for all executions of the release
-    plugin. The profile includes the following plugins:
+    plugin.
+
+   The profile includes the following plugins:
 
  * maven-assembly-plugin:
     {{{/apache-resource-bundles/}org.apache.apache.resources:apache-source-release-assembly-descriptor:1.0.6}}
-    is in the dependencies, and an execution is configured. The plugin
-    is configured to take a <<<descriptorRef>>> name from the
+    is added as dependency, and an execution is configured with <<<source-release-assembly>>> id.\
+    The plugin is configured to take a <<<descriptorRef>>> name from the
     <<sourceReleaseAssemblyDescriptor>> property, which by default is
     set to <<<source-release>>> (zip only): you can override the property with
-    <<<source-release-zip-tar>>> (both zip and tar) or <<<source-release-tar>>> (tar only) values.
+    <<<source-release-zip-tar>>> (both zip and tar) or <<<source-release-tar>>> (tar only) values.\
+    If you want to avoid this default assembly execution to provide your own mechanism to produce the source release archive,
+    you can disable the execution by configuring <<<skipAssembly>>> parameter for this <<<source-release-assembly>>> execution id
 
- * maven-deploy-plugin
+ * maven-deploy-plugin: configured to activate <<<updateReleaseInfo>>>
 
  * maven-source-plugin: configured to build and attach a source jar.
 
@@ -105,48 +133,83 @@ The <<<apache-release>>> Profile
 
  * maven-gpg-plugin: configured to sign everything. It expects to find
     a passphrase in <<<$\{gpg.passphrase\}>>>, presumably in your <<<settings.xml>>>.
-    
+
+ * checksum-maven-plugin: configured to create a checksum file(s) for source release as
+    required by {{{http://www.apache.org/dev/release-distribution#sigs-and-sums}Apache release distribution policy}}.
+
+ []
+
+  When doing a release with maven-release-plugin, this creates files in <<<target/checkout/target>>> ready
+  to be copied to projects' {{{http://www.apache.org/dev/release-distribution}Apache <<</dist/>>> release distribution}}
+  directory:
+
+ * <<<$\{artifactId\}-$\{version\}-source-release.[zip|tar.gz]>>>: the source release archive(s)
+
+ * <<<$\{artifactId\}-$\{version\}-source-release.[zip|tar.gz].sha512>>>: their checksum(s)
+
+ * <<<$\{artifactId\}-$\{version\}-source-release.[zip|tar.gz].asc>>>: their signature(s)
+ 
+ []
+
+ Those files also end up in the staging repository and Maven Central.
+
 Settings Configuration
   
   You can have a look at the page in Apache website
   {{{https://www.apache.org/dev/publishing-maven-artifacts.html}Publishing Maven Artifacts}}.
-  
+
   You can test your environment setup using <<<-Papache-release>>> with the command line.
 
 History
 
 #if( $project.version.endsWith( "SNAPSHOT" ) )
-  trunk: {{{https://svn.apache.org/viewvc/maven/pom/trunk/asf/pom.xml?view=markup}$project.version}}
-  ({{{https://svn.apache.org/viewvc/maven/pom/trunk/asf/pom.xml?r1=HEAD&r2=1675930&diff_format=h}diff}})
+  master: {{{https://github.com/apache/maven-apache-parent/tree/master/pom.xml}$project.version}}
+  ({{{https://github.com/apache/maven-apache-parent/compare/apache-25...master}diff}})
+#end
+#macro ( display $version $date )
+#**##set( $prev = $version - 1 )
+|  {{{https://github.com/apache/maven-apache-parent/tree/apache-$version/pom.xml}$version}}
+| ({{{https://github.com/apache/maven-apache-parent/compare/apache-$prev...apache-$version}diff}}) | $date |
 #end
 
 *--------------+------------+
 || <<Version>> || <<Release Date>> ||
 *--------------+------------+
-| {{{https://svn.apache.org/viewvc/maven/pom/tags/apache-18/pom.xml?view=markup}18}} ({{{https://svn.apache.org/viewvc/maven/pom/tags/apache-18/pom.xml?r1=HEAD&r2=1675930&diff_format=h}diff}}) | 2016-05-12 |
+#display( 25, '2022-02-20' )
 *--------------+------------+
-| {{{https://svn.apache.org/viewvc/maven/pom/tags/apache-17/pom.xml?view=markup}17}} ({{{https://svn.apache.org/viewvc/maven/pom/tags/apache-17/pom.xml?r1=HEAD&r2=1639452&diff_format=h}diff}}) | 2015-04-24 |
+#display( 24, '2021-07-13' )
 *--------------+------------+
-| {{{https://svn.apache.org/viewvc/maven/pom/tags/apache-16/pom.xml?view=markup}16}} ({{{https://svn.apache.org/viewvc/maven/pom/tags/apache-16/pom.xml?r1=HEAD&r2=1627336&diff_format=h}diff}}) | 2014-11-13 |
+#display( 23, '2020-01-25' )
 *--------------+------------+
-| {{{https://svn.apache.org/viewvc/maven/pom/tags/apache-15/pom.xml?view=markup}15}} ({{{https://svn.apache.org/viewvc/maven/pom/tags/apache-15/pom.xml?r1=HEAD&r2=1575044&diff_format=h}diff}}) | 2014-09-24 |
+#display( 22, '2020-01-08' )
 *--------------+------------+
-| {{{https://svn.apache.org/viewvc/maven/pom/tags/apache-14/pom.xml?view=markup}14}} ({{{https://svn.apache.org/viewvc/maven/pom/tags/apache-14/pom.xml?r1=HEAD&r2=1434717&diff_format=h}diff}}) | 2014-03-06 |
+#display( 21, '2018-08-21' )
 *--------------+------------+
-| {{{https://svn.apache.org/viewvc/maven/pom/tags/apache-13/pom.xml?view=markup}13}} ({{{https://svn.apache.org/viewvc/maven/pom/tags/apache-13/pom.xml?r1=HEAD&r2=1404788&diff_format=h}diff}}) | 2013-01-20 |
+#display( 20, '2018-07-07' )
 *--------------+------------+
-| {{{https://svn.apache.org/viewvc/maven/pom/tags/apache-12/pom.xml?view=markup}12}} ({{{https://svn.apache.org/viewvc/maven/pom/tags/apache-12/pom.xml?r1=HEAD&r2=1369674&diff_format=h}diff}}) | 2012-11-01 |
+#display( 19, '2018-01-24' )
 *--------------+------------+
-| {{{https://svn.apache.org/viewvc/maven/pom/tags/apache-11/pom.xml?view=markup}11}} ({{{https://svn.apache.org/viewvc/maven/pom/tags/apache-11/pom.xml?r1=HEAD&r2=1154610&diff_format=h}diff}}) | 2012-08-08 |
+#display( 18, '2016-05-18' )
 *--------------+------------+
-| {{{https://svn.apache.org/viewvc/maven/pom/tags/apache-10/pom.xml?view=markup}10}} ({{{https://svn.apache.org/viewvc/maven/pom/tags/apache-10/pom.xml?r1=HEAD&r2=1069621&diff_format=h}diff}}) | 2011-08-09 |
+#display( 17, '2015-04-24' )
 *--------------+------------+
-| {{{https://svn.apache.org/viewvc/maven/pom/tags/apache-9/pom.xml?view=markup}9}} ({{{https://svn.apache.org/viewvc/maven/pom/tags/apache-9/pom.xml?r1=HEAD&r2=1038252&diff_format=h}diff}}) | 2011-02-15 |
+#display( 16, '2014-11-13' )
 *--------------+------------+
-| {{{https://svn.apache.org/viewvc/maven/pom/tags/apache-8/pom.xml?view=markup}8}} ({{{https://svn.apache.org/viewvc/maven/pom/tags/apache-8/pom.xml?r1=HEAD&r2=893967&diff_format=h}diff}}) | 2010-11-26 |
+#display( 15, '2014-09-24' )
 *--------------+------------+
-| {{{https://svn.apache.org/viewvc/maven/pom/tags/apache-7/pom.xml?view=markup}7}} ({{{https://svn.apache.org/viewvc/maven/pom/tags/apache-7/pom.xml?r1=HEAD&r2=766952&diff_format=h}diff}}) | 2009-12-29 |
+#display( 14, '2014-03-06' )
 *--------------+------------+
-| {{{https://svn.apache.org/viewvc/maven/pom/tags/apache-6/pom.xml?view=markup}6}} ({{{https://svn.apache.org/viewvc/maven/pom/tags/apache-6/pom.xml?r1=HEAD&r2=766946&diff_format=h}diff}}) | 2009-04-24 |
+#display( 13, '2013-01-20' )
+*--------------+------------+
+#display( 12, '2012-11-01' )
+*--------------+------------+
+#display( 11, '2012-08-08' )
+*--------------+------------+
+#display( 10, '2011-08-09' )
+*--------------+------------+
+#display( 9, '2011-02-15' )
+*--------------+------------+
+#display( 8, '2010-11-26' )
+*--------------+------------+
+#display( 7, '2009-12-29' )
 *--------------+------------+
-  


=====================================
src/site-docs/site.xml
=====================================
@@ -19,13 +19,13 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<project xmlns="http://maven.apache.org/DECORATION/1.7.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd">
+<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
 
   <bannerLeft>
     <name>${project.name}</name>
     <src>https://maven.apache.org/images/apache-maven-project.png</src>
-    <href>http://www.apache.org/</href>
+    <href>https://www.apache.org/</href>
   </bannerLeft>
 
   <bannerRight>
@@ -36,21 +36,16 @@ under the License.
   <skin>
     <groupId>org.apache.maven.skins</groupId>
     <artifactId>maven-fluido-skin</artifactId>
-    <version>1.5</version>
+    <version>1.10.0</version>
   </skin>
 
+  <edit>${project.scm.url}</edit>
+  <googleAnalyticsAccountId>UA-140879-1</googleAnalyticsAccountId>
+
   <publishDate position="right" />
   <version position="right" />
 
   <body>
-    <head><![CDATA[
-      <script src="https://www.google-analytics.com/urchin.js" type="text/javascript">
-      </script>
-      <script type="text/javascript">
-        _uacct = "UA-140879-1";
-        urchinTracker();
-      </script>]]>
-    </head>
 
     <breadcrumbs>
       <item name="Apache" href="https://www.apache.org/" />
@@ -66,26 +61,28 @@ under the License.
       <item name="Download" href="download.html"/>
     </menu>
 
-    <menu ref="reports" inherit="bottom" />
+    <menu ref="reports" />
 
-    <!-- Copied from Maven parent's site.xml -->
-    <menu name="Maven Projects" inherit="bottom">
-      <item name="Ant Tasks"         href="https://maven.apache.org/ant-tasks/index.html" />
+    <!-- Copied from Maven parent's site.xml, removing inherit="bottom" -->
+    <menu name="Maven Projects">
       <item name="Archetype"         href="https://maven.apache.org/archetype/index.html" />
+      <item name="Artifact Resolver" href="https://maven.apache.org/resolver/index.html" />
       <item name="Doxia"             href="https://maven.apache.org/doxia/index.html" />
+      <item name="Extensions"        href="https://maven.apache.org/extensions/index.html" />
       <item name="JXR"               href="https://maven.apache.org/jxr/index.html" />
-      <item name="Maven 1.x"         href="https://maven.apache.org/maven-1.x/index.html" />
-      <item name="Maven 2 & 3"   href="https://maven.apache.org/index.html" />
+      <item name="Maven"             href="https://maven.apache.org/ref/current" />
       <item name="Parent POMs"       href="https://maven.apache.org/pom/index.html" />
       <item name="Plugins"           href="https://maven.apache.org/plugins/index.html" />
+      <item name="Plugin Testing"    href="https://maven.apache.org/plugin-testing/index.html" />
       <item name="Plugin Tools"      href="https://maven.apache.org/plugin-tools/index.html" />
+      <item name="Resource Bundles"  href="https://maven.apache.org/apache-resource-bundles/index.html" />
       <item name="SCM"               href="https://maven.apache.org/scm/index.html" />
       <item name="Shared Components" href="https://maven.apache.org/shared/index.html" />
       <item name="Skins"             href="https://maven.apache.org/skins/index.html" />
       <item name="Surefire"          href="https://maven.apache.org/surefire/index.html" />
       <item name="Wagon"             href="https://maven.apache.org/wagon/index.html" />
     </menu>
-    <menu name="ASF" inherit="bottom">
+    <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="Sponsoring Apache" href="https://www.apache.org/foundation/sponsorship.html"/>


=====================================
src/site-docs/xdoc/download.xml.vm
=====================================
@@ -39,7 +39,7 @@ under the License.
 
       <p>${project.name} is distributed under the <a href="https://www.apache.org/licenses/">Apache License, version 2.0</a>.</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>
+      <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">
@@ -108,7 +108,7 @@ under the License.
           <tr>
             <td>${project.name} ${project.version} (Source zip)</td>
             <td><a href="[preferred]maven/pom/apache-${project.version}-source-release.zip">maven/pom/apache-${project.version}-source-release.zip</a></td>
-            <td><a href="https://www.apache.org/dist/maven/pom/apache-${project.version}-source-release.zip.md5">maven/pom/apache-${project.version}-source-release.zip.md5</a></td>
+            <td><a href="https://www.apache.org/dist/maven/pom/apache-${project.version}-source-release.zip.sha512">maven/pom/apache-${project.version}-source-release.zip.sha512</a></td>
             <td><a href="https://www.apache.org/dist/maven/pom/apache-${project.version}-source-release.zip.asc">maven/pom/apache-${project.version}-source-release.zip.asc</a></td>
           </tr>
         </tbody>



View it on GitLab: https://salsa.debian.org/java-team/apache-pom/-/compare/a5595ce5fb6eb6d7009098cf40b7300dca51159b...1639076dd1960d1e27a36206040d03c598cfe332

-- 
View it on GitLab: https://salsa.debian.org/java-team/apache-pom/-/compare/a5595ce5fb6eb6d7009098cf40b7300dca51159b...1639076dd1960d1e27a36206040d03c598cfe332
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20220928/a32b248f/attachment.htm>


More information about the pkg-java-commits mailing list