From 1514820e2377a120e66c18f55af073e681f6c48cfc34d214a62ccdc435b4b730 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 26 Oct 2023 10:33:22 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/mojo-executor?expand=0&rev=10 --- mojo-executor.changes | 5 +++++ mojo-executor.spec | 10 ++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/mojo-executor.changes b/mojo-executor.changes index 7c17c81..85e68eb 100644 --- a/mojo-executor.changes +++ b/mojo-executor.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 26 10:33:14 UTC 2023 - Fridrich Strba + +- Build with source and target levels 8 + ------------------------------------------------------------------- Sun Dec 4 14:43:21 UTC 2022 - Dirk Müller diff --git a/mojo-executor.spec b/mojo-executor.spec index 950d6bf..be9d52c 100644 --- a/mojo-executor.spec +++ b/mojo-executor.spec @@ -1,7 +1,7 @@ # # 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 # 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 Patch0: mojo-executor-dependency.patch BuildRequires: fdupes +BuildRequires: java-devel >= 1.8 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-model) BuildRequires: mvn(org.apache.maven:maven-plugin-api) @@ -55,15 +55,17 @@ API documentation for %{name}. cp %{SOURCE1} . %pom_disable_module %{name}-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' \ mojo-executor/src/main/java/org/twdata/maven/mojoexecutor/MavenCompatibilityHelper.java %build -%mvn_build -f \ +%{mvn_build} -f -- \ %if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} - -- -Dmaven.compiler.release=7 + -Dmaven.compiler.release=8 \ %endif + -Dsource=8 %install %mvn_install