Accepting request 1147955 from Java:packages

OBS-URL: https://build.opensuse.org/request/show/1147955
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache-chainsaw?expand=0&rev=5

apache-chainsaw.changes

@@ -1,7 +1,23 @@
 -------------------------------------------------------------------
-Tue Feb 22 18:04:26 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+Tue Feb 20 11:06:12 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
 
-- Do not build against the log4j12 packages
+- Use %autosetup macro. Allows to eliminate the usage of deprecated
+  %patchN.
+
+-------------------------------------------------------------------
+Thu Oct 26 11:25:01 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Build with source and target levels 9
+
+-------------------------------------------------------------------
+Mon Mar 21 05:41:30 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Fix build with maven-antrun-plugin >= 3.0.0
+
+-------------------------------------------------------------------
+Tue Feb 22 19:20:37 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Do not build against the log4j12 packages, use the new reload4j
 
 -------------------------------------------------------------------
 Wed Jan 19 23:09:12 UTC 2022 - Fridrich Strba <fstrba@suse.com>

apache-chainsaw.spec

@@ -1,7 +1,7 @@
 #
 # spec file
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -30,7 +30,7 @@ Source1:        %{name}.png
 Source2:        %{name}.desktop
 Patch0:         %{name}-xstream.patch
 BuildRequires:  fdupes
-BuildRequires:  java-devel >= 1.8
+BuildRequires:  java-devel >= 9
 BuildRequires:  javapackages-tools
 BuildRequires:  maven-local
 BuildRequires:  update-desktop-files
@@ -53,7 +53,7 @@ Requires:       apache-log4j-extras
 Requires:       javapackages-tools
 Requires:       jmdns
 Requires:       jsch
-Requires:       log4j12
+Requires:       reload4j
 Requires:       slf4j
 Requires:       xpp3
 Requires:       xpp3-minimal
@@ -74,8 +74,7 @@ Group:          Documentation/HTML
 %{summary}.
 
 %prep
-%setup -q
-%patch0 -p1
+%autosetup -p1
 
 %pom_remove_plugin :maven-source-plugin
 %pom_remove_plugin :appassembler-maven-plugin
@@ -92,18 +91,22 @@ perl -pi -e 's#org\.apache\.commons\.vfs\.#org\.apache\.commons\.vfs2\.#g' \
 %pom_remove_dep org.projectlombok:lombok
 
 # point chainsaw to our installed Javadoc
-perl -pi -e 's#\"docs/api\"#\"%{_javadocdir}/%{name}\"#g' \
+sed -i -e 's#\"docs/api\"#\"%{_javadocdir}/%{name}\"#g' \
   src/main/java/org/apache/log4j/chainsaw/help/HelpManager.java
 
+%if %{?pkg_vcmp:%pkg_vcmp maven-antrun-plugin >= 3}%{!?pkg_vcmp:0}
+sed -i -e 's#tasks\>#target\>#g' pom.xml
+%endif
+
 %build
-%{mvn_build} -f -- -Dsource=8
+%{mvn_build} -f -- -Dmaven.compiler.release=9 -Dsource=9
 
 %install
 %mvn_install
 %fdupes -s %{buildroot}%{_javadocdir}
 
 # apache-chainsaw has to be the first in order to avoid name classes in apache-log4j-extras
-%jpackage_script org.apache.log4j.chainsaw.LogUI "" "" apache-chainsaw:apache-log4j-extras:log4j12:jmdns:slf4j/api:xstream:xpp3:xpp3-minimal:commons-vfs2:commons-logging:jsch %{short_name} true
+%jpackage_script org.apache.log4j.chainsaw.LogUI "" "" apache-chainsaw:apache-log4j-extras:reload4j:jmdns:slf4j/api:xstream:xpp3:xpp3-minimal:commons-vfs2:commons-logging:jsch %{short_name} true
 
 # freedesktop.org menu entries and icons
 mkdir -p %{buildroot}%{_datadir}/{applications,pixmaps}