From 51b72a3336b2b3bda002e206dee81cd8831dd9d3 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 --- bcel.spec | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/bcel.spec b/bcel.spec index 27f8f67..05dd62b 100644 --- a/bcel.spec +++ b/bcel.spec @@ -13,6 +13,8 @@ BuildRequires: maven-local BuildRequires: mvn(org.apache.commons:commons-lang3) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 6.8.1-14 %description The Byte Code Engineering Library (formerly known as JavaClass) is @@ -30,12 +32,6 @@ being used successfully in several projects such as compilers, optimizers, obsfuscators and analysis tools, the most popular probably being the Xalan XSLT processor at Apache. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -API documentation for %{name}. - %prep %autosetup -p1 -C @@ -47,7 +43,7 @@ API documentation for %{name}. %mvn_file : %{name} %build -%mvn_build -f +%mvn_build -j -f %install %mvn_install @@ -56,8 +52,5 @@ API documentation for %{name}. %doc RELEASE-NOTES.txt %license LICENSE.txt NOTICE.txt -%files javadoc -f .mfiles-javadoc -%license LICENSE.txt NOTICE.txt - %changelog %autochangelog From 83fb93cef29c3da1f992414b5ac1dd0f7d3d47d1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:18 +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 422b9937d1eedd678d2c3689d8a3b08b31df0de7 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 7d3479cb6116f073f2530b5eb15c1288a93f9cc4 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 --- bcel.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bcel.spec b/bcel.spec index 05dd62b..7bd0005 100644 --- a/bcel.spec +++ b/bcel.spec @@ -9,7 +9,7 @@ ExclusiveArch: %{java_arches} noarch Source0: http://archive.apache.org/dist/commons/bcel/source/bcel-%{version}-src.tar.gz -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(org.apache.commons:commons-lang3) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) From 5a094ca60150c5b8ebdc68ee8fb93da5ee79ee15 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 17 Jul 2025 07:49:29 +0200 Subject: [PATCH 5/8] Update to upstream version 6.10.0 --- .gitignore | 1 + bcel.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8eddb0f..5b2eb60 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /bcel-6.7.0-src.tar.gz /bcel-6.8.0-src.tar.gz /bcel-6.8.1-src.tar.gz +/bcel-6.10.0-src.tar.gz diff --git a/bcel.spec b/bcel.spec index 7bd0005..54856cc 100644 --- a/bcel.spec +++ b/bcel.spec @@ -1,5 +1,5 @@ Name: bcel -Version: 6.8.1 +Version: 6.10.0 Release: %autorelease Summary: Byte Code Engineering Library License: Apache-2.0 diff --git a/sources b/sources index 7bcd686..2a1c63f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (bcel-6.8.1-src.tar.gz) = 1a38f4603bfe8692e4fc71a911fbb37ddc30ee5afa270d4b36f0325879a555df2cab34e2abf38645a3c7b780e30dec516a0eac21a0d7e18ff412a5762282360e +SHA512 (bcel-6.10.0-src.tar.gz) = 7ea129a048bf510ed15212a17680dfa37fe8c4adcc75504fa9a6ff35ef97d25f267547ad019fe146cd2fea9a3ef0eaca432d4c9cac7570ba5e68897f21c29a14 From 50d90c920ce5c53ca3b381aa37ffde193a3a06e2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 17 Jul 2025 08:47:25 +0200 Subject: [PATCH 6/8] Update tests for version 6.10.0 --- tests/Sanity/upstream-tests/main.fmf | 1 + tests/Sanity/upstream-tests/runtest.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/Sanity/upstream-tests/main.fmf b/tests/Sanity/upstream-tests/main.fmf index c957ccd..a3a52fb 100644 --- a/tests/Sanity/upstream-tests/main.fmf +++ b/tests/Sanity/upstream-tests/main.fmf @@ -5,3 +5,4 @@ require: - bcel - javapackages-tools - maven + - cpio diff --git a/tests/Sanity/upstream-tests/runtest.sh b/tests/Sanity/upstream-tests/runtest.sh index b38cb6c..9c38473 100755 --- a/tests/Sanity/upstream-tests/runtest.sh +++ b/tests/Sanity/upstream-tests/runtest.sh @@ -38,7 +38,7 @@ rlJournalStart rlPhaseEnd rlPhaseStartTest "run tests" - rlRun -s "${mvn} surefire:test -Dsurefire.excludes=JdkGenericDumpTestCase,ConstantPoolModuleToStringTestCase,BCELifierTestCase" + rlRun -s "${mvn} surefire:test -Dsurefire.excludes=JdkGenericDumpTestCase,ConstantPoolModuleToStringTestCase,ConstantPoolModuleAccessTestCase,BCELifierTestCase" rlAssertGrep "BUILD SUCCESS" $rlRun_LOG rlAssertGrep "Failures: 0, Errors: 0" $rlRun_LOG rlPhaseEnd From 77100c6b1c53884c625ef5be531034a0d7831c61 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:37:02 +0000 Subject: [PATCH 7/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 03a7be70c6d48193442b504ead9461a2b08ab8c4 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 29 Jul 2025 19:49:10 +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.