1
0
forked from pool/mojo-executor

Accepting request 1120527 from Java:packages

source/target 8 == build with jdk 21

OBS-URL: https://build.opensuse.org/request/show/1120527
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mojo-executor?expand=0&rev=4
This commit is contained in:
Ana Guerrero 2023-10-26 15:14:58 +00:00 committed by Git OBS Bridge
commit ab9aecb834
2 changed files with 11 additions and 4 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Oct 26 10:33:14 UTC 2023 - Fridrich Strba <fstrba@suse.com>
- Build with source and target levels 8
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Dec 4 14:43:21 UTC 2022 - Dirk Müller <dmueller@suse.com> Sun Dec 4 14:43:21 UTC 2022 - Dirk Müller <dmueller@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package mojo-executor # spec file for package mojo-executor
# #
# 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
@ -27,8 +27,8 @@ Source0: https://github.com/mojo-executor/mojo-executor/archive/refs/tags
Source1: http://www.apache.org/licenses/LICENSE-2.0 Source1: http://www.apache.org/licenses/LICENSE-2.0
Patch0: mojo-executor-dependency.patch Patch0: mojo-executor-dependency.patch
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: java-devel >= 1.8
BuildRequires: maven-local BuildRequires: maven-local
BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin)
BuildRequires: mvn(org.apache.maven:maven-core) 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)
@ -55,15 +55,17 @@ API documentation for %{name}.
cp %{SOURCE1} . cp %{SOURCE1} .
%pom_disable_module %{name}-maven-plugin %pom_disable_module %{name}-maven-plugin
%pom_remove_plugin :jacoco-maven-plugin %pom_remove_plugin :jacoco-maven-plugin
%pom_remove_plugin :maven-enforcer-plugin
perl -pi -e 's#org\.sonatype\.aether\.repository#org.eclipse.aether.repository#g' \ perl -pi -e 's#org\.sonatype\.aether\.repository#org.eclipse.aether.repository#g' \
mojo-executor/src/main/java/org/twdata/maven/mojoexecutor/MavenCompatibilityHelper.java mojo-executor/src/main/java/org/twdata/maven/mojoexecutor/MavenCompatibilityHelper.java
%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=7 -Dmaven.compiler.release=8 \
%endif %endif
-Dsource=8
%install %install
%mvn_install %mvn_install