1
0

Accepting request 1113416 from Java:packages

Remove dependency on maven2

OBS-URL: https://build.opensuse.org/request/show/1113416
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/javacc-maven-plugin?expand=0&rev=3
This commit is contained in:
Ana Guerrero 2023-09-25 18:03:56 +00:00 committed by Git OBS Bridge
commit 65e8024db2
2 changed files with 11 additions and 2 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Sep 25 09:36:52 UTC 2023 - Fridrich Strba <fstrba@suse.com>
- Remove dependency on maven2
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 22 12:22:49 UTC 2022 - Fridrich Strba <fstrba@suse.com> Tue Mar 22 12:22:49 UTC 2022 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package javacc-maven-plugin # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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.plugins:maven-plugin-plugin)
BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api) BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api)
BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-impl) 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-model)
BuildRequires: mvn(org.apache.maven:maven-plugin-api) 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.mojo:mojo-parent:pom:)
BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
BuildArch: noarch BuildArch: noarch
@ -59,6 +59,10 @@ API documentation for %{name}.
%patch0 -b .sav %patch0 -b .sav
cp -p %{SOURCE1} . 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 %build
%{mvn_build} -f -- \ %{mvn_build} -f -- \
%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} %if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}