From 9154eadca92d90998276a96be725f284433c9f88 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:13 +0100 Subject: [PATCH 1/6] Remove javadoc subpackage --- msv.spec | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/msv.spec b/msv.spec index b06ea8e..f1ce7d0 100644 --- a/msv.spec +++ b/msv.spec @@ -30,6 +30,8 @@ BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) BuildRequires: mvn(org.jdom:jdom2) BuildRequires: mvn(relaxngDatatype:relaxngDatatype) +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 2022.7-15 %description The Multi Schema Validation toolkit is a Java based toolkit consisting of 8 @@ -38,12 +40,6 @@ for the validation of XML documents against several kinds of XML schemata The core supports RELAX NG, RELAX Namespace, RELAX Core, TREX, XML DTDs, and a subset of XML Schema Part 1. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -API documentation for %{name}. - %package xsdlib Summary: Java implementation of W3C’s XML Schema Part 2 @@ -72,14 +68,11 @@ rm xsdlib/src/main/java/com/sun/msv/datatype/xsd/regex/XercesImpl.java %mvn_package net.java.dev.msv:msv __noinstall %build -%mvn_build -s +%mvn_build -j -s %install %mvn_install -%files javadoc -f .mfiles-javadoc -%license Apache-LICENSE-1.1.txt license.txt - %files xsdlib -f .mfiles-xsdlib %doc README.md README-xsdlib.md %license Apache-LICENSE-1.1.txt license.txt From f688858bda0728d7b1d257516d9e5c885dad872f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:19 +0100 Subject: [PATCH 2/6] 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 3eba56b68fa3c1f4f2b7d8959303450fa8c54aaf Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 May 2025 13:35:32 +0200 Subject: [PATCH 3/6] 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 464c0242e83d7d448485bf2f12518b63b0626711 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 13 Jul 2025 09:22:52 +0200 Subject: [PATCH 4/6] Build with OpenJDK 25 --- msv.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/msv.spec b/msv.spec index f1ce7d0..ff1ec35 100644 --- a/msv.spec +++ b/msv.spec @@ -24,7 +24,7 @@ Source1: generate-tarball.sh Patch: 0001-Disable-Apache-XercesImpl.patch -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) From cb41d9294e904ae809f58f6d86edce3f24f029d3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 22:28:00 +0000 Subject: [PATCH 5/6] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 27822741e3e8cf8e876f4915b315268a1d00d792 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 30 Jul 2025 00:47:05 +0200 Subject: [PATCH 6/6] 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.