From 89a3a7cf2f11694d0c0583e8c48cf8c29c7152343ee48e5e92a754f580e6ce94 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 22 Feb 2022 18:04:59 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-chainsaw?expand=0&rev=9 --- apache-chainsaw.changes | 5 +++++ apache-chainsaw.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/apache-chainsaw.changes b/apache-chainsaw.changes index 736d0f5..db954db 100644 --- a/apache-chainsaw.changes +++ b/apache-chainsaw.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 22 18:04:26 UTC 2022 - Fridrich Strba + +- Do not build against the log4j12 packages + ------------------------------------------------------------------- Wed Jan 19 23:09:12 UTC 2022 - Fridrich Strba diff --git a/apache-chainsaw.spec b/apache-chainsaw.spec index e474439..fcea919 100644 --- a/apache-chainsaw.spec +++ b/apache-chainsaw.spec @@ -1,5 +1,5 @@ # -# spec file for package apache-chainsaw +# spec file # # Copyright (c) 2022 SUSE LLC # @@ -33,20 +33,20 @@ BuildRequires: fdupes BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-tools BuildRequires: maven-local +BuildRequires: update-desktop-files BuildRequires: mvn(ant-contrib:ant-contrib) BuildRequires: mvn(com.jcraft:jsch) BuildRequires: mvn(com.thoughtworks.xstream:xstream) BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(javax.jmdns:jmdns) BuildRequires: mvn(log4j:apache-log4j-extras) -BuildRequires: mvn(log4j:log4j:1.2.16) +BuildRequires: mvn(log4j:log4j) BuildRequires: mvn(org.apache.ant:ant) BuildRequires: mvn(org.apache.commons:commons-vfs2) BuildRequires: mvn(org.apache.geronimo.specs:geronimo-jms_1.1_spec) BuildRequires: mvn(org.apache.logging:logging-parent:pom:) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) -BuildRequires: update-desktop-files Requires: apache-commons-logging Requires: apache-commons-vfs2 Requires: apache-log4j-extras From 86cc1b1808aa8163e810f672cdc469e4cc3ab2007c965da3fb0fbf16b7e0426a Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 22 Feb 2022 19:21:06 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-chainsaw?expand=0&rev=10 --- apache-chainsaw.changes | 5 +++++ apache-chainsaw.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/apache-chainsaw.changes b/apache-chainsaw.changes index db954db..5c4c9d6 100644 --- a/apache-chainsaw.changes +++ b/apache-chainsaw.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 22 19:20:37 UTC 2022 - Fridrich Strba + +- Do not build against the log4j12 packages, use the new reload4j + ------------------------------------------------------------------- Tue Feb 22 18:04:26 UTC 2022 - Fridrich Strba diff --git a/apache-chainsaw.spec b/apache-chainsaw.spec index fcea919..551e595 100644 --- a/apache-chainsaw.spec +++ b/apache-chainsaw.spec @@ -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 @@ -103,7 +103,7 @@ perl -pi -e 's#\"docs/api\"#\"%{_javadocdir}/%{name}\"#g' \ %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} From c91d8a76f5ca901854a977c091d0ae092ee6f2f400e2df4179daf97d60f4d117 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 23 Feb 2022 12:09:26 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-chainsaw?expand=0&rev=11 --- apache-chainsaw.changes | 5 ----- 1 file changed, 5 deletions(-) diff --git a/apache-chainsaw.changes b/apache-chainsaw.changes index 5c4c9d6..b0bc5f9 100644 --- a/apache-chainsaw.changes +++ b/apache-chainsaw.changes @@ -3,11 +3,6 @@ Tue Feb 22 19:20:37 UTC 2022 - Fridrich Strba - Do not build against the log4j12 packages, use the new reload4j -------------------------------------------------------------------- -Tue Feb 22 18:04:26 UTC 2022 - Fridrich Strba - -- Do not build against the log4j12 packages - ------------------------------------------------------------------- Wed Jan 19 23:09:12 UTC 2022 - Fridrich Strba