pool/tomcat
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 734299 from Java:packages

Browse Source 
Build against log4j12

OBS-URL: https://build.opensuse.org/request/show/734299
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tomcat?expand=0&rev=56
This commit is contained in:
Dominique Leuenberger 2019-10-03 14:16:04 +00:00 committed by Git OBS Bridge
commit 1d4ced6b8f
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tomcat.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Oct 1 12:29:16 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Build against compatibility log4j12 package
-------------------------------------------------------------------
Wed Sep 25 12:18:29 UTC 2019 - Fridrich Strba <fstrba@suse.com>

6
tomcat.spec
View File

@ -107,7 +107,7 @@ BuildRequires: java-devel >= 1.8.0
BuildRequires: javapackages-local
BuildRequires: javapackages-tools
BuildRequires: junit
BuildRequires: log4j
BuildRequires: log4j12
BuildRequires: sed
BuildRequires: systemd-rpm-macros
BuildRequires: unzip
@ -120,7 +120,7 @@ Requires: apache-commons-dbcp
Requires: apache-commons-logging
Requires: apache-commons-pool2
Requires: java >= 1.8
Requires: log4j
Requires: log4j12
Requires(post): %fillup_prereq
Requires(pre): %{_sbindir}/groupadd
Requires(pre): %{_sbindir}/useradd
@ -444,7 +444,7 @@ pushd %{buildroot}%{libdir}
rm -f commons-dbcp.jar
ln -s $(build-classpath commons-dbcp2) commons-dbcp2.jar
ln -s $(build-classpath commons-pool2) commons-pool2.jar
ln -s $(build-classpath log4j) log4j.jar
ln -s $(build-classpath log4j12/log4j-12) log4j.jar
ln -s $(build-classpath ecj/ecj) jasper-jdt.jar
# Temporary copy the juli jar here from %%{_datadir}/java/tomcat (for maven depmap)