13
0

3 Commits

2 changed files with 14 additions and 3 deletions

View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Jun 23 14:47:02 UTC 2025 - Fridrich Strba <fstrba@suse.com>
- Fix build with maven 4
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 21 10:50:21 UTC 2024 - Gus Kenion <gus.kenion@suse.com> Wed Feb 21 10:50:21 UTC 2024 - Gus Kenion <gus.kenion@suse.com>

View File

@@ -1,7 +1,7 @@
# #
# spec file for package maven-jlink-plugin # spec file for package maven-jlink-plugin
# #
# Copyright (c) 2024 SUSE LLC # Copyright (c) 2025 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
@@ -35,6 +35,7 @@ BuildRequires: mvn(org.apache.commons:commons-lang3)
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:) BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:)
BuildRequires: mvn(org.apache.maven.shared:maven-shared-utils)
BuildRequires: mvn(org.apache.maven:maven-archiver) BuildRequires: mvn(org.apache.maven:maven-archiver)
BuildRequires: mvn(org.apache.maven:maven-core) BuildRequires: mvn(org.apache.maven:maven-core)
BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.apache.maven:maven-plugin-api)
@@ -57,11 +58,16 @@ API documentation for %{name}.
%setup -q -n %{name}-%{basever}-%{opt}-%{optver} %setup -q -n %{name}-%{basever}-%{opt}-%{optver}
%patch -P 0 -p1 %patch -P 0 -p1
%pom_xpath_remove pom:project/pom:parent/pom:relativePath
%pom_add_dep org.apache.maven:maven-compat:\${mavenVersion}
%pom_add_dep org.apache.maven.shared:maven-shared-utils
%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}
-- -Dmaven.compiler.release=8 -Dmaven.compiler.release=8 \
%endif %endif
-Dsource=8
%install %install
%mvn_install %mvn_install