Compare commits

..

9 commits

Author SHA1 Message Date
Fedora Release Engineering
7198db6806 Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild 2026-07-17 09:17:57 +00:00
Fedora Release Engineering
00d95ea022 Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-17 20:45:07 +00:00
Jiri Vanek
20371c3ca2 manual bodhi update for jdk25 needed on selected pkgs 2025-09-04 16:38:50 +02:00
Jiri Vanek
f924e0160e 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 01:32:00 +02:00
Fedora Release Engineering
69d830c678 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 20:55:28 +00:00
Mikolaj Izdebski
e114e07522 Build with OpenJDK 25 2025-07-13 09:22:52 +02:00
Mikolaj Izdebski
f789d2b96c Switch javapackages test plan to f43 ref 2025-05-22 13:35:32 +02:00
Mikolaj Izdebski
4e7c9c1181 Switch to javapackages tests from CentOS Stream GitLab 2025-03-26 08:43:19 +01:00
Mikolaj Izdebski
326ace225e Remove javadoc subpackage 2025-03-03 12:54:16 +01:00
2 changed files with 8 additions and 15 deletions

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

View file

@ -16,19 +16,15 @@ Source8: %{name}-xread.1
Patch: %{name}-1.2-crosslink.patch
Patch: %{name}-1.2-osgi.patch
BuildRequires: javapackages-local
BuildRequires: ant
BuildRequires: javapackages-local-openjdk25
BuildRequires: ant-openjdk25
BuildRequires: apache-parent
# TODO Remove in Fedora 46
Obsoletes: %{name}-javadoc < 1.2-53
%description
Resolver subproject of xml-commons.
%package javadoc
Summary: API documentation for %{name}
%description javadoc
API documentation for %{name}.
%prep
%autosetup -p1 -C
@ -40,11 +36,11 @@ sed -i 's/\r//' KEYS LICENSE.resolver.txt NOTICE-resolver.txt
%mvn_file : xml-commons-resolver xml-resolver
%build
%ant -f resolver.xml jar javadocs -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8
%ant -f resolver.xml jar -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8
%mvn_artifact %{SOURCE5} build/resolver.jar
%install
%mvn_install -J build/apidocs/resolver
%mvn_install
# Scripts
mkdir -p %{buildroot}%{_bindir}
@ -64,8 +60,5 @@ install -p -m 644 %{SOURCE8} %{buildroot}%{_mandir}/man1/xml-xread.1
%{_mandir}/man1/*
%{_bindir}/xml-*
%files javadoc -f .mfiles-javadoc
%license LICENSE.resolver.txt NOTICE-resolver.txt
%changelog
%autochangelog