Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package jetty-minimal for openSUSE:Factory checked in at 2022-03-22 19:41:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jetty-minimal (Old) and /work/SRC/openSUSE:Factory/.jetty-minimal.new.25692 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jetty-minimal" Tue Mar 22 19:41:08 2022 rev:13 rq:963998 version:9.4.43 Changes: -------- --- /work/SRC/openSUSE:Factory/jetty-minimal/jetty-minimal.changes 2021-10-19 23:04:11.113282698 +0200 +++ /work/SRC/openSUSE:Factory/.jetty-minimal.new.25692/jetty-minimal.changes 2022-03-22 19:41:24.899166368 +0100 @@ -1,0 +2,6 @@ +Tue Mar 22 15:49:28 UTC 2022 - Fridrich Strba <[email protected]> + +- Build with java source and target levels 8 +- Fix javadoc generation on JDK >= 13 + +------------------------------------------------------------------- jetty-unixsocket.changes: same change jetty-websocket.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jetty-minimal.spec ++++++ --- /var/tmp/diff_new_pack.PLrw3Q/_old 2022-03-22 19:41:25.895167413 +0100 +++ /var/tmp/diff_new_pack.PLrw3Q/_new 2022-03-22 19:41:25.903167422 +0100 @@ -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 @@ 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 @@ %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 @@ # 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 ++++++ jetty-unixsocket.spec ++++++ --- /var/tmp/diff_new_pack.PLrw3Q/_old 2022-03-22 19:41:25.927167447 +0100 +++ /var/tmp/diff_new_pack.PLrw3Q/_new 2022-03-22 19:41:25.931167452 +0100 @@ -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 @@ 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 @@ %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 @@ %{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 ++++++ jetty-websocket.spec ++++++ --- /var/tmp/diff_new_pack.PLrw3Q/_old 2022-03-22 19:41:25.955167476 +0100 +++ /var/tmp/diff_new_pack.PLrw3Q/_new 2022-03-22 19:41:25.959167480 +0100 @@ -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 @@ 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 @@ %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 @@ # 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
