From 1f6a24a9d73e328e8b80454ef1deb0038deb538f Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber@redhat.com>
Date: Jun 26 2020 19:20:59 +0000
Subject: Set source to 1.8 for Java 11 build.


- Add jakarta.activation-api as a dependency.

Signed-off-by: Roland Grunberg <rgrunber@redhat.com>

---

diff --git a/glassfish-jaxb-api.spec b/glassfish-jaxb-api.spec
index 08130ed..b1caa71 100644
--- a/glassfish-jaxb-api.spec
+++ b/glassfish-jaxb-api.spec
@@ -1,7 +1,7 @@
 %global oname jaxb-api
 Name:          glassfish-jaxb-api
 Version:       2.2.12
-Release:       14%{?dist}
+Release:       15%{?dist}
 Summary:       Java Architecture for XML Binding
 License:       CDDL-1.1 or GPLv2 with exception
 URL:           http://jaxb.java.net/
@@ -14,6 +14,7 @@ Source1:       http://repo1.maven.org/maven2/javax/xml/bind/%{oname}/%{version}/
 
 BuildRequires:  java-javadoc
 BuildRequires:  maven-local
+BuildRequires:  mvn(jakarta.activation:jakarta.activation-api)
 BuildRequires:  mvn(net.java:jvnet-parent:pom:)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 
@@ -49,6 +50,12 @@ mkdir -p src/main/java
 
 cp -p %{SOURCE1} pom.xml
 
+# Set source/target to 1.8 for Java 11 build
+%pom_xpath_set "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:source" "1.8"
+%pom_xpath_set "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:target" "1.8"
+
+%pom_add_dep jakarta.activation:jakarta.activation-api
+
 %pom_remove_plugin org.codehaus.mojo:buildnumber-maven-plugin
 %pom_remove_plugin org.glassfish.copyright:glassfish-copyright-maven-plugin
 %pom_remove_plugin org.glassfish.build:gfnexus-maven-plugin
@@ -63,7 +70,7 @@ sed -i 's|<location>${basedir}/offline-javadoc</location>|<location>%{_javadocdi
 
 %build
 %mvn_file :%{oname} %{oname}
-%mvn_build
+%mvn_build -- -Dsource=1.8
 
 %install
 %mvn_install
@@ -73,6 +80,10 @@ sed -i 's|<location>${basedir}/offline-javadoc</location>|<location>%{_javadocdi
 %files javadoc -f .mfiles-javadoc
 
 %changelog
+* Fri Jun 26 2020 Roland Grunberg <rgrunber@redhat.com> - 2.2.12-15
+- Set source to 1.8 for Java 11 build.
+- Add jakarta.activation-api as a dependency.
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.12-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild