From e1d3f5f223ccbbc02654f1208c6a1ff385e6bd3acdef7901874c9a636d7da203 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Sun, 10 Nov 2019 06:13:00 +0000
Subject: [PATCH 1/4] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/antlr3?expand=0&rev=12

---
 antlr3.spec | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/antlr3.spec b/antlr3.spec
index 1904513..69bf07f 100644
--- a/antlr3.spec
+++ b/antlr3.spec
@@ -32,8 +32,6 @@
 %endif
 Version:        %{antlr_version}
 Release:        0
-License:        BSD-3-Clause
-Group:          Development/Libraries/Java
 URL:            https://www.antlr3.org/
 Source0:        https://github.com/antlr/antlr3/archive/%{antlr_version}.tar.gz
 Patch0:         0001-java8-fix.patch
@@ -42,15 +40,17 @@ Patch1:         osgi-manifest.patch
 Patch100:       antlr3-generated_sources.patch
 BuildRequires:  fdupes
 BuildRequires:  maven-local
+BuildRequires:  unzip
 BuildRequires:  mvn(antlr:antlr)
 BuildRequires:  mvn(org.antlr:stringtemplate)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.sonatype.oss:oss-parent:pom:)
-BuildRequires:  unzip
 BuildArch:      noarch
 %if %{with runtime}
 Name:           antlr3-java
 Summary:        Java run-time support for ANTLR-generated parsers
+License:        BSD-3-Clause
+Group:          Development/Libraries/Java
 
 %description
 Java run-time support for ANTLR-generated parsers
@@ -58,6 +58,9 @@ Java run-time support for ANTLR-generated parsers
 %else
 
 Summary:        ANother Tool for Language Recognition
+License:        BSD-3-Clause
+Group:          Development/Libraries/Java
+BuildRequires:  unzip
 BuildRequires:  mvn(org.antlr:ST4)
 BuildRequires:  mvn(org.antlr:antlr-runtime)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
@@ -65,7 +68,6 @@ BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
 BuildRequires:  mvn(org.apache.maven:maven-project)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-compiler-api)
 BuildRequires:  mvn(xerces:dom3-xml-apis)
-BuildRequires:  unzip
 
 %if %{with bootstrap}
 Name:           antlr3-bootstrap

From a143b14c8199e12d3d6a67750db0fd0642f63db61ec8ae8b5d48521890de2f55 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 22 Nov 2019 09:11:26 +0000
Subject: [PATCH 2/4] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/antlr3?expand=0&rev=13

---
 antlr3.spec | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/antlr3.spec b/antlr3.spec
index 69bf07f..ebe35c6 100644
--- a/antlr3.spec
+++ b/antlr3.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package antlr3
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -172,11 +172,11 @@ sed -i 's/jsr14/1.6/' antlr3-maven-archetype/src/main/resources/archetype-resour
 %{mvn_file} :antlr-maven-plugin antlr3-maven-plugin
 
 %build
+%{mvn_build} -f \
 %if %{with bootstrap}
-%{mvn_build} -f -j
-%else
-%{mvn_build} -f
+	-j \
 %endif
+	-- -Dmaven.compiler.release=6
 
 %if %{without runtime} &&  %{without bootstrap}
 

From 47f975a5d0c8b0067e2120ddbdadd60a35b1ebf2963b8320f5e8e9a1a0e9e173 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 22 Nov 2019 14:34:57 +0000
Subject: [PATCH 3/4] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/antlr3?expand=0&rev=14

---
 antlr3.spec | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/antlr3.spec b/antlr3.spec
index ebe35c6..f905748 100644
--- a/antlr3.spec
+++ b/antlr3.spec
@@ -176,7 +176,9 @@ sed -i 's/jsr14/1.6/' antlr3-maven-archetype/src/main/resources/archetype-resour
 %if %{with bootstrap}
 	-j \
 %endif
+%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
 	-- -Dmaven.compiler.release=6
+%endif
 
 %if %{without runtime} &&  %{without bootstrap}
 

From 000ea510f74b4d7409097c799cded89a23ee768dbbd59c291a8d8e64950dc852 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Sun, 24 Nov 2019 11:37:10 +0000
Subject: [PATCH 4/4] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/antlr3?expand=0&rev=15

---
 antlr3.changes | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/antlr3.changes b/antlr3.changes
index d3d7b84..ac23797 100644
--- a/antlr3.changes
+++ b/antlr3.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Nov 24 11:36:43 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Specify maven.compiler.release to fix build with jdk9+ and newer
+  maven-javadoc-plugin
+
 -------------------------------------------------------------------
 Thu Sep 12 07:57:47 UTC 2019 - Fridrich Strba <fstrba@suse.com>