rpms/log4j
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 2.14.1

Browse Source 
Disable javadoc (#1988896)
Build with jansi-2
Remove deps on slf4j-ext (no longer available in Fedora 35)
This commit is contained in:
Sérgio M. Basto 2021-08-02 04:38:58 +01:00
parent 29316b2c4c
commit aec57694e4
3 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -19,3 +19,4 @@
/apache-log4j-2.13.0-src.tar.gz
/apache-log4j-2.13.1-src.tar.gz
/apache-log4j-2.13.3-src.tar.gz
/apache-log4j-2.14.1-src.tar.gz

29
log4j.spec
View File

@ -1,8 +1,8 @@
%bcond_without jp_minimal
Name: log4j
Version: 2.13.3
Release: 4%{?dist}
Version: 2.14.1
Release: 1%{?dist}
Summary: Java logging package
BuildArch: noarch
License: ASL 2.0
@ -26,11 +26,10 @@ 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:1)
BuildRequires: mvn(org.fusesource.jansi:jansi)
BuildRequires: mvn(org.jctools:jctools-core)
BuildRequires: mvn(org.osgi:osgi.core)
BuildRequires: mvn(org.slf4j:slf4j-api)
BuildRequires: mvn(org.slf4j:slf4j-ext)
%if %{without jp_minimal}
BuildRequires: mvn(com.datastax.cassandra:cassandra-driver-core)
@ -180,9 +179,9 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka
# we don't have commons-dbcp2
%pom_disable_module %{name}-jdbc-dbcp2
# We have mongodb 4
%pom_disable_module %{name}-mongodb2
# We don't have mmongo-java
%pom_disable_module %{name}-mongodb3
%pom_disable_module %{name}-mongodb4
# System scoped dep provided by JDK
%pom_remove_dep :jconsole %{name}-jmx-gui
@ -200,6 +199,10 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka
# Update required version of jansi 1.x
%pom_xpath_set "//pom:dependency[pom:artifactId='jansi']/pom:version" 1.18
# Remove deps on slf4j-ext, it is no longer available in Fedora 35
%pom_remove_dep -r :slf4j-ext
%pom_remove_parent
%if %{with jp_minimal}
%pom_disable_module %{name}-taglib
%pom_disable_module %{name}-jmx-gui
@ -213,7 +216,9 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka
%pom_disable_module %{name}-cassandra
%pom_disable_module %{name}-appserver
%pom_disable_module %{name}-spring-cloud-config
%pom_disable_module %{name}-spring-boot
%pom_disable_module %{name}-kubernetes
%pom_disable_module %{name}-layout-template-json
%pom_remove_dep -r :jackson-dataformat-yaml
%pom_remove_dep -r :jackson-dataformat-xml
@ -252,7 +257,7 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms
%build
# missing test deps (mockejb)
%mvn_build -f
%mvn_build -f -j
%install
%mvn_install
@ -276,11 +281,17 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms
%{_bindir}/%{name}-jmx
%endif
%files javadoc -f .mfiles-javadoc
%doc LICENSE.txt NOTICE.txt
#%%files javadoc -f .mfiles-javadoc
#%%doc LICENSE.txt NOTICE.txt
%changelog
* Sun Aug 01 2021 Sérgio Basto <sergio@serjux.com> - 2.14.1-1
- Update to 2.14.1
- Disable javadoc (#1988896)
- Build with jansi-2
- Remove deps on slf4j-ext (no longer available in Fedora 35)
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
SHA512 (apache-log4j-2.13.3-src.tar.gz) = b759f008e99ba3eaeb7f928e66d96529ece6fc9d9532a825775e11a00c256543aaa43a8e7f383b729be23a21ba90df42b8b12aa2802d40a0e227e17b629d8ecc
SHA512 (apache-log4j-2.14.1-src.tar.gz) = 5281ba6f615d1b1aa4db25b102f90fd74eb37b07ce8543019c51f9f3fb53a00f85106944c6ef7d9195b4c58806cb403f2f5ce6fb3f9b87603894c678978a4b7d