Fix compatibility with OpenJDK 8

Related: rhbz#2054990
This commit is contained in:
Mikolaj Izdebski 2022-02-23 08:49:41 +01:00
parent 8f2b09c171
commit 77d222f265
2 changed files with 10 additions and 4 deletions

View File

@ -2,7 +2,7 @@
Name: log4j
Version: 2.17.1
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Java logging package
BuildArch: noarch
License: ASL 2.0
@ -198,6 +198,9 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka
%pom_remove_dep -r :slf4j-ext
%pom_remove_parent
# Make compiled code compatible with OpenJDK 8
%pom_xpath_inject 'pom:plugin[pom:artifactId="maven-compiler-plugin"]/pom:configuration' "<release>8</release>"
%if %{with jp_minimal}
%pom_disable_module %{name}-taglib
%pom_disable_module %{name}-jmx-gui
@ -286,6 +289,9 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms
%changelog
* Wed Feb 23 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.17.1-3
- Fix compatibility with OpenJDK 8
* Mon Feb 21 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.17.1-2
- Remove dependency on jackson

View File

@ -1,8 +1,8 @@
summary: Basic smoke test
prepare:
how: install
package: java-devel
package: java-1.8.0-openjdk-devel
execute:
script:
- javac -cp /usr/share/java/log4j/log4j-api.jar plans/Smoke.java
- java -cp /usr/share/java/log4j/log4j-api.jar:/usr/share/java/log4j/log4j-core.jar:plans Smoke
- /usr/lib/jvm/java-1.8.0-openjdk/bin/javac -cp /usr/share/java/log4j/log4j-api.jar plans/Smoke.java
- /usr/lib/jvm/java-1.8.0-openjdk/bin/java -cp /usr/share/java/log4j/log4j-api.jar:/usr/share/java/log4j/log4j-core.jar:plans Smoke