From 9056a92b517db9e50323b75cd41019a5beb21ee1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 15 May 2020 08:00:35 +0200 Subject: [PATCH] Disable Log4j bindings --- slf4j.spec | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/slf4j.spec b/slf4j.spec index ce59695..9b3d91a 100644 --- a/slf4j.spec +++ b/slf4j.spec @@ -41,7 +41,6 @@ BuildArch: noarch BuildRequires: maven-local-openjdk8 BuildRequires: mvn(commons-logging:commons-logging) -BuildRequires: mvn(log4j:log4j:1.2.17) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) @@ -73,12 +72,6 @@ Summary: SLF4J JDK14 Binding %description jdk14 SLF4J JDK14 Binding. -%package log4j12 -Summary: SLF4J LOG4J-12 Binding - -%description log4j12 -SLF4J LOG4J-12 Binding. - %package jcl Summary: SLF4J JCL Binding @@ -91,12 +84,6 @@ Summary: JCL 1.1.1 implemented over SLF4J %description -n %{?module_prefix}jcl-over-slf4j JCL 1.1.1 implemented over SLF4J. -%package -n log4j-over-slf4j -Summary: Log4j implemented over SLF4J - -%description -n log4j-over-slf4j -Log4j implemented over SLF4J. - %package -n jul-to-slf4j Summary: JUL to SLF4J bridge @@ -116,8 +103,10 @@ install -m 0644 %{SOURCE1} APACHE-LICENSE %pom_disable_module integration %pom_disable_module osgi-over-slf4j +%pom_disable_module log4j-over-slf4j %pom_disable_module slf4j-android %pom_disable_module slf4j-ext +%pom_disable_module slf4j-log4j12 %pom_disable_module slf4j-migrator # Because of a non-ASCII comment in slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java @@ -182,10 +171,8 @@ cp -pr target/site/* $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-manual %license LICENSE.txt APACHE-LICENSE %files jdk14 -f .mfiles-%{name}-jdk14 -%files log4j12 -f .mfiles-%{name}-log4j12 %files jcl -f .mfiles-%{name}-jcl %files -n %{?module_prefix}jcl-over-slf4j -f .mfiles-jcl-over-slf4j -%files -n log4j-over-slf4j -f .mfiles-log4j-over-slf4j %files -n jul-to-slf4j -f .mfiles-jul-to-slf4j %files sources -f .mfiles-sources