From c5dcf96360410fe4b1b58edc32709eaa2fd10ea69bf7f75113d4424bc647fdb2 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 25 Sep 2023 06:37:38 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/buildnumber-maven-plugin?expand=0&rev=6 --- buildnumber-maven-plugin.spec | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/buildnumber-maven-plugin.spec b/buildnumber-maven-plugin.spec index 25bc6e3..6b8c554 100644 --- a/buildnumber-maven-plugin.spec +++ b/buildnumber-maven-plugin.spec @@ -1,7 +1,7 @@ # # spec file for package buildnumber-maven-plugin # -# Copyright (c) 2022 SUSE LLC +# 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 @@ -42,10 +42,10 @@ BuildRequires: mvn(org.apache.maven.scm:maven-scm-provider-perforce) BuildRequires: mvn(org.apache.maven.scm:maven-scm-provider-starteam) BuildRequires: mvn(org.apache.maven.scm:maven-scm-provider-svn-commons) BuildRequires: mvn(org.apache.maven.scm:maven-scm-provider-svnexe) +BuildRequires: mvn(org.apache.maven:maven-compat) BuildRequires: mvn(org.apache.maven:maven-core) BuildRequires: mvn(org.apache.maven:maven-plugin-api) -BuildRequires: mvn(org.apache.maven:maven-project) -BuildRequires: mvn(org.apache.maven:maven-settings:2.0.6) +BuildRequires: mvn(org.apache.maven:maven-settings) BuildRequires: mvn(org.codehaus.mojo:mojo-parent:pom:) BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) @@ -79,15 +79,21 @@ API documentation for %{name}. %setup -q cp -p %{SOURCE1} . +# migrate to maven 3 +%pom_xpath_set pom:properties/pom:maven.api.version 3.8.6 +%pom_change_dep :maven-project :maven-compat + +%pom_xpath_set pom:properties/pom:maven.compiler.source 1.8 +%pom_xpath_set pom:properties/pom:maven.compiler.target 1.8 +%pom_xpath_set pom:properties/pom:mojo.java.target 8 + %pom_remove_dep com.google.code.maven-scm-provider-svnjava:maven-scm-provider-svnjava %pom_remove_dep org.tmatesoft.svnkit:svnkit %pom_remove_plugin :maven-enforcer-plugin %pom_remove_plugin :maven-invoker-plugin %build -%{mvn_build} -f -- \ - -Dsource=8 -Dmaven.compiler.source=8 \ - -Dmaven.compiler.target=8 -Dmojo.java.target=8 +%{mvn_build} -f -- -Dsource=8 %install %mvn_install From a1ab5ab6f98d0cc2ca2655c20cd9377cb55b3066d0d56f700af328d32656e8b0 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 25 Sep 2023 09:35:17 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/buildnumber-maven-plugin?expand=0&rev=7 --- buildnumber-maven-plugin.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/buildnumber-maven-plugin.changes b/buildnumber-maven-plugin.changes index 25a45fa..cd84496 100644 --- a/buildnumber-maven-plugin.changes +++ b/buildnumber-maven-plugin.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 25 09:35:11 UTC 2023 - Fridrich Strba + +- Remove dependency on maven2 + ------------------------------------------------------------------- Tue Mar 22 06:44:55 UTC 2022 - Fridrich Strba