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

Accepting request 957023 from Java:packages

Browse Source 
bsc#1196137

OBS-URL: https://build.opensuse.org/request/show/957023
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tomcat?expand=0&rev=82
This commit is contained in:
Dominique Leuenberger 2022-02-23 18:06:49 +00:00 committed by Git OBS Bridge
commit e9c006bd2f
3 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tomcat-9.0-log4j.properties
View File

@ -1,11 +0,0 @@
log4j.rootLogger=debug, R
log4j.appender.R=org.apache.log4j.RollingFileAppender
log4j.appender.R.File=${catalina.home}/logs/tomcat.log
log4j.appender.R.MaxFileSize=10MB
log4j.appender.R.MaxBackupIndex=10
log4j.appender.R.layout=org.apache.log4j.PatternLayout
log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n
log4j.logger.org.apache.catalina=DEBUG, R
log4j.logger.org.apache.catalina.core.ContainerBase.[Catalina].[localhost]=DEBUG, R
log4j.logger.org.apache.catalina.core=DEBUG, R
log4j.logger.org.apache.catalina.session=DEBUG, R

10
tomcat.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Feb 23 11:57:30 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Remove dependency on log4j/reload4j completely (bsc#1196137)
-------------------------------------------------------------------
Tue Feb 22 19:00:25 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Do not build against the log4j12 packages, use the new reload4j
-------------------------------------------------------------------
Fri Jan 28 14:01:40 UTC 2022 - Michele Bussolotto <michele.bussolotto@suse.com>

5
tomcat.spec
View File

@ -57,7 +57,6 @@ Source4: %{name}-%{major_version}.%{minor_version}.wrapper
Source5: %{name}-%{major_version}.%{minor_version}.logrotate
Source6: %{name}-%{major_version}.%{minor_version}-digest.script
Source7: %{name}-%{major_version}.%{minor_version}-tool-wrapper.script
Source10: %{name}-%{major_version}.%{minor_version}-log4j.properties
Source11: %{name}-%{major_version}.%{minor_version}.service
Source20: %{name}-%{major_version}.%{minor_version}-jsvc.service
Source21: tomcat-functions
@ -108,7 +107,6 @@ BuildRequires: jakarta-taglibs-standard >= 1.1
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local
BuildRequires: junit
BuildRequires: log4j12
BuildRequires: pkgconfig
BuildRequires: sed
BuildRequires: systemd-rpm-macros
@ -122,7 +120,6 @@ Requires: apache-commons-dbcp
Requires: apache-commons-logging
Requires: apache-commons-pool2
Requires: java >= 1.8
Requires: log4j12
Requires(post): %fillup_prereq
Requires(pre): %{_sbindir}/groupadd
Requires(pre): %{_sbindir}/useradd
@ -366,7 +363,6 @@ install -d -m 0755 %{buildroot}%{_fillupdir}
# First copy supporting libs to tomcat lib
pushd output/build
cp -a bin/*.{jar,xml} %{buildroot}%{bindir}
cp %{SOURCE10} conf/log4j.properties
cp -a conf/*.{policy,properties,xml} %{buildroot}%{confdir}
cp -a lib/*.jar %{buildroot}%{libdir}
cp -a webapps/* %{buildroot}%{tomcatappdir}
@ -445,7 +441,6 @@ 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 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)