From 414d07679832d35d457317098a1a23720708f5e2eee4cc4b9f92ce8f95485480 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 5 Sep 2023 06:56:55 +0000 Subject: [PATCH 1/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-parent?expand=0&rev=5 --- maven-parent-27-source-release.zip | 3 --- maven-parent-40-source-release.zip | 3 +++ maven-parent.spec | 17 ++++++++++++----- 3 files changed, 15 insertions(+), 8 deletions(-) delete mode 100644 maven-parent-27-source-release.zip create mode 100644 maven-parent-40-source-release.zip diff --git a/maven-parent-27-source-release.zip b/maven-parent-27-source-release.zip deleted file mode 100644 index cecb153..0000000 --- a/maven-parent-27-source-release.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c7f0c570c1acb5c94d2d52e5184493385eab8e9829b4f276dbdc35eda1a4cc54 -size 21384 diff --git a/maven-parent-40-source-release.zip b/maven-parent-40-source-release.zip new file mode 100644 index 0000000..15ffabd --- /dev/null +++ b/maven-parent-40-source-release.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e70e7ee6618ce1740b5c09c6860a8617c51a1738b754063076a44f00a81dd4f +size 61162 diff --git a/maven-parent.spec b/maven-parent.spec index 5f98bad..c9bab23 100644 --- a/maven-parent.spec +++ b/maven-parent.spec @@ -1,7 +1,7 @@ # # spec file for package maven-parent # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,13 @@ Name: maven-parent -Version: 27 +Version: 40 Release: 0 Summary: Apache Maven parent POM License: Apache-2.0 Group: Development/Libraries/Java -URL: http://maven.apache.org -Source0: http://repo1.maven.org/maven2/org/apache/maven/%{name}/%{version}/%{name}-%{version}-source-release.zip +URL: https://maven.apache.org +Source0: https://repo1.maven.org/maven2/org/apache/maven/%{name}/%{version}/%{name}-%{version}-source-release.zip BuildRequires: apache-parent BuildRequires: javapackages-local BuildRequires: unzip @@ -38,14 +38,21 @@ Apache Maven parent POM file used by other Maven projects. %pom_remove_plugin :maven-enforcer-plugin %pom_remove_plugin :maven-checkstyle-plugin %pom_remove_plugin :apache-rat-plugin +%pom_remove_plugin :spotless-maven-plugin +%pom_remove_plugin -r :maven-scm-publish-plugin %build %install install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} -install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom +%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom %add_maven_depmap %{name}/%{name}.pom +for i in doxia-tools maven-extensions maven-plugins maven-shared-components maven-skins; do + %{mvn_install_pom} ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom + %add_maven_depmap %{name}/${i}.pom +done + %files -f .mfiles %license LICENSE %doc NOTICE From 57fb443197dcce0ce02867bb5ed5fb7e89cc16bd9ab630cb244cb219d5bb1640 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 5 Sep 2023 06:58:03 +0000 Subject: [PATCH 2/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-parent?expand=0&rev=6 --- maven-parent.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-parent.spec b/maven-parent.spec index c9bab23..2610ae4 100644 --- a/maven-parent.spec +++ b/maven-parent.spec @@ -25,7 +25,7 @@ Group: Development/Libraries/Java URL: https://maven.apache.org Source0: https://repo1.maven.org/maven2/org/apache/maven/%{name}/%{version}/%{name}-%{version}-source-release.zip BuildRequires: apache-parent -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 BuildRequires: unzip Requires: apache-parent BuildArch: noarch From a45e6912641d4611174109e0dd231fec4f18c24f2fc970503a0b15c87ca16365 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 5 Sep 2023 07:00:30 +0000 Subject: [PATCH 3/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-parent?expand=0&rev=7 --- maven-parent.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/maven-parent.spec b/maven-parent.spec index 2610ae4..2446b47 100644 --- a/maven-parent.spec +++ b/maven-parent.spec @@ -28,6 +28,8 @@ BuildRequires: apache-parent BuildRequires: javapackages-local >= 6 BuildRequires: unzip Requires: apache-parent +Obsoletes: maven-plugins-pom +Provides: maven-plugins-pom BuildArch: noarch %description From 8333e6898f6453e5235cac9216f5c108fb05249abe86f7e86ac58db5682f6887 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 5 Sep 2023 07:05:10 +0000 Subject: [PATCH 4/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-parent?expand=0&rev=8 --- maven-parent.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/maven-parent.spec b/maven-parent.spec index 2446b47..172fe39 100644 --- a/maven-parent.spec +++ b/maven-parent.spec @@ -30,6 +30,8 @@ BuildRequires: unzip Requires: apache-parent Obsoletes: maven-plugins-pom Provides: maven-plugins-pom +Obsoletes: maven-shared +Provides: maven-shared BuildArch: noarch %description From ca249d6b5d318d31607c1584fadf6f441d655dee51e8eab422fabcc48da0c5e9 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 5 Sep 2023 07:33:14 +0000 Subject: [PATCH 5/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-parent?expand=0&rev=9 --- maven-parent.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/maven-parent.spec b/maven-parent.spec index 172fe39..63aaba6 100644 --- a/maven-parent.spec +++ b/maven-parent.spec @@ -39,10 +39,10 @@ Apache Maven parent POM file used by other Maven projects. %prep %setup -q -%pom_remove_plugin :maven-enforcer-plugin -%pom_remove_plugin :maven-checkstyle-plugin -%pom_remove_plugin :apache-rat-plugin -%pom_remove_plugin :spotless-maven-plugin +%pom_remove_plugin -r :maven-enforcer-plugin +%pom_remove_plugin -r :maven-checkstyle-plugin +%pom_remove_plugin -r :apache-rat-plugin +%pom_remove_plugin -r :spotless-maven-plugin %pom_remove_plugin -r :maven-scm-publish-plugin %build From 07c00e52023f73eb69bff99bce479fa8191baf93513a237300a4ea7181357a39 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 6 Sep 2023 13:16:45 +0000 Subject: [PATCH 6/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-parent?expand=0&rev=10 --- maven-parent.changes | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/maven-parent.changes b/maven-parent.changes index 14de1a8..7d3471f 100644 --- a/maven-parent.changes +++ b/maven-parent.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Wed Sep 6 13:13:24 UTC 2023 - Fridrich Strba + +- Upgrade to Apache Maven parent POM version 40 + * Besides maven-parent, it provides now also the following pom + artifacts: + + doxia-tools + + maven-extensions + + maven-plugins + + maven-shared-components + + maven-skins + * Obsoletes and provides the maven-plugins-pom and maven-shared + packages + ------------------------------------------------------------------- Sat Feb 9 06:14:30 UTC 2019 - Fridrich Strba