Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/log4j.git#c4207581073a8be50cc84355399a1ed6e4b8eb30
This commit is contained in:
DistroBaker 2021-01-12 11:25:52 +00:00
parent e1232ccfd3
commit f7cc0417a4

View File

@ -2,7 +2,7 @@
Name: log4j
Version: 2.13.3
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Java logging package
BuildArch: noarch
License: ASL 2.0
@ -26,7 +26,7 @@ BuildRequires: mvn(org.apache:apache:pom:)
BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin)
BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
BuildRequires: mvn(org.fusesource.jansi:jansi)
BuildRequires: mvn(org.fusesource.jansi:jansi:1)
BuildRequires: mvn(org.jctools:jctools-core)
BuildRequires: mvn(org.osgi:osgi.core)
BuildRequires: mvn(org.slf4j:slf4j-api)
@ -49,7 +49,7 @@ BuildRequires: mvn(org.apache.tomcat:tomcat-catalina)
BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
BuildRequires: mvn(org.eclipse.jetty:jetty-util)
BuildRequires: mvn(org.eclipse.persistence:javax.persistence)
BuildRequires: mvn(org.fusesource.jansi:jansi)
BuildRequires: mvn(org.fusesource.jansi:jansi:1)
BuildRequires: mvn(org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec)
BuildRequires: mvn(org.jctools:jctools-core)
BuildRequires: mvn(org.lightcouch:lightcouch)
@ -197,6 +197,9 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka
# tests are disabled
%pom_remove_plugin :maven-failsafe-plugin
# Update required version of jansi 1.x
%pom_xpath_set "//pom:dependency[pom:artifactId='jansi']/pom:version" 1.18
%if %{with jp_minimal}
%pom_disable_module %{name}-taglib
%pom_disable_module %{name}-jmx-gui
@ -278,6 +281,9 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms
%changelog
* Mon Dec 14 2020 Jerry James <loganjerry@gmail.com> - 2.13.3-2
- Update jansi dep to jansi1
* Thu Aug 20 2020 Fabio Valentini <decathorpe@gmail.com> - 2.13.3-1
- Update to version 2.13.3.