From d11bb11be81700646b0d841b2953c66a80248701 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 Mar 2025 11:04:41 +0100 Subject: [PATCH 1/7] Drop javadoc package --- log4j.spec | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/log4j.spec b/log4j.spec index ecafc8e..c1a05cc 100644 --- a/log4j.spec +++ b/log4j.spec @@ -71,6 +71,9 @@ BuildRequires: mvn(sun.jdk:jconsole) # - io.fabric8.kubernetes-client %endif +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 2.2.0-18 + %description Log4j is a tool to help the programmer output log statements to a variety of output targets. @@ -127,12 +130,6 @@ Summary: Apache Log4j NoSql Use NoSQL databases such as MongoDB and CouchDB to append log messages. %endif -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -%{summary}. - %prep %autosetup -p1 -C @@ -277,7 +274,7 @@ rm log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MutableThreadCo %build # missing test deps (mockejb) -%mvn_build -f +%mvn_build -j -f %install %mvn_install @@ -300,8 +297,5 @@ rm log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MutableThreadCo %{_bindir}/%{name}-jmx %endif -%files javadoc -f .mfiles-javadoc -%license LICENSE.txt NOTICE.txt - %changelog %autochangelog From f4d6467553f9a73ea493a963f71fee2574d09f5b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:19 +0100 Subject: [PATCH 2/7] Switch to javapackages tests from CentOS Stream GitLab --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 86bfcea..e39d47c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -1,7 +1,7 @@ summary: Run javapackages-specific tests discover: how: fmf - url: https://src.fedoraproject.org/tests/javapackages + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git ref: f42 execute: how: tmt From 9c283d8f782fa15448c8a8e37aa5dea796b8b2fa Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 May 2025 13:35:31 +0200 Subject: [PATCH 3/7] Switch javapackages test plan to f43 ref --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index e39d47c..ae17c0c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git - ref: f42 + ref: f43 execute: how: tmt From 1b31dee5019ee8fb9e433c296ef6eb850fe9c3b2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 13 Jul 2025 09:22:51 +0200 Subject: [PATCH 4/7] Build with OpenJDK 25 --- log4j.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/log4j.spec b/log4j.spec index c1a05cc..e1ce889 100644 --- a/log4j.spec +++ b/log4j.spec @@ -20,7 +20,7 @@ Patch: 0002-Remove-usage-of-toolchains.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(com.lmax:disruptor) BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(jakarta.activation:jakarta.activation-api) From c7a098f39a840cef695b5f0c0345150a13e3a942 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 20:49:24 +0000 Subject: [PATCH 5/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 914f989f4df5b9d9f7aac155c40524aaf6bec346 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 30 Jul 2025 00:06:56 +0200 Subject: [PATCH 6/7] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that. --- log4j.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/log4j.spec b/log4j.spec index e1ce889..542ad0b 100644 --- a/log4j.spec +++ b/log4j.spec @@ -117,7 +117,7 @@ Apache Log4j Tag Library for Web Applications. %package jmx-gui Summary: Apache Log4j JMX GUI -Requires: java-devel +Requires: java-25-devel %description jmx-gui Swing-based client for remotely editing the log4j configuration and remotely From 92a856e31b55dc1e4bdfbb5d2861ef6aca70f653 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Thu, 4 Sep 2025 12:51:47 +0200 Subject: [PATCH 7/7] manual bodhi update for jdk25 needed on selected pkgs