Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package apache-parent for openSUSE:Factory checked in at 2024-01-22 20:31:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache-parent (Old) and /work/SRC/openSUSE:Factory/.apache-parent.new.16006 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache-parent" Mon Jan 22 20:31:53 2024 rev:7 rq:1140069 version:31 Changes: -------- --- /work/SRC/openSUSE:Factory/apache-parent/apache-parent.changes 2022-12-06 14:23:02.953465923 +0100 +++ /work/SRC/openSUSE:Factory/.apache-parent.new.16006/apache-parent.changes 2024-01-22 20:31:59.440323304 +0100 @@ -1,0 +2,15 @@ +Fri Jan 19 21:30:26 UTC 2024 - Fridrich Strba <[email protected]> + +- update to 31: + * New Feature + + MPOM-440: Add maven-checkstyle-plugin to pluginManagement + * Improvement + + MPOM-399: Set minimalMavenBuildVersion to 3.6.3 - the minimum + used by plugins + + MPOM-378: Using an SPDX identifier as the license name is + recommended by Maven + + MPOM-289: Use properties to define the versions of plugins + * Bug + + MPOM-386: update documentation for previous changes + +------------------------------------------------------------------- Old: ---- apache-28-source-release.zip apache-28-source-release.zip.asc New: ---- apache-31-source-release.zip apache-31-source-release.zip.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache-parent.spec ++++++ --- /var/tmp/diff_new_pack.YLobVF/_old 2024-01-22 20:32:00.632366839 +0100 +++ /var/tmp/diff_new_pack.YLobVF/_new 2024-01-22 20:32:00.636366986 +0100 @@ -1,7 +1,7 @@ # # spec file for package apache-parent # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: apache-parent -Version: 28 +Version: 31 Release: 0 Summary: Parent POM file for Apache projects License: Apache-2.0 @@ -25,8 +25,7 @@ URL: https://github.com/apache/maven-apache-parent Source0: https://repo1.maven.org/maven2/org/apache/apache/%{version}/apache-%{version}-source-release.zip Source1: https://repo1.maven.org/maven2/org/apache/apache/%{version}/apache-%{version}-source-release.zip.asc -Source2: apache-parent.keyring - +Source2: https://downloads.apache.org/maven/KEYS#/%{name}.keyring BuildRequires: javapackages-local BuildRequires: unzip BuildArch: noarch @@ -43,7 +42,7 @@ %install # pom -install -d -m 755 %{buildroot}%{_mavenpomdir} +install -dm 755 %{buildroot}%{_mavenpomdir} install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom %add_maven_depmap %{name}.pom ++++++ apache-28-source-release.zip -> apache-31-source-release.zip ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-28/.asf.yaml new/apache-31/.asf.yaml --- old/apache-28/.asf.yaml 2022-11-14 22:50:42.000000000 +0100 +++ new/apache-31/.asf.yaml 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +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. -# -# 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-28/.github/dependabot.yml new/apache-31/.github/dependabot.yml --- old/apache-28/.github/dependabot.yml 2022-11-14 22:50:42.000000000 +0100 +++ new/apache-31/.github/dependabot.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +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. -# -version: 2 -updates: -- package-ecosystem: maven - directory: "/" - schedule: - interval: daily - time: '04:00' - open-pull-requests-limit: 10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-28/.github/workflows/maven-verify.yml new/apache-31/.github/workflows/maven-verify.yml --- old/apache-28/.github/workflows/maven-verify.yml 2022-11-14 22:50:42.000000000 +0100 +++ new/apache-31/.github/workflows/maven-verify.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,29 +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. - -name: Verify - -on: - push: - pull_request: - -jobs: - build: - name: Verify - uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v2 - with: - ff-site-goal: 'site site:stage -f site-pom.xml' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-28/Jenkinsfile new/apache-31/Jenkinsfile --- old/apache-28/Jenkinsfile 2022-11-14 22:50:42.000000000 +0100 +++ new/apache-31/Jenkinsfile 2023-11-08 22:14:22.000000000 +0100 @@ -17,4 +17,4 @@ * under the License. */ -asfMavenTlpStdBuild(jdks:['8']) +asfMavenTlpStdBuild(jdks:['17']) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-28/NOTICE new/apache-31/NOTICE --- old/apache-28/NOTICE 2022-11-14 22:50:42.000000000 +0100 +++ new/apache-31/NOTICE 2023-11-08 22:14:22.000000000 +0100 @@ -1,8 +1,6 @@ - The Apache Software Foundation -Copyright 2022 The Apache Software Foundation +Copyright 2023 The Apache Software Foundation + This product includes software developed at The Apache Software Foundation (http://www.apache.org/). - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-28/pom.xml new/apache-31/pom.xml --- old/apache-28/pom.xml 2022-11-14 22:50:42.000000000 +0100 +++ new/apache-31/pom.xml 2023-11-08 22:14:22.000000000 +0100 @@ -25,7 +25,7 @@ <!-- for more information, see the documentation of this POM: http://maven.apache.org/pom/asf/ --> <groupId>org.apache</groupId> <artifactId>apache</artifactId> - <version>28</version> + <version>31</version> <packaging>pom</packaging> <name>The Apache Software Foundation</name> @@ -43,7 +43,7 @@ </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,7 +63,7 @@ <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-28</tag> + <tag>apache-31</tag> </scm> <distributionManagement> @@ -89,14 +89,47 @@ <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 --> + <surefire.version>3.2.2</surefire.version><!-- for surefire, failsafe and surefire-report --> + <maven.plugin.tools.version>3.10.2</maven.plugin.tools.version><!-- for m-plugin-p and maven-plugin-annotations --> <assembly.tarLongFileMode>posix</assembly.tarLongFileMode> - <project.build.outputTimestamp>2022-11-14T22:50:41Z</project.build.outputTimestamp> + + <version.maven-fluido-skin>1.11.2</version.maven-fluido-skin> + <project.build.outputTimestamp>2023-11-08T22:14:21Z</project.build.outputTimestamp> + + <version.apache-rat-plugin>0.15</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.6.0</version.maven-assembly-plugin> + <version.maven-clean-plugin>3.3.2</version.maven-clean-plugin> + <version.maven-checkstyle-plugin>3.3.1</version.maven-checkstyle-plugin> + <version.maven-compiler-plugin>3.11.0</version.maven-compiler-plugin> + <version.maven-dependency-plugin>3.6.1</version.maven-dependency-plugin> + <version.maven-deploy-plugin>3.1.1</version.maven-deploy-plugin> + <version.maven-ear-plugin>3.3.0</version.maven-ear-plugin> + <version.maven-enforcer-plugin>3.4.1</version.maven-enforcer-plugin> + <version.maven-gpg-plugin>3.1.0</version.maven-gpg-plugin> + <version.maven-help-plugin>3.4.0</version.maven-help-plugin> + <version.maven-install-plugin>3.1.1</version.maven-install-plugin> + <version.maven-invoker-plugin>3.6.0</version.maven-invoker-plugin> + <version.maven-jar-plugin>3.3.0</version.maven-jar-plugin> + <version.maven-javadoc-plugin>3.6.2</version.maven-javadoc-plugin> + <version.maven-plugin-tools>${maven.plugin.tools.version}</version.maven-plugin-tools> + <version.maven-project-info-reports-plugin>3.4.5</version.maven-project-info-reports-plugin> + <version.maven-release-plugin>3.0.1</version.maven-release-plugin> + <version.maven-remote-resources-plugin>3.1.0</version.maven-remote-resources-plugin> + <version.maven-resources-plugin>3.3.1</version.maven-resources-plugin> + <version.maven-scm-plugin>2.0.1</version.maven-scm-plugin> + <version.maven-scm-publish-plugin>3.2.1</version.maven-scm-publish-plugin> + <version.maven-shade-plugin>3.5.1</version.maven-shade-plugin> + <version.maven-site-plugin>3.12.1</version.maven-site-plugin> + <version.maven-source-plugin>3.3.0</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 +137,7 @@ <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 +170,57 @@ <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.3.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.2.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 +230,22 @@ <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.0.1</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 +258,7 @@ <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 +266,17 @@ <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,7 +287,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> - <version>3.0.0-M6</version> + <version>${version.maven-release-plugin}</version> <configuration> <useReleaseProfile>false</useReleaseProfile> <goals>deploy</goals> @@ -260,57 +298,57 @@ <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 +365,7 @@ </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> @@ -396,7 +434,7 @@ <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 +454,6 @@ </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 +482,7 @@ <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> @@ -517,7 +546,7 @@ <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> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-28/site-pom.xml new/apache-31/site-pom.xml --- old/apache-28/site-pom.xml 2022-11-14 22:50:42.000000000 +0100 +++ new/apache-31/site-pom.xml 2023-11-08 22:14:22.000000000 +0100 @@ -25,7 +25,7 @@ <parent> <groupId>org.apache</groupId> <artifactId>apache</artifactId> - <version>28</version> + <version>31</version> <relativePath>./pom.xml</relativePath> </parent> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-28/src/site-docs/apt/index.apt.vm new/apache-31/src/site-docs/apt/index.apt.vm --- old/apache-28/src/site-docs/apt/index.apt.vm 2022-11-14 22:50:42.000000000 +0100 +++ new/apache-31/src/site-docs/apt/index.apt.vm 2023-11-08 22:14:22.000000000 +0100 @@ -41,9 +41,9 @@ * 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 @@ {{<<<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,7 +64,17 @@ * <<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. - + + ** 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 to default to <<Java $context.get("maven.compiler.target")>> (<<<maven.compiler.target>>> property) and $context.get("project.build.sourceEncoding") source (<<<project.build.sourceEncoding>>> property). @@ -73,14 +83,13 @@ ** 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 and to disable + \<useReleaseProfiles\>. * <<plugins>>: The plugins section configures three executions: - ** maven-remote-resources-plugin for {{{/apache-resource-bundles/}org.apache:apache-jar-resource-bundle:1.4}}. + ** maven-remote-resources-plugin for {{{/apache-resource-bundles/jar/}org.apache.apache.resources:apache-jar-resource-bundle:$context.get("version.apache-resource-bundles")}}. ** maven-site-plugin:attach-descriptor @@ -94,7 +103,7 @@ * <<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> @@ -116,7 +125,7 @@ The profile includes the following plugins: * maven-assembly-plugin: - {{{/apache-resource-bundles/}org.apache.apache.resources:apache-source-release-assembly-descriptor:1.0.6}} + {{{/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,8 +134,6 @@ 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. @@ -164,7 +171,7 @@ #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-28...master}diff}}) + ({{{https://github.com/apache/maven-apache-parent/compare/apache-30...master}diff}}) #end #macro ( display $version $date ) #**##set( $prev = $version - 1 ) @@ -175,6 +182,12 @@ *--------------+------------+ || <<Version>> || <<Release Date>> || *--------------+------------+ +#display( 31, '2023-11-08' ) +*--------------+------------+ +#display( 30, '2023-06-11' ) +*--------------+------------+ +#display( 29, '2022-12-11' ) +*--------------+------------+ #display( 28, '2022-11-14' ) *--------------+------------+ #display( 27, '2022-07-10' ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-28/src/site-docs/site.xml new/apache-31/src/site-docs/site.xml --- old/apache-28/src/site-docs/site.xml 2022-11-14 22:50:42.000000000 +0100 +++ new/apache-31/src/site-docs/site.xml 2023-11-08 22:14:22.000000000 +0100 @@ -36,7 +36,7 @@ <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> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-28/src/site-docs/xdoc/download.xml.vm new/apache-31/src/site-docs/xdoc/download.xml.vm --- old/apache-28/src/site-docs/xdoc/download.xml.vm 2022-11-14 22:50:42.000000000 +0100 +++ new/apache-31/src/site-docs/xdoc/download.xml.vm 2023-11-08 22:14:22.000000000 +0100 @@ -23,102 +23,51 @@ <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><strong>${project.name} ${project.version}</strong> is distributed in source format.</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>Use a source archive if you intend to build <strong>${project.name}</strong> yourself.</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>${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> - - <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> - You may also consult the - <a href="https://www.apache.org/mirrors/";>complete list of - mirrors.</a> - </p> + <p><strong>${project.name}</strong> is distributed under the <a href="https://www.apache.org/licenses/";>Apache License, version 2.0</a>.</p> - </subsection> - - <subsection name="${project.name} ${project.version}"> - - <p>This is the current stable version of ${project.name}.</p> + <subsection name="Files"> - <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> + <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="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> ++++++ apache-parent.keyring ++++++ ++++ 4660 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/apache-parent/apache-parent.keyring ++++ and /work/SRC/openSUSE:Factory/.apache-parent.new.16006/apache-parent.keyring
