From 6695aa66b980420e833c3a60344426e84b65c96f Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sep 09 2020 21:02:43 +0000 Subject: switch from log4j 1.2 compat package to log4j 1.2 API shim --- diff --git a/xbean.spec b/xbean.spec index 7acb2a7..44dafac 100644 --- a/xbean.spec +++ b/xbean.spec @@ -4,7 +4,7 @@ Name: xbean Summary: Java plugin based web server Version: 4.15 -Release: 5%{?dist} +Release: 6%{?dist} License: ASL 2.0 URL: http://geronimo.apache.org/xbean/ @@ -19,8 +19,8 @@ BuildArch: noarch BuildRequires: maven-local BuildRequires: mvn(commons-logging:commons-logging-api) BuildRequires: mvn(junit:junit) -BuildRequires: mvn(log4j:log4j:1.2.12) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.apache.logging.log4j:log4j-1.2-api) BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) BuildRequires: mvn(org.osgi:osgi.core) BuildRequires: mvn(org.ow2.asm:asm) @@ -68,6 +68,9 @@ rm src/site/site.xml # use osgi-core instead of felix-osgi-core %pom_change_dep -r :org.osgi.core org.osgi:osgi.core +# switch from log4j 1.2 compat package to log4j 1.2 API shim +%pom_change_dep -r log4j:log4j org.apache.logging.log4j:log4j-1.2-api + # Unshade ASM %pom_remove_dep -r :xbean-asm7-shaded %pom_remove_dep -r :xbean-finder-shaded @@ -128,6 +131,9 @@ sed -i '/import com.sun.org.apache.regexp.internal.RE/d' xbean-reflect/src/main/ %changelog +* Wed Sep 09 2020 Fabio Valentini - 4.15-6 +- Switch from log4j 1.2 compat package to log4j 1.2 API shim. + * Wed Jul 29 2020 Mat Booth - 4.15-5 - Remove springframework conditionals, the deps are a long time removed from Fedora and this simplifies the spec a bit