From 63bad29a214fbf2044465b0d7e9affb279e47775979713d96836d3869c58c514 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 5 Sep 2023 07:57:41 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-pom?expand=0&rev=5 --- plexus-14.tar.gz | 3 +++ plexus-pom.spec | 19 +++++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-) create mode 100644 plexus-14.tar.gz diff --git a/plexus-14.tar.gz b/plexus-14.tar.gz new file mode 100644 index 0000000..4e9503c --- /dev/null +++ b/plexus-14.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a97c9c642cf50d4696c95782c355b74cfa467816d5665dd938e5701baa311fbd +size 26759 diff --git a/plexus-pom.spec b/plexus-pom.spec index 3d1bb7c..f7a5976 100644 --- a/plexus-pom.spec +++ b/plexus-pom.spec @@ -1,7 +1,7 @@ # # spec file for package plexus-pom # -# 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,7 +17,7 @@ Name: plexus-pom -Version: 5.1 +Version: 14 Release: 0 Summary: Root Plexus Projects POM License: Apache-2.0 @@ -25,7 +25,7 @@ Group: Development/Libraries/Java URL: https://github.com/codehaus-plexus/plexus-pom Source0: https://github.com/codehaus-plexus/plexus-pom/archive/plexus-%{version}.tar.gz Source1: http://www.apache.org/licenses/LICENSE-2.0.txt -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 BuildArch: noarch %description @@ -35,21 +35,20 @@ Plexus packages. %prep %setup -q -n plexus-pom-plexus-%{version} -# * require: org.codehaus.plexus plexus-stylus-skin 1.0 -# org.apache.maven.wagon wagon-webdav-jackrabbit 1.0 -%pom_remove_plugin :maven-site-plugin -%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin -%pom_remove_plugin org.codehaus.mojo:taglist-maven-plugin -#Temporary? +%pom_remove_dep org.junit:junit-bom +%pom_remove_plugin :maven-site-plugin %pom_remove_plugin :maven-enforcer-plugin +%pom_remove_plugin :taglist-maven-plugin +%pom_remove_plugin :spotless-maven-plugin + cp -p %{SOURCE1} LICENSE %build %install install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} -install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/plexus.pom +%mvn_install_pom pom.xml %{buildroot}%{_mavenpomdir}/%{name}/plexus.pom %add_maven_depmap %{name}/plexus.pom %files -f .mfiles From 72b42aa2377dc02466386c0ad2dd5c5f6a9eb981542156e56e96fcec60476e05 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 6 Sep 2023 15:07:28 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-pom?expand=0&rev=6 --- plexus-14.tar.gz | 3 --- plexus-pom.changes | 27 +++++++++++++++++++++++++++ plexus-pom.spec | 19 ++++++++++--------- 3 files changed, 37 insertions(+), 12 deletions(-) delete mode 100644 plexus-14.tar.gz diff --git a/plexus-14.tar.gz b/plexus-14.tar.gz deleted file mode 100644 index 4e9503c..0000000 --- a/plexus-14.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a97c9c642cf50d4696c95782c355b74cfa467816d5665dd938e5701baa311fbd -size 26759 diff --git a/plexus-pom.changes b/plexus-pom.changes index b9a5afe..bed1afa 100644 --- a/plexus-pom.changes +++ b/plexus-pom.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Wed Sep 6 14:57:40 UTC 2023 - Fridrich Strba + +- Upgrade to version 14 + * Bug Fixes + + Remove maven-failsafe-report-plugin + + Set compiler.source and compiler.target to javaVersion + property without "1.x" prefix + + fix site descriptor (revert partially PR #161) + + fix site link + + Add a deploy build + + Add spotless plugin configuration + + Correct location of Checkstyle header + + javadoc notimestamp, to avoid noise in gh-pages + + Remove test-javadoc report and configuration improvements + + Require Maven 3.2.5+ + + Remove FindBugs from reporting + + Drop Dependency Management for plexus-component-annotations + (deprecated) + + Fix mailing list links + + Checkstyle license check - depend on file from released branch + + Refresh Maven site + + Fix link to ASF 2.0 license + + One time spotless apply + + Sync enforcer configuration setup with ASF + + Drop no longer needed configuration for checkstyle plugin + ------------------------------------------------------------------- Sat Feb 9 06:10:22 UTC 2019 - Fridrich Strba diff --git a/plexus-pom.spec b/plexus-pom.spec index f7a5976..3d1bb7c 100644 --- a/plexus-pom.spec +++ b/plexus-pom.spec @@ -1,7 +1,7 @@ # # spec file for package plexus-pom # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # 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: plexus-pom -Version: 14 +Version: 5.1 Release: 0 Summary: Root Plexus Projects POM License: Apache-2.0 @@ -25,7 +25,7 @@ Group: Development/Libraries/Java URL: https://github.com/codehaus-plexus/plexus-pom Source0: https://github.com/codehaus-plexus/plexus-pom/archive/plexus-%{version}.tar.gz Source1: http://www.apache.org/licenses/LICENSE-2.0.txt -BuildRequires: javapackages-local >= 6 +BuildRequires: javapackages-local BuildArch: noarch %description @@ -35,20 +35,21 @@ Plexus packages. %prep %setup -q -n plexus-pom-plexus-%{version} - -%pom_remove_dep org.junit:junit-bom +# * require: org.codehaus.plexus plexus-stylus-skin 1.0 +# org.apache.maven.wagon wagon-webdav-jackrabbit 1.0 %pom_remove_plugin :maven-site-plugin -%pom_remove_plugin :maven-enforcer-plugin -%pom_remove_plugin :taglist-maven-plugin -%pom_remove_plugin :spotless-maven-plugin +%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin +%pom_remove_plugin org.codehaus.mojo:taglist-maven-plugin +#Temporary? +%pom_remove_plugin :maven-enforcer-plugin cp -p %{SOURCE1} LICENSE %build %install install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} -%mvn_install_pom pom.xml %{buildroot}%{_mavenpomdir}/%{name}/plexus.pom +install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/plexus.pom %add_maven_depmap %{name}/plexus.pom %files -f .mfiles