Compare commits

...
Sign in to create a new pull request.

7 commits

Author SHA1 Message Date
Jiri Vanek
92a856e31b manual bodhi update for jdk25 needed on selected pkgs 2025-09-04 12:51:47 +02:00
Jiri Vanek
914f989f4d 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.
2025-07-30 00:06:56 +02:00
Fedora Release Engineering
c7a098f39a Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-24 20:49:24 +00:00
Mikolaj Izdebski
1b31dee501 Build with OpenJDK 25 2025-07-13 09:22:51 +02:00
Mikolaj Izdebski
9c283d8f78 Switch javapackages test plan to f43 ref 2025-05-22 13:35:31 +02:00
Mikolaj Izdebski
f4d6467553 Switch to javapackages tests from CentOS Stream GitLab 2025-03-26 08:43:19 +01:00
Mikolaj Izdebski
d11bb11be8 Drop javadoc package 2025-03-13 11:05:17 +01:00
2 changed files with 8 additions and 14 deletions

View file

@ -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)
@ -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.
@ -114,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
@ -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

View file

@ -1,7 +1,7 @@
summary: Run javapackages-specific tests
discover:
how: fmf
url: https://src.fedoraproject.org/tests/javapackages
ref: f42
url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
ref: f43
execute:
how: tmt