[Git][java-team/apache-pom][upstream] 4 commits: New upstream version 26
Emmanuel Bourg (@ebourg)
gitlab at salsa.debian.org
Fri Jan 6 12:37:59 GMT 2023
Emmanuel Bourg pushed to branch upstream at Debian Java Maintainers / apache-pom
Commits:
d7f3c746 by Emmanuel Bourg at 2023-01-06T12:53:23+01:00
New upstream version 26
- - - - -
860c1a88 by Emmanuel Bourg at 2023-01-06T12:53:27+01:00
New upstream version 27
- - - - -
2115accc by Emmanuel Bourg at 2023-01-06T12:53:30+01:00
New upstream version 28
- - - - -
ac3ad802 by Emmanuel Bourg at 2023-01-06T12:53:40+01:00
New upstream version 29
- - - - -
7 changed files:
- .asf.yaml
- .github/workflows/maven-verify.yml
- 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
=====================================
@@ -22,3 +22,9 @@ github:
- java
- build-management
- maven
+ enabled_merge_buttons:
+ squash: true
+ merge: false
+ rebase: true
+ autolink_jira:
+ - MPOM
\ No newline at end of file
=====================================
.github/workflows/maven-verify.yml
=====================================
@@ -25,3 +25,5 @@ jobs:
build:
name: Verify
uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml at v2
+ with:
+ ff-site-goal: 'site site:stage -f site-pom.xml'
=====================================
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>25</version>
+ <version>29</version>
<packaging>pom</packaging>
<name>The Apache Software Foundation</name>
@@ -43,7 +43,7 @@ under the License.
</organization>
<licenses>
<license>
- <name>Apache License, Version 2.0</name>
+ <name>Apache-2.0</name>
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
@@ -63,14 +63,14 @@ under the License.
<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>
+ <tag>apache-29</tag>
</scm>
<distributionManagement>
<repository>
<id>apache.releases.https</id>
- <name>Apache Release Distribution Repository</name>
- <url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
+ <name>${distMgmtReleasesName}</name>
+ <url>${distMgmtReleasesUrl}</url>
</repository>
<snapshotRepository>
<id>apache.snapshots.https</id>
@@ -80,6 +80,8 @@ under the License.
</distributionManagement>
<properties>
+ <distMgmtReleasesName>Apache Release Distribution Repository</distMgmtReleasesName>
+ <distMgmtReleasesUrl>https://repository.apache.org/service/local/staging/deploy/maven2</distMgmtReleasesUrl>
<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>
@@ -87,14 +89,14 @@ under the License.
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<sourceReleaseAssemblyDescriptor>source-release</sourceReleaseAssemblyDescriptor>
<gpg.useagent>true</gpg.useagent>
- <minimalMavenBuildVersion>3.1.1</minimalMavenBuildVersion>
+ <minimalMavenBuildVersion>3.2.5</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 -->
+ <maven.plugin.tools.version>3.7.0</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>
+ <project.build.outputTimestamp>2022-12-11T19:18:10Z</project.build.outputTimestamp>
</properties>
<dependencyManagement>
@@ -135,47 +137,42 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.3.0</version>
+ <version>3.4.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.10.0</version>
+ <version>3.10.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>3.2.0</version>
+ <version>3.4.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <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>
+ <version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -195,22 +192,22 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-help-plugin</artifactId>
- <version>3.2.0</version>
+ <version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>2.5.2</version>
+ <version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
- <version>3.2.2</version>
+ <version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>3.2.2</version>
+ <version>3.3.0</version>
<configuration>
<archive>
<manifest>
@@ -223,7 +220,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.3.2</version>
+ <version>3.4.1</version>
<configuration>
<notimestamp>true</notimestamp><!-- avoid noise for svn/gitpubsub -->
</configuration>
@@ -233,10 +230,15 @@ under the License.
<artifactId>maven-plugin-plugin</artifactId>
<version>${maven.plugin.tools.version}</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-report-plugin</artifactId>
+ <version>${maven.plugin.tools.version}</version>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.1.2</version>
+ <version>3.4.1</version>
<configuration>
<pluginManagementExcludes>
<exclude>org.eclipse.m2e:lifecycle-mapping</exclude>
@@ -247,7 +249,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>3.0.0-M5</version>
+ <version>3.0.0-M7</version>
<configuration>
<useReleaseProfile>false</useReleaseProfile>
<goals>deploy</goals>
@@ -263,12 +265,12 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.2.0</version>
+ <version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-plugin</artifactId>
- <version>1.12.2</version>
+ <version>1.13.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -278,7 +280,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.11.0</version>
+ <version>3.12.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -303,12 +305,12 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.2.4</version>
+ <version>3.4.1</version>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.13</version>
+ <version>0.15</version>
</plugin>
</plugins>
</pluginManagement>
@@ -409,7 +411,7 @@ under the License.
<descriptorRefs>
<descriptorRef>${sourceReleaseAssemblyDescriptor}</descriptorRef>
</descriptorRefs>
- <tarLongFileMode>posix</tarLongFileMode>
+ <tarLongFileMode>${assembly.tarLongFileMode}</tarLongFileMode>
</configuration>
</execution>
</executions>
=====================================
site-pom.xml
=====================================
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>25</version>
+ <version>29</version>
<relativePath>./pom.xml</relativePath>
</parent>
@@ -58,7 +58,7 @@ under the License.
</issueManagement>
<ciManagement>
<system>Jenkins</system>
- <url>https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven-parent/</url>
+ <url>https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven-apache-parent/</url>
<notifiers>
<notifier>
<type>mail</type>
=====================================
src/site-docs/apt/index.apt.vm
=====================================
@@ -164,7 +164,7 @@ 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-25...master}diff}})
+ ({{{https://github.com/apache/maven-apache-parent/compare/apache-29...master}diff}})
#end
#macro ( display $version $date )
#**##set( $prev = $version - 1 )
@@ -175,6 +175,14 @@ History
*--------------+------------+
|| <<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' )
=====================================
src/site-docs/site.xml
=====================================
@@ -36,11 +36,22 @@ under the License.
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
- <version>1.10.0</version>
+ <version>1.11.1</version>
</skin>
+ <custom>
+ <matomo>
+ <siteId>3</siteId>
+ <url>https://analytics.apache.org/</url>
+ <options>
+ <disableCookies/>
+ <trackPageView/>
+ <enableLinkTracking/>
+ </options>
+ </matomo>
+ </custom>
+
<edit>${project.scm.url}</edit>
- <googleAnalyticsAccountId>UA-140879-1</googleAnalyticsAccountId>
<publishDate position="right" />
<version position="right" />
@@ -85,9 +96,10 @@ under the License.
<menu name="ASF">
<item name="How Apache Works" href="https://www.apache.org/foundation/how-it-works.html"/>
<item name="Foundation" href="https://www.apache.org/foundation/"/>
+ <item name="Data Privacy" href="https://privacy.apache.org/policies/privacy-policy-public.html"/>
<item name="Sponsoring Apache" href="https://www.apache.org/foundation/sponsorship.html"/>
<item name="Thanks" href="https://www.apache.org/foundation/thanks.html"/>
</menu>
</body>
-</project>
\ No newline at end of file
+</project>
=====================================
src/site-docs/xdoc/download.xml.vm
=====================================
@@ -23,102 +23,51 @@ under the License.
<properties>
<title>Download ${project.name} Source</title>
</properties>
+
<body>
<section name="Download ${project.name} ${project.version} Source">
- <p>${project.name} ${project.version} is distributed in source format. Use a source archive if you intend to build
- ${project.name} yourself. Otherwise, simply use the ready-made binary artifacts from central repository.</p>
-
- <p>You will be prompted for a mirror - if the file is not found on yours, please be patient, as it may take 24
- hours to reach all mirrors.<p/>
-
- <p>In order to guard against corrupted downloads/installations, it is highly recommended to
- <a href="https://www.apache.org/dev/release-signing#verifying-signature">verify the signature</a>
- of the release bundles against the public <a href="https://www.apache.org/dist/maven/KEYS">KEYS</a> used by the Apache Maven
- developers.</p>
+ <p><strong>${project.name} ${project.version}</strong> is distributed in source format.</p>
- <p>${project.name} is distributed under the <a href="https://www.apache.org/licenses/">Apache License, version 2.0</a>.</p>
+ <p>Use a source archive if you intend to build <strong>${project.name}</strong> yourself.</p>
- <p></p>We <b>strongly</b> encourage our users to configure a Maven repository mirror closer to their location, please read <a href="/guides/mini/guide-mirror-settings.html">How to Use Mirrors for Repositories</a>.</p>
-
- <a name="mirror"/>
- <subsection name="Mirror">
-
- <p>
- [if-any logo]
- <a href="[link]">
- <img align="right" src="[logo]" border="0"
- alt="logo"/>
- </a>
- [end]
- The currently selected mirror is
- <b>[preferred]</b>.
- If you encounter a problem with this mirror,
- please select another mirror.
- If all mirrors are failing, there are
- <i>backup</i>
- mirrors
- (at the end of the mirrors list) that should be available.
- </p>
+ <p>Otherwise, simply use the ready-made binary artifacts from <strong>central repository</strong>.</p>
- <form action="[location]" method="get" id="SelectMirror">
- Other mirrors:
- <select name="Preferred">
- [if-any http]
- [for http]
- <option value="[http]">[http]</option>
- [end]
- [end]
- [if-any ftp]
- [for ftp]
- <option value="[ftp]">[ftp]</option>
- [end]
- [end]
- [if-any backup]
- [for backup]
- <option value="[backup]">[backup] (backup)</option>
- [end]
- [end]
- </select>
- <input type="submit" value="Change"/>
- </form>
+ <p><strong>${project.name}</strong> is distributed under the <a href="https://www.apache.org/licenses/">Apache License, version 2.0</a>.</p>
- <p>
- You may also consult the
- <a href="https://www.apache.org/mirrors/">complete list of
- mirrors.</a>
+ <subsection name="Files">
+
+ <p>This is the current stable version of <strong>${project.name}</strong>.</p>
+
+ <table>
+ <thead>
+ <tr>
+ <th></th>
+ <th>Link</th>
+ <th>Checksum</th>
+ <th>Signature</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>${project.name} ${project.version} (Source zip)</td>
+ <td><a href="[preferred]maven/pom/apache-${project.version}-source-release.zip">apache-${project.version}-source-release.zip</a></td>
+ <td><a href="https://downloads.apache.org/maven/pom/apache-${project.version}-source-release.zip.sha512">apache-${project.version}-source-release.zip.sha512</a></td>
+ <td><a href="https://downloads.apache.org/maven/pom/apache-${project.version}-source-release.zip.asc">apache-${project.version}-source-release.zip.asc</a></td>
+ </tr>
+ </tbody>
+ </table>
+
+ <p>It is essential that you <a href="https://www.apache.org/info/verification.html">verify the integrity</a> of the downloaded file
+ using the checksum (.sha512 file)
+ or using the signature (.asc file) against the public <a href="https://downloads.apache.org/maven/KEYS">KEYS</a> used by the Apache Maven developers.
</p>
</subsection>
-
- <subsection name="${project.name} ${project.version}">
-
- <p>This is the current stable version of ${project.name}.</p>
-
- <table>
- <thead>
- <tr>
- <th></th>
- <th>Link</th>
- <th>Checksum</th>
- <th>Signature</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>${project.name} ${project.version} (Source zip)</td>
- <td><a href="[preferred]maven/pom/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.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>
- </table>
- </subsection>
<subsection name="Previous Versions">
-
- <p>Older non-recommended releases can be found on our <a href="https://archive.apache.org/dist/maven/pom/">archive site</a>.</p>
-
+ <p>It is strongly recommended to use the latest release version of <strong>${project.name}</strong> to take advantage of the newest features and bug fixes.</p>
+ <p>Older non-recommended releases can be found on our <a href="https://archive.apache.org/dist/maven/pom/">archive site</a>.</p>
</subsection>
</section>
</body>
View it on GitLab: https://salsa.debian.org/java-team/apache-pom/-/compare/93908afcc3a2c1bf6e91a11fb60c91d136884c0f...ac3ad802e879aa17c8d3002b801520f639be1976
--
View it on GitLab: https://salsa.debian.org/java-team/apache-pom/-/compare/93908afcc3a2c1bf6e91a11fb60c91d136884c0f...ac3ad802e879aa17c8d3002b801520f639be1976
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/20230106/874140bc/attachment.htm>
More information about the pkg-java-commits
mailing list