From d625f17083456d87b2a434c4254f093e01f22274b7cb17a5956a4f959dc7ce2d Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 22 Mar 2022 15:50:28 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/jetty-minimal?expand=0&rev=45

---
 jetty-minimal.changes    |  6 ++++++
 jetty-minimal.spec       | 11 +++++++++--
 jetty-unixsocket.changes |  6 ++++++
 jetty-unixsocket.spec    | 11 +++++++++--
 jetty-websocket.changes  |  6 ++++++
 jetty-websocket.spec     | 11 +++++++++--
 6 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/jetty-minimal.changes b/jetty-minimal.changes
index 37f5073..5cd38e9 100644
--- a/jetty-minimal.changes
+++ b/jetty-minimal.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Mar 22 15:49:28 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Build with java source and target levels 8
+- Fix javadoc generation on JDK >= 13
+
 -------------------------------------------------------------------
 Tue Oct 19 07:13:12 UTC 2021 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/jetty-minimal.spec b/jetty-minimal.spec
index 07f4ab9..dc79909 100644
--- a/jetty-minimal.spec
+++ b/jetty-minimal.spec
@@ -1,7 +1,7 @@
 #
 # spec file
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 # Copyright (c) 2000-2007, JPackage Project
 #
 # All modifications and additions to the file contributed by third parties
@@ -29,6 +29,7 @@ Group:          Productivity/Networking/Web/Servers
 URL:            https://www.eclipse.org/jetty/
 Source0:        https://github.com/eclipse/%{base_name}.project/archive/%{base_name}-%{version}%{addver}.tar.gz#/%{src_name}.tar.gz
 BuildRequires:  fdupes
+BuildRequires:  java-devel >= 1.8
 BuildRequires:  maven-local
 BuildRequires:  mvn(javax.annotation:javax.annotation-api)
 BuildRequires:  mvn(javax.servlet:javax.servlet-api)
@@ -395,6 +396,8 @@ sed -i '/<SystemProperty name="jetty.state"/d' \
 %pom_disable_module jetty-alpn
 %pom_disable_module jetty-home
 
+%pom_xpath_remove "pom:plugins/pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:configuration/pom:additionalJOption"
+
 %{mvn_file} :{*} %{base_name}/@1
 
 %build
@@ -429,7 +432,11 @@ sed -i '/<SystemProperty name="jetty.state"/d' \
 
 # we don't have all necessary dependencies to run tests
 # missing test dep: org.eclipse.jetty.toolchain:jetty-perf-helper
-%{mvn_build} -f -s
+%{mvn_build} -f -s -- \
+%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
+    -Dmaven.compiler.release=8 \
+%endif
+    -Dsource=8
 
 %install
 %mvn_install
diff --git a/jetty-unixsocket.changes b/jetty-unixsocket.changes
index 24962c6..b9232aa 100644
--- a/jetty-unixsocket.changes
+++ b/jetty-unixsocket.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Mar 22 15:49:28 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Build with java source and target levels 8
+- Fix javadoc generation on JDK >= 13
+
 -------------------------------------------------------------------
 Tue Oct 19 07:13:12 UTC 2021 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/jetty-unixsocket.spec b/jetty-unixsocket.spec
index 15a793e..d46783e 100644
--- a/jetty-unixsocket.spec
+++ b/jetty-unixsocket.spec
@@ -1,7 +1,7 @@
 #
 # spec file
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 # Copyright (c) 2000-2007, JPackage Project
 #
 # All modifications and additions to the file contributed by third parties
@@ -28,6 +28,7 @@ License:        Apache-2.0 OR EPL-1.0
 URL:            https://www.eclipse.org/jetty/
 Source0:        https://github.com/eclipse/%{base_name}.project/archive/%{base_name}-%{version}%{addver}.tar.gz#/%{src_name}.tar.gz
 BuildRequires:  fdupes
+BuildRequires:  java-devel >= 1.8
 BuildRequires:  maven-local
 BuildRequires:  mvn(com.github.jnr:jnr-unixsocket)
 BuildRequires:  mvn(org.apache.ant:ant)
@@ -214,6 +215,8 @@ sed -i '/<SystemProperty name="jetty.state"/d' \
 %pom_disable_module jetty-xml
 %pom_disable_module jetty-webapp
 
+%pom_xpath_remove "pom:plugins/pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:configuration/pom:additionalJOption"
+
 %{mvn_file} :{*} %{base_name}/@1
 
 %build
@@ -238,7 +241,11 @@ sed -i '/<SystemProperty name="jetty.state"/d' \
 %{mvn_package} :jetty-runner __noinstall
 %{mvn_package} :build-resources __noinstall
 
-%{mvn_build} -f
+%{mvn_build} -f -- \
+%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
+    -Dmaven.compiler.release=8 \
+%endif
+    -Dsource=8
 
 %install
 %mvn_install
diff --git a/jetty-websocket.changes b/jetty-websocket.changes
index 2a0961c..dafbb6e 100644
--- a/jetty-websocket.changes
+++ b/jetty-websocket.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Mar 22 15:49:28 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Build with java source and target levels 8
+- Fix javadoc generation on JDK >= 13
+
 -------------------------------------------------------------------
 Tue Oct 19 07:13:12 UTC 2021 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/jetty-websocket.spec b/jetty-websocket.spec
index 5c48288..5bacd39 100644
--- a/jetty-websocket.spec
+++ b/jetty-websocket.spec
@@ -1,7 +1,7 @@
 #
 # spec file
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 # Copyright (c) 2000-2007, JPackage Project
 #
 # All modifications and additions to the file contributed by third parties
@@ -28,6 +28,7 @@ License:        Apache-2.0 OR EPL-1.0
 URL:            https://www.eclipse.org/jetty/
 Source0:        https://github.com/eclipse/%{base_name}.project/archive/%{base_name}-%{version}%{addver}.tar.gz#/%{src_name}.tar.gz
 BuildRequires:  fdupes
+BuildRequires:  java-devel >= 1.8
 # Multiple providers, chose the 1.0 one over 1.1, since
 # the relevant artifacts assume the API version 1.0
 BuildRequires:  jboss-websocket-1.0-api
@@ -267,6 +268,8 @@ sed -i '/<SystemProperty name="jetty.state"/d' \
 %pom_disable_module jetty-xml
 %pom_disable_module jetty-webapp
 
+%pom_xpath_remove "pom:plugins/pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:configuration/pom:additionalJOption"
+
 %{mvn_file} :{*} %{base_name}/@1
 
 %build
@@ -301,7 +304,11 @@ sed -i '/<SystemProperty name="jetty.state"/d' \
 
 # we don't have all necessary dependencies to run tests
 # missing test dep: org.eclipse.jetty.toolchain:jetty-perf-helper
-%{mvn_build} -f -s
+%{mvn_build} -f -s -- \
+%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
+    -Dmaven.compiler.release=8 \
+%endif
+    -Dsource=8
 
 %install
 %mvn_install