From 653783e3ee382a333e5dd95f0fa59bfbaeacf1d17eb03e058ff53d60f5140fdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 21 Feb 2015 08:36:32 +0000 Subject: [PATCH 1/2] Accepting request 286997 from home:dmacvicar:branches:Java:packages - add the log4j adapter to commons-logging-adapters (bnc#918852) OBS-URL: https://build.opensuse.org/request/show/286997 OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-logging?expand=0&rev=18 --- apache-commons-logging.changes | 6 ++++++ apache-commons-logging.spec | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/apache-commons-logging.changes b/apache-commons-logging.changes index b7d82ea..57437da 100644 --- a/apache-commons-logging.changes +++ b/apache-commons-logging.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 20 15:14:30 UTC 2015 - dmacvicar@suse.de + +- add the log4j adapter to commons-logging-adapters + (bnc#918852) + ------------------------------------------------------------------- Tue Aug 12 11:10:06 UTC 2014 - lnussel@suse.de diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 0cc7dfa..7c2829e 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -1,7 +1,7 @@ # # spec file for package apache-commons-logging # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2000-2007, JPackage Project # All rights reserved. # @@ -48,6 +48,7 @@ BuildRequires: maven-plugin-build-helper BuildRequires: maven-site-plugin %endif BuildRequires: gpg-offline +BuildRequires: log4j >= 1.2 BuildRequires: servletapi5 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -113,7 +114,7 @@ export CLASSPATH=$(build-classpath \ plexus/ \ junit \ ):target/classes:target/test-classes -ant -Dmaven.mode.offline=true dist \ +ant -Dmaven.mode.offline=true -Dlog4j12.jar=%{_javadir}/log4j.jar dist \ -lib %{_javadir} %endif From fcb4c60c285e274a589f482ea25bf3444580081be3f35b0b6c3442f97a288601 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 4 Mar 2015 10:31:27 +0000 Subject: [PATCH 2/2] - Use log4j-mini to hopefully avoid build-cycle OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-logging?expand=0&rev=19 --- apache-commons-logging.changes | 5 +++++ apache-commons-logging.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/apache-commons-logging.changes b/apache-commons-logging.changes index 57437da..7433e2f 100644 --- a/apache-commons-logging.changes +++ b/apache-commons-logging.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 4 10:31:13 UTC 2015 - tchvatal@suse.com + +- Use log4j-mini to hopefully avoid build-cycle + ------------------------------------------------------------------- Fri Feb 20 15:14:30 UTC 2015 - dmacvicar@suse.de diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 7c2829e..586d8dd 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -48,7 +48,7 @@ BuildRequires: maven-plugin-build-helper BuildRequires: maven-site-plugin %endif BuildRequires: gpg-offline -BuildRequires: log4j >= 1.2 +BuildRequires: log4j-mini >= 1.2 BuildRequires: servletapi5 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build