From 1fddd4a9f67ca2dbc6dbe9809cd240013a22f6b5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:13 +0100 Subject: [PATCH 1/8] Remove javadoc subpackage --- jsoup.spec | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/jsoup.spec b/jsoup.spec index 79bfeff..8a1d506 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -22,6 +22,8 @@ BuildRequires: maven-local BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) %endif +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 1.18.1-11 %description jsoup is a Java library for working with real-world HTML. It provides a very @@ -40,12 +42,6 @@ jsoup is designed to deal with all varieties of HTML found in the wild; from pristine and validating, to invalid tag-soup; jsoup will create a sensible parse tree. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -API documentation for %{name}. - %prep %autosetup -p1 -C @@ -66,7 +62,7 @@ sed -i /org.jspecify/d src/main/java9/module-info.java -p org[.]jspecify[.]annotations[.] \ %build -%mvn_build -f +%mvn_build -j -f %install %mvn_install @@ -75,7 +71,5 @@ sed -i /org.jspecify/d src/main/java9/module-info.java %doc README.md CHANGES.md %license LICENSE -%files javadoc -f .mfiles-javadoc - %changelog %autochangelog From d25720187fa2b4979ef3f8b2fb367e9f46c9b419 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:19 +0100 Subject: [PATCH 2/8] 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 222795dd9fe528f6e47ad5aa96b2002e9994b763 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 May 2025 13:35:31 +0200 Subject: [PATCH 3/8] 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 7b9fa739ba3859c150206d1e52253800d2b37c5b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 13 Jul 2025 09:22:51 +0200 Subject: [PATCH 4/8] Build with OpenJDK 25 --- jsoup.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsoup.spec b/jsoup.spec index 8a1d506..a03f942 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -18,7 +18,7 @@ BuildRequires: jurand %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) %endif From ac394efe25bcfc877a1d6e93d8ae6e375052f58b Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 16 Apr 2025 12:40:56 +0200 Subject: [PATCH 5/8] Update to upstream version 1.19.1 --- .gitignore | 1 + jsoup.spec | 6 +++--- sources | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9978b35..679c9c5 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /jsoup-1.16.1.tar.gz /jsoup-1.17.2.tar.gz /jsoup-1.18.1.tar.gz +/jsoup-1.19.1.tar.gz diff --git a/jsoup.spec b/jsoup.spec index a03f942..9459bdc 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -1,7 +1,7 @@ %bcond_with bootstrap Name: jsoup -Version: 1.18.1 +Version: 1.19.1 Release: %autorelease Summary: Java library for working with real-world HTML License: MIT @@ -57,8 +57,8 @@ tree. # Remove jspecify annotations which are used for static analysis only %pom_remove_dep :jspecify -sed -i /org.jspecify/d src/main/java9/module-info.java -%java_remove_annotations src/main/java -s \ +sed -i /org.jspecify/d src/main/java*/module-info.java +%java_remove_annotations src/main/java src/main/java11 -s \ -p org[.]jspecify[.]annotations[.] \ %build diff --git a/sources b/sources index 0ea4c54..6ebeca0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jsoup-1.18.1.tar.gz) = 290483fe015870e8163f11a7e49ab9e5e411a3654d46e04e10f08589efb432890fa61e2f434907f053bed9debefec6b0f843370ac270007201eb434153024f46 +SHA512 (jsoup-1.19.1.tar.gz) = cdee79acaf7d3fb54b80457f490e7d7845559981e392630d95a6376002cf3cc8cd8d10a8516a20a4b19f565f143aa5c10f5326b65707de5eab11f94c0b59e291 From d4f19c399b6474277d992f27c3ac8366208ebce8 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 17 Jul 2025 12:27:11 +0200 Subject: [PATCH 6/8] Update to upstream version 1.21.1 --- .gitignore | 1 + jsoup.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 679c9c5..16d3109 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /jsoup-1.17.2.tar.gz /jsoup-1.18.1.tar.gz /jsoup-1.19.1.tar.gz +/jsoup-1.21.1.tar.gz diff --git a/jsoup.spec b/jsoup.spec index 9459bdc..fa42763 100644 --- a/jsoup.spec +++ b/jsoup.spec @@ -1,7 +1,7 @@ %bcond_with bootstrap Name: jsoup -Version: 1.19.1 +Version: 1.21.1 Release: %autorelease Summary: Java library for working with real-world HTML License: MIT diff --git a/sources b/sources index 6ebeca0..5352311 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jsoup-1.19.1.tar.gz) = cdee79acaf7d3fb54b80457f490e7d7845559981e392630d95a6376002cf3cc8cd8d10a8516a20a4b19f565f143aa5c10f5326b65707de5eab11f94c0b59e291 +SHA512 (jsoup-1.21.1.tar.gz) = 64c713ef487f3283199769655ded7501b80b583e09d7aee93d80912320c79ee2c5224fc4ae23e96f13949a224849d65f9171b3f7932b44dd8a8bc536b4967d22 From 4b557a17860a1f16b55242cbfdcfa7d041773217 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 18:07:30 +0000 Subject: [PATCH 7/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From da67f6385d0b3a462ae099f0abaf90e060478d61 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 30 Jul 2025 00:00:12 +0200 Subject: [PATCH 8/8] 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.