[Git][java-team/apache-pom][upstream] 4 commits: New upstream version 30
Emmanuel Bourg (@ebourg)
gitlab at salsa.debian.org
Wed Oct 23 12:11:31 BST 2024
Emmanuel Bourg pushed to branch upstream at Debian Java Maintainers / apache-pom
Commits:
8d0e9b59 by Emmanuel Bourg at 2024-10-23T12:48:54+02:00
New upstream version 30
- - - - -
b8382d7b by Emmanuel Bourg at 2024-10-23T12:49:55+02:00
New upstream version 31
- - - - -
332800a0 by Emmanuel Bourg at 2024-10-23T12:50:14+02:00
New upstream version 32
- - - - -
248c4e86 by Emmanuel Bourg at 2024-10-23T12:57:36+02:00
New upstream version 33
- - - - -
14 changed files:
- .asf.yaml
- .github/dependabot.yml
- + .github/release-drafter.yml
- .github/workflows/maven-verify.yml
- + .github/workflows/release-drafter.yml
- − .maven-apache-parent.marker
- Jenkinsfile
- README.md
- site-pom.xml → docs/pom.xml
- src/site-docs/apt/index.apt.vm → docs/src/site/apt/index.apt.vm
- src/site-docs/resources/download.cgi → docs/src/site/resources/download.cgi
- src/site-docs/site.xml → docs/src/site/site.xml
- src/site-docs/xdoc/download.xml.vm → docs/src/site/xdoc/download.xml.vm
- pom.xml
Changes:
=====================================
.asf.yaml
=====================================
@@ -27,4 +27,11 @@ github:
merge: false
rebase: true
autolink_jira:
- - MPOM
\ No newline at end of file
+ - MPOM
+ del_branch_on_merge: true
+ features:
+ issues: true
+ notifications:
+ commits: commits at maven.apache.org
+ issues: issues at maven.apache.org
+ pullrequests: issues at 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 at v2
+ uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml at 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 at v4
=====================================
.maven-apache-parent.marker deleted
=====================================
@@ -1,17 +0,0 @@
-<!---
- 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
=====================================
@@ -17,4 +17,4 @@
* under the License.
*/
-asfMavenTlpStdBuild(jdks:['8'])
+asfMavenTlpStdBuild(jdks:['21'])
=====================================
README.md
=====================================
@@ -17,10 +17,10 @@
Contributing to [Apache Software Foundation Parent POM](https://maven.apache.org/pom/asf/)
======================
-[][jira]
[][license]
[](https://search.maven.org/artifact/org.apache/apache)
[][build]
+[](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-numebr] - 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>29</version>
- <relativePath>./pom.xml</relativePath>
+ <version>33</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>
=====================================
src/site-docs/apt/index.apt.vm → docs/src/site/apt/index.apt.vm
=====================================
@@ -41,9 +41,9 @@ Apache Software Foundation Parent POM
* Top-level project properties:
- ** <<license>>: Apache License, version 2.0.
+ ** <<license>>: {{{https://www.apache.org/licenses/LICENSE-2.0.txt}Apache-2.0}}.
- ** <<organization>>: The Apache Software Foundation
+ ** <<organization>>: ${project.organization.name}
** <<url>>: {{<<<https://www.apache.org/>>>}}. You should override this.
@@ -55,8 +55,8 @@ Apache Software Foundation Parent POM
{{<<<https://repository.apache.org/service/local/staging/deploy/maven2>>>}}
and snapshots to
{{<<<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.
+ Note that there are <<<distMgmt(Releases|Snapshots)(Name|Url)>>> POM properties (<<<distMgmtReleasesName>>>, <<<distMgmtReleasesUrl>>>, <<<distMgmtSnapshotsName>>> and <<<distMgmtSnapshotsUrl>>>)
+ that you can override to change the names and locations.
** <<mailingLists>>: The POM sets up generic Apache announcement
lists. You should override this.
@@ -64,25 +64,39 @@ Apache Software Foundation Parent POM
* <<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 $context.get("maven.compiler.target")>> (<<<maven.compiler.target>>> property)
- and $context.get("project.build.sourceEncoding") source (<<<project.build.sourceEncoding>>> property).
+
+ ** There are used properties <<<version.\<artifactId\>>>> for defining each version of plugin, except:
+
+ *** <<<version.apache-resource-bundles>>> is used for: <apache-jar-resource-bundle> and <apache-source-release-assembly-descriptor>
+
+ *** <<<version.maven-plugin-tools>>> is used for: <maven-plugin-annotations>, <maven-plugin-plugin> and <maven-plugin-report-plugin>
+
+ *** <<<version.maven-surefire>>> is used for: <maven-failsafe-plugin>, <maven-surefire-plugin> and <maven-surefire-report-plugin>
+
+ []
+
+ ** The compiler plugin is set target <<Java $context.get("maven.compiler.target")>> (<<<maven.compiler.target>>> property)
+ and assume $context.get("project.build.sourceEncoding") source encoding (<<<project.build.sourceEncoding>>> property). When being executed
+ with JDK 9 or newer also <<<maven.compiler.release>>> is set to the value of property <<<maven.compiler.target>>>.
+ Therefore its value must not start with <<<1.>>> (use for example <<<8>>> instead of <<<1.8>>>).
** The jar plugin is set to add default specification and implementation entries.
** The resources plugin is set for $context.get("project.build.sourceEncoding").
** 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.
+
+ *** \<useReleaseProfiles\> configuration element, to enable the<<apache-release>> profile during <<<release:perform>>> execution
+
+ *** disable \<useReleaseProfiles\>
+
+ *** enable \<autoVersionSubmodules\>
+
+ []
* <<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-remote-resources-plugin for {{{/apache-resource-bundles/jar/}org.apache.apache.resources:apache-jar-resource-bundle:$context.get("version.apache-resource-bundles")}}.
** maven-enforcer-plugin to check Maven and Java build prerequisites, configured via properties:
@@ -94,7 +108,7 @@ Apache Software Foundation Parent POM
* <<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:
+ To choose their own release timestamp in output archives, projects using this POM as parent should override with a property in their root POM:
+------+
<properties>
@@ -115,8 +129,9 @@ The <<<apache-release>>> Profile
The profile includes the following plugins:
- * maven-assembly-plugin:
- {{{/apache-resource-bundles/}org.apache.apache.resources:apache-source-release-assembly-descriptor:1.0.6}}
+ * maven-assembly-plugin
+
+ {{{/apache-resource-bundles/source-release/}org.apache.apache.resources:apache-source-release-assembly-descriptor:$context.get("version.apache-resource-bundles")}}
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
@@ -125,17 +140,25 @@ The <<<apache-release>>> Profile
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: configured to activate <<<updateReleaseInfo>>>
+ * maven-source-plugin
+
+ Configured to build and attach a source jar.
+
+ * maven-javadoc-plugin
+
+ Configured to build and attach a javadoc jar.
- * maven-source-plugin: configured to build and attach a source jar.
+ * maven-gpg-plugin
- * maven-javadoc-plugin: configured to build and attach a javadoc jar.
+ Configured to sign everything.
- * maven-gpg-plugin: configured to sign everything. It expects to find
- a passphrase in <<<$\{gpg.passphrase\}>>>, presumably in your <<<settings.xml>>>.
+ On developer workstations it expects GnuPG agent to be available to get passphrases,
+ while on fully unattended (CI-like) workflows the use of <<<MAVEN_GPG_PASSPHRASE>>> environment variable use is recommended.
- * 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}}.
+ * 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}}.
[]
@@ -160,64 +183,32 @@ Settings Configuration
You can test your environment setup using <<<-Papache-release>>> with the command line.
-History
-
-#if( $project.version.endsWith( "SNAPSHOT" ) )
- master: {{{https://github.com/apache/maven-apache-parent/tree/master/pom.xml}$project.version}}
- ({{{https://github.com/apache/maven-apache-parent/compare/apache-29...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>> ||
-*--------------+------------+
-#display( 29, '2022-12-11' )
-*--------------+------------+
-#display( 28, '2022-11-14' )
-*--------------+------------+
-#display( 27, '2022-07-10' )
-*--------------+------------+
-#display( 26, '2022-04-09' )
-*--------------+------------+
-#display( 25, '2022-02-20' )
-*--------------+------------+
-#display( 24, '2021-07-13' )
-*--------------+------------+
-#display( 23, '2020-01-25' )
-*--------------+------------+
-#display( 22, '2020-01-08' )
-*--------------+------------+
-#display( 21, '2018-08-21' )
-*--------------+------------+
-#display( 20, '2018-07-07' )
-*--------------+------------+
-#display( 19, '2018-01-24' )
-*--------------+------------+
-#display( 18, '2016-05-18' )
-*--------------+------------+
-#display( 17, '2015-04-24' )
-*--------------+------------+
-#display( 16, '2014-11-13' )
-*--------------+------------+
-#display( 15, '2014-09-24' )
-*--------------+------------+
-#display( 14, '2014-03-06' )
-*--------------+------------+
-#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' )
-*--------------+------------+
+Notices
+
+ * Since version <<32>> <<<maven-site-plugin:attach-descriptor>>> was removed from <<<plugins>>> section.
+
+ Publishing a site descriptor is only needed in project parent poms, child projects not need publish it.
+
+ When you need publish site descriptor in your project you should add, like:
+
++------+
+<build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <id>attach-descriptor</id>
+ <goals>
+ <goal>attach-descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+</build>
++------+
+
+ []
=====================================
src/site-docs/resources/download.cgi → docs/src/site/resources/download.cgi
=====================================
=====================================
src/site-docs/site.xml → docs/src/site/site.xml
=====================================
@@ -19,11 +19,10 @@ specific language governing permissions and limitations
under the License.
-->
-<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">
+<project xmlns="http://maven.apache.org/DECORATION/1.8.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd">
<bannerLeft>
- <name>${project.name}</name>
<src>https://maven.apache.org/images/apache-maven-project.png</src>
<href>https://www.apache.org/</href>
</bannerLeft>
@@ -36,7 +35,7 @@ under the License.
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
- <version>1.11.1</version>
+ <version>${version.maven-fluido-skin}</version>
</skin>
<custom>
@@ -94,7 +93,7 @@ under the License.
<item name="Wagon" href="https://maven.apache.org/wagon/index.html" />
</menu>
<menu name="ASF">
- <item name="How Apache Works" href="https://www.apache.org/foundation/how-it-works.html"/>
+ <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"/>
=====================================
src/site-docs/xdoc/download.xml.vm → docs/src/site/xdoc/download.xml.vm
=====================================
=====================================
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>29</version>
+ <version>33</version>
<packaging>pom</packaging>
<name>The Apache Software Foundation</name>
@@ -59,29 +59,35 @@ under the License.
</mailingList>
</mailingLists>
+ <modules>
+ <module>docs</module>
+ </modules>
+
<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-29</tag>
+ <tag>apache-33</tag>
</scm>
<distributionManagement>
<repository>
- <id>apache.releases.https</id>
+ <id>${distMgmtReleasesId}</id>
<name>${distMgmtReleasesName}</name>
<url>${distMgmtReleasesUrl}</url>
</repository>
<snapshotRepository>
- <id>apache.snapshots.https</id>
+ <id>${distMgmtSnapshotsId}</id>
<name>${distMgmtSnapshotsName}</name>
<url>${distMgmtSnapshotsUrl}</url>
</snapshotRepository>
</distributionManagement>
<properties>
+ <distMgmtReleasesId>apache.releases.https</distMgmtReleasesId>
<distMgmtReleasesName>Apache Release Distribution Repository</distMgmtReleasesName>
<distMgmtReleasesUrl>https://repository.apache.org/service/local/staging/deploy/maven2</distMgmtReleasesUrl>
+ <distMgmtSnapshotsId>apache.snapshots.https</distMgmtSnapshotsId>
<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_2016.png</organization.logo>
@@ -89,14 +95,46 @@ under the License.
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<sourceReleaseAssemblyDescriptor>source-release</sourceReleaseAssemblyDescriptor>
<gpg.useagent>true</gpg.useagent>
- <minimalMavenBuildVersion>3.2.5</minimalMavenBuildVersion>
+ <minimalMavenBuildVersion>3.6.3</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.7.0</maven.plugin.tools.version><!-- for m-plugin-p and maven-plugin-annotations -->
+ <maven.compiler.target>7</maven.compiler.target><!-- use version numbers without the "1." prefix (supported since javac 5) -->
+ <surefire.version>3.3.0</surefire.version><!-- for surefire, failsafe and surefire-report -->
<assembly.tarLongFileMode>posix</assembly.tarLongFileMode>
- <project.build.outputTimestamp>2022-12-11T19:18:10Z</project.build.outputTimestamp>
+
+ <project.build.outputTimestamp>2024-07-04T18:52:46Z</project.build.outputTimestamp>
+
+ <version.apache-rat-plugin>0.16.1</version.apache-rat-plugin>
+ <version.apache-resource-bundles>1.5</version.apache-resource-bundles>
+ <version.checksum-maven-plugin>1.11</version.checksum-maven-plugin>
+ <version.maven-antrun-plugin>3.1.0</version.maven-antrun-plugin>
+ <version.maven-assembly-plugin>3.7.1</version.maven-assembly-plugin>
+ <version.maven-clean-plugin>3.4.0</version.maven-clean-plugin>
+ <version.maven-checkstyle-plugin>3.4.0</version.maven-checkstyle-plugin>
+ <version.maven-compiler-plugin>3.13.0</version.maven-compiler-plugin>
+ <version.maven-dependency-plugin>3.7.1</version.maven-dependency-plugin>
+ <version.maven-deploy-plugin>3.1.2</version.maven-deploy-plugin>
+ <version.maven-ear-plugin>3.3.0</version.maven-ear-plugin>
+ <version.maven-enforcer-plugin>3.5.0</version.maven-enforcer-plugin>
+ <version.maven-fluido-skin>1.12.0</version.maven-fluido-skin>
+ <version.maven-gpg-plugin>3.2.4</version.maven-gpg-plugin>
+ <version.maven-help-plugin>3.4.1</version.maven-help-plugin>
+ <version.maven-install-plugin>3.1.2</version.maven-install-plugin>
+ <version.maven-invoker-plugin>3.7.0</version.maven-invoker-plugin>
+ <version.maven-jar-plugin>3.4.2</version.maven-jar-plugin>
+ <version.maven-javadoc-plugin>3.7.0</version.maven-javadoc-plugin>
+ <version.maven-plugin-tools>3.13.1</version.maven-plugin-tools>
+ <version.maven-project-info-reports-plugin>3.6.1</version.maven-project-info-reports-plugin>
+ <version.maven-release-plugin>3.1.0</version.maven-release-plugin>
+ <version.maven-remote-resources-plugin>3.2.0</version.maven-remote-resources-plugin>
+ <version.maven-resources-plugin>3.3.1</version.maven-resources-plugin>
+ <version.maven-scm-plugin>2.1.0</version.maven-scm-plugin>
+ <version.maven-scm-publish-plugin>3.3.0</version.maven-scm-publish-plugin>
+ <version.maven-shade-plugin>3.6.0</version.maven-shade-plugin>
+ <version.maven-site-plugin>3.12.1</version.maven-site-plugin>
+ <version.maven-source-plugin>3.3.1</version.maven-source-plugin>
+ <version.maven-surefire>${surefire.version}</version.maven-surefire>
+ <version.maven-war-plugin>3.4.0</version.maven-war-plugin>
</properties>
<dependencyManagement>
@@ -104,7 +142,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>${maven.plugin.tools.version}</version>
+ <version>${version.maven-plugin-tools}</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -137,52 +175,57 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>3.1.0</version>
+ <version>${version.maven-antrun-plugin}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.4.2</version>
+ <version>${version.maven-assembly-plugin}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
- <version>3.2.0</version>
+ <version>${version.maven-clean-plugin}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${version.maven-checkstyle-plugin}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.10.1</version>
+ <version>${version.maven-compiler-plugin}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>3.4.0</version>
+ <version>${version.maven-dependency-plugin}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>${version.maven-deploy-plugin}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
- <version>3.3.0</version>
+ <version>${version.maven-ear-plugin}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.1.0</version>
+ <version>${version.maven-enforcer-plugin}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>${surefire.version}</version>
+ <version>${version.maven-surefire}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
- <version>3.0.1</version>
+ <version>${version.maven-gpg-plugin}</version>
<configuration>
<gpgArguments>
<arg>--digest-algo=SHA512</arg>
@@ -192,22 +235,22 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-help-plugin</artifactId>
- <version>3.3.0</version>
+ <version>${version.maven-help-plugin}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>3.1.0</version>
+ <version>${version.maven-install-plugin}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
- <version>3.3.0</version>
+ <version>${version.maven-invoker-plugin}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>3.3.0</version>
+ <version>${version.maven-jar-plugin}</version>
<configuration>
<archive>
<manifest>
@@ -220,7 +263,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.4.1</version>
+ <version>${version.maven-javadoc-plugin}</version>
<configuration>
<notimestamp>true</notimestamp><!-- avoid noise for svn/gitpubsub -->
</configuration>
@@ -228,17 +271,17 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>${maven.plugin.tools.version}</version>
+ <version>${version.maven-plugin-tools}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-report-plugin</artifactId>
- <version>${maven.plugin.tools.version}</version>
+ <version>${version.maven-plugin-tools}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.4.1</version>
+ <version>${version.maven-project-info-reports-plugin}</version>
<configuration>
<pluginManagementExcludes>
<exclude>org.eclipse.m2e:lifecycle-mapping</exclude>
@@ -249,8 +292,9 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>3.0.0-M7</version>
+ <version>${version.maven-release-plugin}</version>
<configuration>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
<useReleaseProfile>false</useReleaseProfile>
<goals>deploy</goals>
<releaseProfiles>apache-release</releaseProfiles>
@@ -260,57 +304,57 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.7.0</version>
+ <version>${version.maven-remote-resources-plugin}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.3.0</version>
+ <version>${version.maven-resources-plugin}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-plugin</artifactId>
- <version>1.13.0</version>
+ <version>${version.maven-scm-plugin}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
- <version>3.1.0</version>
+ <version>${version.maven-scm-publish-plugin}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.12.1</version>
+ <version>${version.maven-site-plugin}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>3.2.1</version>
+ <version>${version.maven-source-plugin}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
+ <version>${version.maven-surefire}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>${surefire.version}</version>
+ <version>${version.maven-surefire}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>3.3.2</version>
+ <version>${version.maven-war-plugin}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.4.1</version>
+ <version>${version.maven-shade-plugin}</version>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.15</version>
+ <version>${version.apache-rat-plugin}</version>
</plugin>
</plugins>
</pluginManagement>
@@ -327,7 +371,7 @@ under the License.
</goals>
<configuration>
<resourceBundles>
- <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+ <resourceBundle>org.apache.apache.resources:apache-jar-resource-bundle:${version.apache-resource-bundles}</resourceBundle>
</resourceBundles>
</configuration>
</execution>
@@ -365,17 +409,15 @@ under the License.
</execution>
</executions>
</plugin>
+
+ <!-- we have dedicated module for documentation, so skip site plugin at all -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-descriptor</id>
- <goals>
- <goal>attach-descriptor</goal>
- </goals>
- </execution>
- </executions>
+ <inherited>false</inherited>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
</plugin>
</plugins>
</build>
@@ -396,7 +438,7 @@ under the License.
<dependency>
<groupId>org.apache.apache.resources</groupId>
<artifactId>apache-source-release-assembly-descriptor</artifactId>
- <version>1.0.6</version>
+ <version>${version.apache-resource-bundles}</version>
</dependency>
</dependencies>
<executions>
@@ -416,15 +458,6 @@ under the License.
</execution>
</executions>
</plugin>
- <!-- We want to deploy the artifact to a staging location for perusal -->
- <plugin>
- <inherited>true</inherited>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <updateReleaseInfo>true</updateReleaseInfo>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
@@ -453,7 +486,7 @@ under the License.
<plugin>
<groupId>net.nicoulaj.maven.plugins</groupId>
<artifactId>checksum-maven-plugin</artifactId>
- <version>1.11</version>
+ <version>${version.checksum-maven-plugin}</version>
<executions>
<execution>
<id>source-release-checksum</id>
@@ -494,6 +527,17 @@ under the License.
</build>
</profile>
<!-- END SNIPPET: release-profile -->
+ <profile>
+ <id>jdk9+</id>
+ <activation>
+ <!-- this does not support toolchains, https://issues.apache.org/jira/browse/MNG-6943 -->
+ <jdk>[9,)</jdk>
+ </activation>
+ <properties>
+ <!-- https://maven.apache.org/plugins/maven-compiler-plugin/examples/set-compiler-release.html, affects m-compiler-p and m-javadoc-p -->
+ <maven.compiler.release>${maven.compiler.target}</maven.compiler.release>
+ </properties>
+ </profile>
<profile>
<id>only-eclipse</id>
<activation>
@@ -517,7 +561,7 @@ under the License.
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
- <versionRange>[0,1.8.0)</versionRange>
+ <versionRange>[0,)</versionRange>
<goals>
<goal>process</goal>
</goals>
View it on GitLab: https://salsa.debian.org/java-team/apache-pom/-/compare/ac3ad802e879aa17c8d3002b801520f639be1976...248c4e869e94f21ce86a7be0b95a915deda73f1a
--
View it on GitLab: https://salsa.debian.org/java-team/apache-pom/-/compare/ac3ad802e879aa17c8d3002b801520f639be1976...248c4e869e94f21ce86a7be0b95a915deda73f1a
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/20241023/70bc7cd5/attachment.htm>
More information about the pkg-java-commits
mailing list