From 3cd17ee99231178e0bf56d56139613440c7b783f578334b1904e6b5f02485edf Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 22 Mar 2022 13:18:40 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/maven-jar-plugin?expand=0&rev=22

---
 maven-jar-plugin-build.xml |  2 +-
 maven-jar-plugin.changes   |  5 +++++
 maven-jar-plugin.spec      | 29 +++++++++++++++--------------
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/maven-jar-plugin-build.xml b/maven-jar-plugin-build.xml
index c808698..3399c56 100644
--- a/maven-jar-plugin-build.xml
+++ b/maven-jar-plugin-build.xml
@@ -19,7 +19,7 @@
 
   <property name="spec.version" value="3.2"/>
 
-  <property name="compiler.source" value="1.6"/>
+  <property name="compiler.source" value="1.8"/>
   <property name="compiler.target" value="${compiler.source}"/>
 
   <property name="build.finalName" value="${project.artifactId}-${project.version}"/>
diff --git a/maven-jar-plugin.changes b/maven-jar-plugin.changes
index d780c94..80fd3bd 100644
--- a/maven-jar-plugin.changes
+++ b/maven-jar-plugin.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Mar 22 13:18:12 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Build with java source and target levels 8
+
 -------------------------------------------------------------------
 Mon Nov 25 17:28:29 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/maven-jar-plugin.spec b/maven-jar-plugin.spec
index 625d6cb..8cb4d05 100644
--- a/maven-jar-plugin.spec
+++ b/maven-jar-plugin.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package maven-jar-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
@@ -34,6 +34,7 @@ Source1:        %{base_name}-build.xml
 Patch0:         %{base_name}-bootstrap-resources.patch
 Patch1:         01-allow-replacing-artifacts.patch
 BuildRequires:  fdupes
+BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-local
 BuildRequires:  maven-archiver >= 3.5.0
 BuildRequires:  maven-file-management
@@ -95,23 +96,23 @@ cp %{SOURCE1} build.xml
 %if %{with bootstrap}
 mkdir -p lib
 build-jar-repository -s lib \
-	maven-file-management/file-management \
-	maven-archiver/maven-archiver \
-	maven/maven-artifact \
-	maven/maven-core \
-	maven/maven-plugin-api \
-	maven-plugin-tools/maven-plugin-annotations \
-	org.eclipse.sisu.plexus \
-	plexus/archiver \
-	plexus/utils
+    maven-file-management/file-management \
+    maven-archiver/maven-archiver \
+    maven/maven-artifact \
+    maven/maven-core \
+    maven/maven-plugin-api \
+    maven-plugin-tools/maven-plugin-annotations \
+    org.eclipse.sisu.plexus \
+    plexus/archiver \
+    plexus/utils
 %{ant} -Dtest.skip=true jar
 %else
 xmvn --batch-mode --offline \
-	-Dmaven.test.skip=true -DmavenVersion=3.1.1 \
+    -Dmaven.test.skip=true -DmavenVersion=3.1.1 \
 %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