From b7ef60d7b3c8eb743afa964181fa85f86332abdf4d042d273739b16237543c07 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 25 Sep 2023 05:40:58 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/javacc-maven-plugin?expand=0&rev=7 --- javacc-maven-plugin.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/javacc-maven-plugin.spec b/javacc-maven-plugin.spec index 84a8628..9c17578 100644 --- a/javacc-maven-plugin.spec +++ b/javacc-maven-plugin.spec @@ -1,7 +1,7 @@ # # spec file for package javacc-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 @@ -37,9 +37,9 @@ BuildRequires: mvn(org.apache.maven.doxia:doxia-site-renderer) BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api) BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-impl) +BuildRequires: mvn(org.apache.maven:maven-core) BuildRequires: mvn(org.apache.maven:maven-model) BuildRequires: mvn(org.apache.maven:maven-plugin-api) -BuildRequires: mvn(org.apache.maven:maven-project) BuildRequires: mvn(org.codehaus.mojo:mojo-parent:pom:) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildArch: noarch @@ -59,6 +59,10 @@ API documentation for %{name}. %patch0 -b .sav cp -p %{SOURCE1} . +# migrate to maven 3 +%pom_xpath_set pom:prerequisites/pom:maven 3.8.6 +%pom_change_dep :maven-project :maven-core + %build %{mvn_build} -f -- \ %if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} From e5d0805f4d64bf5a60bd1394e7dd28e67c827b66e606c70cd33980ff1fe307cd Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 25 Sep 2023 09:36:57 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/javacc-maven-plugin?expand=0&rev=8 --- javacc-maven-plugin.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/javacc-maven-plugin.changes b/javacc-maven-plugin.changes index 63a1997..6d1df18 100644 --- a/javacc-maven-plugin.changes +++ b/javacc-maven-plugin.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 25 09:36:52 UTC 2023 - Fridrich Strba + +- Remove dependency on maven2 + ------------------------------------------------------------------- Tue Mar 22 12:22:49 UTC 2022 - Fridrich Strba