From e3ed53ff413176bed4101571fc5dc5d066f434a6 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: May 06 2020 06:38:21 +0000
Subject: Update source and target for JDK 11

Add maven-javadoc-plugin configuration for JDK 11

---

diff --git a/jglobus-java-version.patch b/jglobus-java-version.patch
new file mode 100644
index 0000000..6be7c55
--- /dev/null
+++ b/jglobus-java-version.patch
@@ -0,0 +1,28 @@
+diff -ur JGlobus-JGlobus-Release-2.1.0.orig/pom.xml JGlobus-JGlobus-Release-2.1.0/pom.xml
+--- JGlobus-JGlobus-Release-2.1.0.orig/pom.xml	2014-09-26 05:46:02.000000000 +0200
++++ JGlobus-JGlobus-Release-2.1.0/pom.xml	2020-05-06 08:29:31.132328554 +0200
+@@ -66,8 +66,8 @@
+ 				<groupId>org.apache.maven.plugins</groupId>
+ 				<artifactId>maven-compiler-plugin</artifactId>
+ 				<configuration>
+-					<source>1.5</source>
+-					<target>1.5</target>
++					<source>1.6</source>
++					<target>1.6</target>
+ 				</configuration>
+ 			</plugin>
+ 			<plugin>
+@@ -100,6 +100,13 @@
+ 				<artifactId>maven-release-plugin</artifactId>
+ 				<version>2.5</version>
+ 			</plugin>
++			<plugin>
++				<groupId>org.apache.maven.plugins</groupId>
++				<artifactId>maven-javadoc-plugin</artifactId>
++				<configuration>
++					<source>1.6</source>
++				</configuration>
++			</plugin>
+ 		</plugins>
+ 	</build>
+ 	<dependencyManagement>
diff --git a/jglobus.spec b/jglobus.spec
index 1d54f2f..7ca79d3 100644
--- a/jglobus.spec
+++ b/jglobus.spec
@@ -14,7 +14,7 @@
 
 Name:		jglobus
 Version:	2.1.0
-Release:	16%{?dist}
+Release:	17%{?dist}
 Summary:	Globus Java client libraries
 
 #		Everything is Apache 2.0 except for one file that is MIT:
@@ -61,6 +61,9 @@ Patch9:		%{name}-remove-unused-FORCE_SSLV3_AND_CONSTRAIN_CIPHERSUITES.patch
 #		Adapt to changes in bouncycastle 1.61
 #		https://github.com/jglobus/JGlobus/pull/168
 Patch10:	%{name}-adapt-to-changes-in-PrivateKeyInfo-class.patch
+#		Update source and target for JDK 11
+#		Add maven-javadoc-plugin configuration for JDK 11
+Patch11:	%{name}-java-version.patch
 
 BuildArch:	noarch
 
@@ -198,6 +201,7 @@ This package contains the API documentation for %{name}.
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 # Do not package test classes
 %mvn_package org.jglobus:container-test-utils __noinstall
@@ -257,6 +261,10 @@ This package contains the API documentation for %{name}.
 %files javadoc -f .mfiles-javadoc
 
 %changelog
+* Wed May 06 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 2.1.0-17
+- Update source and target for JDK 11
+- Add maven-javadoc-plugin configuration for JDK 11
+
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild