From 77d222f265d6ae7e7e6f5a39871a5ec37315557e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 23 Feb 2022 08:49:41 +0100 Subject: [PATCH] Fix compatibility with OpenJDK 8 Related: rhbz#2054990 --- log4j.spec | 8 +++++++- plans/smoke.fmf | 6 +++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/log4j.spec b/log4j.spec index 00326b7..980a0bf 100644 --- a/log4j.spec +++ b/log4j.spec @@ -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' "8" + %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 - 2.17.1-3 +- Fix compatibility with OpenJDK 8 + * Mon Feb 21 2022 Mikolaj Izdebski - 2.17.1-2 - Remove dependency on jackson diff --git a/plans/smoke.fmf b/plans/smoke.fmf index 170d61c..bc64702 100644 --- a/plans/smoke.fmf +++ b/plans/smoke.fmf @@ -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