diff --git a/tomcat-9.0-log4j.properties b/tomcat-9.0-log4j.properties deleted file mode 100644 index c136eec..0000000 --- a/tomcat-9.0-log4j.properties +++ /dev/null @@ -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 diff --git a/tomcat.changes b/tomcat.changes index d286aae..ff0c9b6 100644 --- a/tomcat.changes +++ b/tomcat.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 23 11:57:30 UTC 2022 - Fridrich Strba + +- Remove dependency on log4j/reload4j completely (bsc#1196137) + ------------------------------------------------------------------- Tue Feb 22 19:00:25 UTC 2022 - Fridrich Strba diff --git a/tomcat.spec b/tomcat.spec index d3fed2c..e959933 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -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 @@ -109,7 +108,6 @@ BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local BuildRequires: junit BuildRequires: pkgconfig -BuildRequires: reload4j BuildRequires: sed BuildRequires: systemd-rpm-macros BuildRequires: unzip @@ -122,7 +120,6 @@ Requires: apache-commons-dbcp Requires: apache-commons-logging Requires: apache-commons-pool2 Requires: java >= 1.8 -Requires: reload4j 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 reload4j/reload4j) log4j.jar ln -s $(build-classpath ecj/ecj) jasper-jdt.jar # Temporary copy the juli jar here from %%{_datadir}/java/tomcat (for maven depmap)