From 83b15330f050493b1d8014786167bcd968725c41 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Wed, 25 Apr 2018 15:44:06 +0200 Subject: [PATCH] Remove log4j from jp_minimal build --- netty.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/netty.spec b/netty.spec index d5e4838..c48d9f0 100644 --- a/netty.spec +++ b/netty.spec @@ -7,7 +7,7 @@ Name: netty Version: 4.1.13 -Release: 4%{?dist} +Release: 5%{?dist} Summary: An asynchronous event-driven network application framework and tools for Java License: ASL 2.0 URL: https://netty.io/ @@ -28,7 +28,6 @@ BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(kr.motd.maven:os-maven-plugin) BuildRequires: mvn(log4j:log4j:1.2.17) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.apache.logging.log4j:log4j-api) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) @@ -46,6 +45,7 @@ BuildRequires: mvn(com.google.protobuf.nano:protobuf-javanano) BuildRequires: mvn(com.google.protobuf:protobuf-java) BuildRequires: mvn(com.ning:compress-lzf) BuildRequires: mvn(net.jpountz.lz4:lz4) +BuildRequires: mvn(org.apache.logging.log4j:log4j-api) BuildRequires: mvn(org.bouncycastle:bcpkix-jdk15on) BuildRequires: mvn(org.jboss.marshalling:jboss-marshalling) BuildRequires: mvn(org.eclipse.jetty.alpn:alpn-api) @@ -159,6 +159,8 @@ rm codec/src/*/java/io/netty/handler/codec/compression/Lzma*.java rm codec/src/*/java/io/netty/handler/codec/compression/Lzf*.java %pom_remove_dep -r net.jpountz.lz4:lz4 rm codec/src/*/java/io/netty/handler/codec/compression/Lz4*.java +%pom_remove_dep -r org.apache.logging.log4j: +rm common/*/main/java/io/netty/util/internal/logging/Log4J2*.java %endif # jp_minimal @@ -191,6 +193,9 @@ export CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" %doc LICENSE.txt NOTICE.txt %changelog +* Wed Apr 25 2018 Michael Simacek - 4.1.13-5 +- Remove log4j from jp_minimal build + * Tue Apr 24 2018 mskalick@redhat.com - 4.1.13-4 - Remove org.eclipse.jetty.alpn dependency for jp_minimal