From 5f4a51e3bd6820b0b153ac28e58dfc42d0e53e88 Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 1 Mar 2024 19:25:54 +0100 Subject: [PATCH 01/16] bump of release for for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 We are sorry, we messed a bit, and we have to bump release in this package --- msv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/msv.spec b/msv.spec index 576257b..58d401e 100644 --- a/msv.spec +++ b/msv.spec @@ -1,6 +1,6 @@ Name: msv Version: 2022.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Multi-Schema Validator Toolkit # License breakdown # Apache-1.1 @@ -87,6 +87,9 @@ rm xsdlib/src/main/java/com/sun/msv/datatype/xsd/regex/XercesImpl.java %license Apache-LICENSE-1.1.txt license.txt %changelog +* Fri Mar 01 2024 Jiri Vanek - 2022.7-4 +- bump of release for for java-21-openjdk as system jdk + * Thu Jan 25 2024 Fedora Release Engineering - 2022.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From ec8da848db276dac3f94b04f0729b54145819e5a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 18:51:59 +0000 Subject: [PATCH 02/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- msv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/msv.spec b/msv.spec index 576257b..300078e 100644 --- a/msv.spec +++ b/msv.spec @@ -1,6 +1,6 @@ Name: msv Version: 2022.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Multi-Schema Validator Toolkit # License breakdown # Apache-1.1 @@ -87,6 +87,9 @@ rm xsdlib/src/main/java/com/sun/msv/datatype/xsd/regex/XercesImpl.java %license Apache-LICENSE-1.1.txt license.txt %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 2022.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Jan 25 2024 Fedora Release Engineering - 2022.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 4ee585fe1dbfe865a0ee6198edbf18ae2b6c7062 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Jul 2024 20:53:30 +0200 Subject: [PATCH 03/16] Switch javapackages tests to f41 branch --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index a2cdaba..17c6113 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f40 + ref: f41 execute: how: tmt From 81c96ec0f4fc21e38876a1e4f516e5cdc0f7911b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:33:57 +0200 Subject: [PATCH 04/16] Switch from %setup to %autosetup --- msv.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/msv.spec b/msv.spec index 300078e..b105dec 100644 --- a/msv.spec +++ b/msv.spec @@ -53,10 +53,9 @@ MSV XML Datatypes Library, Java implementation of W3C’s XML Schema Part 2, is intended for use with applications that incorporate XML Schema Part 2. %prep -%setup -q +%autosetup -p1 -C # Disable runtime dependency on Apache Xerces -%patch 1 -p1 rm xsdlib/src/main/java/com/sun/msv/datatype/xsd/regex/XercesImpl.java %pom_xpath_remove 'pom:project/pom:modules' From c99471e4b81561bd88c7f96e7e868d9b2abc1286 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 Aug 2024 22:13:19 +0200 Subject: [PATCH 05/16] Switch to non-numdered patches --- msv.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/msv.spec b/msv.spec index b105dec..da689e1 100644 --- a/msv.spec +++ b/msv.spec @@ -23,7 +23,7 @@ Source0: %{name}-%{version}.tar.gz Source1: generate-tarball.sh -Patch1: 0001-Disable-Apache-XercesImpl.patch +Patch: 0001-Disable-Apache-XercesImpl.patch BuildRequires: maven-local BuildRequires: mvn(junit:junit) From 97d9c929acb0acc7535a79694b48a605d5b86981 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:45:15 +0200 Subject: [PATCH 06/16] Convert to %autorelease and %autochangelog --- changelog | 12 ++++++++++++ msv.spec | 15 ++------------- 2 files changed, 14 insertions(+), 13 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..ed2b8d5 --- /dev/null +++ b/changelog @@ -0,0 +1,12 @@ +* Thu Jul 18 2024 Fedora Release Engineering - 2022.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 2022.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 2022.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Aug 07 2023 Marian Koncek - 2022.7-1 +- Package unretired +- Update to upstream version 2022.7 diff --git a/msv.spec b/msv.spec index da689e1..1b99212 100644 --- a/msv.spec +++ b/msv.spec @@ -1,6 +1,6 @@ Name: msv Version: 2022.7 -Release: 4%{?dist} +Release: %autorelease Summary: Multi-Schema Validator Toolkit # License breakdown # Apache-1.1 @@ -86,15 +86,4 @@ rm xsdlib/src/main/java/com/sun/msv/datatype/xsd/regex/XercesImpl.java %license Apache-LICENSE-1.1.txt license.txt %changelog -* Thu Jul 18 2024 Fedora Release Engineering - 2022.7-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jan 25 2024 Fedora Release Engineering - 2022.7-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 2022.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Aug 07 2023 Marian Koncek - 2022.7-1 -- Package unretired -- Update to upstream version 2022.7 +%autochangelog From 02ee52996f5ab86d21128a4b712aa633597248a2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 29 Nov 2024 08:28:38 +0100 Subject: [PATCH 07/16] Update javapackages test plan to f42 --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 17c6113..86bfcea 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f41 + ref: f42 execute: how: tmt From 3cdfaa1cd9f665c361061127dd50fdac529683be Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Dec 2024 16:01:19 +0100 Subject: [PATCH 08/16] Unify spec style with the rest of Java/Maven packages [skip changelog] --- msv.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/msv.spec b/msv.spec index 1b99212..ba8be1b 100644 --- a/msv.spec +++ b/msv.spec @@ -20,7 +20,6 @@ ExclusiveArch: %{java_arches} noarch # ./generate-tarball.sh Source0: %{name}-%{version}.tar.gz - Source1: generate-tarball.sh Patch: 0001-Disable-Apache-XercesImpl.patch @@ -39,16 +38,16 @@ 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 +%package javadoc Summary: API documentation for %{name} -%description javadoc +%description javadoc This package provides %{summary}. -%package xsdlib +%package xsdlib Summary: Java implementation of W3C’s XML Schema Part 2 -%description xsdlib +%description xsdlib MSV XML Datatypes Library, Java implementation of W3C’s XML Schema Part 2, is intended for use with applications that incorporate XML Schema Part 2. From 659e398304a4404361207233ecb89a7d7b436268 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 31 Dec 2024 09:59:10 +0100 Subject: [PATCH 09/16] Update javadoc package description [skip changelog] --- msv.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/msv.spec b/msv.spec index ba8be1b..b06ea8e 100644 --- a/msv.spec +++ b/msv.spec @@ -42,7 +42,7 @@ subset of XML Schema Part 1. Summary: API documentation for %{name} %description javadoc -This package provides %{summary}. +API documentation for %{name}. %package xsdlib Summary: Java implementation of W3C’s XML Schema Part 2 From a426cc605147cb7fd739dd7d3a0414647d32c606 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 19:21:10 +0000 Subject: [PATCH 10/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 9154eadca92d90998276a96be725f284433c9f88 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:13 +0100 Subject: [PATCH 11/16] 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 12/16] 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 13/16] 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 14/16] 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 15/16] 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 16/16] 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.