From 2fcdb20770a6674e34d96d18750b0b0bc6c3f7efa00cb13d9aea9608829211a4 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 22 Mar 2022 13:45:53 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-resources-plugin?expand=0&rev=14 --- maven-resources-plugin-build.xml | 2 +- maven-resources-plugin.changes | 5 +++++ maven-resources-plugin.spec | 33 ++++++++++++++++---------------- 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/maven-resources-plugin-build.xml b/maven-resources-plugin-build.xml index 70d69bb..b4c9533 100644 --- a/maven-resources-plugin-build.xml +++ b/maven-resources-plugin-build.xml @@ -24,7 +24,7 @@ - + diff --git a/maven-resources-plugin.changes b/maven-resources-plugin.changes index e8ae581..2b6b09b 100644 --- a/maven-resources-plugin.changes +++ b/maven-resources-plugin.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 22 13:44:41 UTC 2022 - Fridrich Strba + +- Build with java source and target levels 8 + ------------------------------------------------------------------- Sun Nov 24 17:47:59 UTC 2019 - Fridrich Strba diff --git a/maven-resources-plugin.spec b/maven-resources-plugin.spec index 3730c89..ed396d2 100644 --- a/maven-resources-plugin.spec +++ b/maven-resources-plugin.spec @@ -1,7 +1,7 @@ # -# spec file for package maven-resources-plugin +# spec file # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,12 +28,13 @@ Release: 0 Summary: Maven Resources Plugin License: Apache-2.0 Group: Development/Libraries/Java -URL: http://maven.apache.org/plugins/maven-resources-plugin -Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{base_name}/%{version}/%{base_name}-%{version}-source-release.zip +URL: https://maven.apache.org/plugins/maven-resources-plugin +Source0: https://repo1.maven.org/maven2/org/apache/maven/plugins/%{base_name}/%{version}/%{base_name}-%{version}-source-release.zip Source1: %{base_name}-build.xml Patch0: %{base_name}-bootstrap-resources.patch BuildRequires: apache-commons-io BuildRequires: fdupes +BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local BuildRequires: maven-filtering BuildRequires: maven-lib @@ -92,23 +93,23 @@ cp %{SOURCE1} build.xml %if %{with bootstrap} mkdir -p lib build-jar-repository -s lib \ - commons-io \ - maven-filtering/maven-filtering \ - maven/maven-core \ - maven/maven-model \ - maven/maven-plugin-api \ - maven-plugin-tools/maven-plugin-annotations \ - org.eclipse.sisu.plexus \ - plexus/interpolation \ - plexus/utils + commons-io \ + maven-filtering/maven-filtering \ + maven/maven-core \ + maven/maven-model \ + maven/maven-plugin-api \ + maven-plugin-tools/maven-plugin-annotations \ + org.eclipse.sisu.plexus \ + plexus/interpolation \ + plexus/utils %{ant} -Dtest.skip=true jar %else xmvn --batch-mode --offline \ - -Dmaven.test.skip=true \ + -Dmaven.test.skip=true \ %if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} - -Dmaven.compiler.release=7 \ + -Dmaven.compiler.release=8 \ %endif - package org.apache.maven.plugins:maven-javadoc-plugin:aggregate + package org.apache.maven.plugins:maven-javadoc-plugin:aggregate %endif %{mvn_artifact} pom.xml target/%{base_name}-%{version}.jar