From f7dd25720a9b73a180b611bf8d067880e98b5173a2dcc655b73e6817e52067f0 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 21 Mar 2022 05:42:54 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-chainsaw?expand=0&rev=12 --- apache-chainsaw.changes | 5 +++++ apache-chainsaw.spec | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/apache-chainsaw.changes b/apache-chainsaw.changes index b0bc5f9..988f1ab 100644 --- a/apache-chainsaw.changes +++ b/apache-chainsaw.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 21 05:41:30 UTC 2022 - Fridrich Strba + +- Fix build with maven-antrun-plugin >= 3.0.0 + ------------------------------------------------------------------- Tue Feb 22 19:20:37 UTC 2022 - Fridrich Strba diff --git a/apache-chainsaw.spec b/apache-chainsaw.spec index 551e595..07c7b96 100644 --- a/apache-chainsaw.spec +++ b/apache-chainsaw.spec @@ -92,9 +92,11 @@ 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 +sed -i -e 's#tasks\>#target\>#g' pom.xml + %build %{mvn_build} -f -- -Dsource=8 From e37f8b6fdae565b1550231d87e59229b27a69bf985fcc94187ff11d9d003768b Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 21 Mar 2022 06:43:37 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-chainsaw?expand=0&rev=13 --- apache-chainsaw.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apache-chainsaw.spec b/apache-chainsaw.spec index 07c7b96..270077c 100644 --- a/apache-chainsaw.spec +++ b/apache-chainsaw.spec @@ -95,7 +95,9 @@ perl -pi -e 's#org\.apache\.commons\.vfs\.#org\.apache\.commons\.vfs2\.#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