Merge branch 'master' into remove-repository

.asf.yaml

@@ -27,4 +27,11 @@ github:
     merge: false
     rebase: true
   autolink_jira:
-    - MPOM
+    - MPOM
+  del_branch_on_merge: true
+  features:
+    issues: true
+  notifications:
+    commits: commits@maven.apache.org
+    issues: issues@maven.apache.org
+    pullrequests: issues@maven.apache.org

.github/dependabot.yml

@@ -16,9 +16,14 @@
 #
 version: 2
 updates:
-- package-ecosystem: maven
-  directory: "/"
-  schedule:
-    interval: daily
-    time: '04:00'
-  open-pull-requests-limit: 10
+  - package-ecosystem: maven
+    directory: "/"
+    schedule:
+      interval: daily
+      time: '04:00'
+    open-pull-requests-limit: 10
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/release-drafter.yml

@@ -0,0 +1,23 @@
+
+
+# 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.
+
+_extends: maven-gh-actions-shared
+version-template: '$MAJOR'
+name-template: 'Apache Parent POM version $NEXT_MAJOR_VERSION'
+tag-template: 'apache-$NEXT_MAJOR_VERSION'

.github/workflows/maven-verify.yml

@@ -24,6 +24,7 @@ on:
 jobs:
   build:
     name: Verify
-    uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v3
+    uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v4
     with:
-      ff-site-goal: 'site site:stage -f site-pom.xml'
+      matrix-enabled: false
+

.github/workflows/release-drafter.yml

@@ -0,0 +1,28 @@
+
+
+# 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: Release Drafter
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  update_release_draft:
+    uses: apache/maven-gh-actions-shared/.github/workflows/release-drafter.yml@v4

Jenkinsfile

@@ -17,4 +17,4 @@
  * under the License.
  */
 
-asfMavenTlpStdBuild(jdks:['17'])
+asfMavenTlpStdBuild(jdks:['21'])

README.md

@@ -17,10 +17,10 @@
 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]
+[![Verify](https://github.com/apache/maven-apache-parent/actions/workflows/maven-verify.yml/badge.svg)](https://github.com/apache/maven-apache-parent/actions/workflows/maven-verify.yml)
 
 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
@@ -31,8 +31,7 @@ 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).
++ Make sure you have a [GitHub account](https://github.com/signup).
 + 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 
@@ -57,40 +56,34 @@ There are some guidelines which will make applying PRs easier for us:
   + 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.
++ Make sure your commit messages are in the proper format. Your commit message should contain the key of the issue.
 ```
-[MPOM-XXX] - Subject of the JIRA Ticket
+[#issue-number] - Subject of the issue
  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.
++ Update the [site documentation](https://maven.apache.org/pom/asf/) accordingly in `docs/src/site` and build it via `mvn site -f docs`
 + 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.
+For changes of a trivial nature to comments and documentation, or other simple changes
+it is not always necessary to create a new issue.  
+In this case, it is appropriate to skip the issue from a commit message.
 
 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/)
++ [General GitHub documentation](https://docs.github.com/)
++ [GitHub pull request documentation](https://docs.github.com/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/

site-pom.xml → docs/pom.xml

@@ -25,11 +25,10 @@ under the License.
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>32-SNAPSHOT</version>
-    <relativePath>./pom.xml</relativePath>
+    <version>34-SNAPSHOT</version>
   </parent>
 
-  <artifactId>apache.</artifactId>
+  <artifactId>docs</artifactId>
   <packaging>pom</packaging>
 
   <name>Apache Software Foundation Parent POM</name>
@@ -46,16 +45,11 @@ under the License.
     </mailingList>
   </mailingLists>
 
-  <scm>
-    <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/issues/?jql=project%3DMPOM+AND+component%3Dasf</url>
+    <system>GitHub</system>
+    <url>https://github.com/apache/maven-apache-parent/issues</url>
   </issueManagement>
+
   <ciManagement>
     <system>Jenkins</system>
     <url>https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven-apache-parent/</url>
@@ -68,6 +62,7 @@ under the License.
       </notifier>
     </notifiers>
   </ciManagement>
+
   <distributionManagement>
     <site>
       <id>apache.website</id>
@@ -78,6 +73,10 @@ under the License.
   <properties>
     <maven.site.cache>${user.home}/maven-sites</maven.site.cache>
     <maven.site.path>pom-archives/asf-LATEST</maven.site.path>
+
+    <!-- module with documentation not need to install and deploy -->
+    <maven.install.skip>true</maven.install.skip>
+    <maven.deploy.skip>true</maven.deploy.skip>
   </properties>
 
   <build>
@@ -86,7 +85,6 @@ under the License.
         <groupId>org.apache.maven.plugins</groupId>
         <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>
@@ -110,4 +108,32 @@ under the License.
       </plugin>
     </plugins>
   </build>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <reportSets>
+          <reportSet>
+            <configuration>
+              <webAccessUrl>${project.parent.scm.url}</webAccessUrl>
+            </configuration>
+            <reports>
+              <report>index</report>
+              <report>dependency-management</report>
+              <report>plugin-management</report>
+              <report>plugins</report>
+              <report>ci-management</report>
+              <report>issue-management</report>
+              <report>mailing-lists</report>
+              <report>scm</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+    </plugins>
+  </reporting>
+
+
 </project>