From 82d26a659b8b24758d1523c0506030fa6205d16b Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 18:32:09 +0100 Subject: [PATCH 01/14] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- xbean.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xbean.spec b/xbean.spec index e54fa1b..d2535d1 100644 --- a/xbean.spec +++ b/xbean.spec @@ -2,7 +2,7 @@ Name: xbean Version: 4.24 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java plugin based web server License: Apache-2.0 URL: https://geronimo.apache.org/xbean/ @@ -91,6 +91,9 @@ sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apac %license LICENSE NOTICE %changelog +* Tue Feb 27 2024 Jiri Vanek - 4.24-3 +- Rebuilt for java-21-openjdk as system jdk + * Sat Jan 27 2024 Fedora Release Engineering - 4.24-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 4ed8eb368793edac9706a6872b3b1596d993a10b Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 2 Mar 2024 21:43:46 +0100 Subject: [PATCH 02/14] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- xbean.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xbean.spec b/xbean.spec index e54fa1b..ea29ccd 100644 --- a/xbean.spec +++ b/xbean.spec @@ -2,7 +2,7 @@ Name: xbean Version: 4.24 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java plugin based web server License: Apache-2.0 URL: https://geronimo.apache.org/xbean/ @@ -91,6 +91,9 @@ sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apac %license LICENSE NOTICE %changelog +* Sat Mar 02 2024 Jiri Vanek - 4.24-3 +- Rebuilt for java-21-openjdk as system jdk + * Sat Jan 27 2024 Fedora Release Engineering - 4.24-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 0f425c958b193f65876848833dc6da729b093327 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:43:56 +0000 Subject: [PATCH 03/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- xbean.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xbean.spec b/xbean.spec index d2535d1..3232dec 100644 --- a/xbean.spec +++ b/xbean.spec @@ -2,7 +2,7 @@ Name: xbean Version: 4.24 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java plugin based web server License: Apache-2.0 URL: https://geronimo.apache.org/xbean/ @@ -91,6 +91,9 @@ sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apac %license LICENSE NOTICE %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 4.24-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Feb 27 2024 Jiri Vanek - 4.24-3 - Rebuilt for java-21-openjdk as system jdk From 0b3a38a2e098a34ea768452131e9ea2e66ea6511 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:26:55 +0000 Subject: [PATCH 04/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- xbean.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xbean.spec b/xbean.spec index 3232dec..fd4076b 100644 --- a/xbean.spec +++ b/xbean.spec @@ -2,7 +2,7 @@ Name: xbean Version: 4.24 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java plugin based web server License: Apache-2.0 URL: https://geronimo.apache.org/xbean/ @@ -91,6 +91,9 @@ sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apac %license LICENSE NOTICE %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 4.24-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Jul 20 2024 Fedora Release Engineering - 4.24-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From a696f3deeada1b98c7853e9b12e6b47efa7c246d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:38:21 +0000 Subject: [PATCH 05/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- xbean.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xbean.spec b/xbean.spec index fd4076b..44fe407 100644 --- a/xbean.spec +++ b/xbean.spec @@ -2,7 +2,7 @@ Name: xbean Version: 4.24 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Java plugin based web server License: Apache-2.0 URL: https://geronimo.apache.org/xbean/ @@ -91,6 +91,9 @@ sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apac %license LICENSE NOTICE %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 4.24-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 4.24-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 772b66254edc9aa916ed072fc90594d8cd01dedc Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 30 Jul 2025 01:30:18 +0200 Subject: [PATCH 06/14] 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. --- xbean.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xbean.spec b/xbean.spec index 44fe407..784b014 100644 --- a/xbean.spec +++ b/xbean.spec @@ -2,7 +2,7 @@ Name: xbean Version: 4.24 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Java plugin based web server License: Apache-2.0 URL: https://geronimo.apache.org/xbean/ @@ -17,7 +17,7 @@ Patch2: 0002-Remove-dependency-on-log4j-and-commons-logging.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.osgi:org.osgi.core) @@ -91,6 +91,9 @@ sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apac %license LICENSE NOTICE %changelog +* Tue Jul 29 2025 jiri vanek - 4.24-7 +- Rebuilt for java-25-openjdk as preffered jdk + * Fri Jul 25 2025 Fedora Release Engineering - 4.24-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From cdc3f0019aec0799201fa4feaa7bad07f1dda14a Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 30 Jul 2025 14:12:05 +0200 Subject: [PATCH 07/14] Rrevert to jdk21 during rebuild for https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk your package failed to build. Is preemptively reverted back to versioned jdk21 --- xbean.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xbean.spec b/xbean.spec index 784b014..b25b65c 100644 --- a/xbean.spec +++ b/xbean.spec @@ -2,7 +2,7 @@ Name: xbean Version: 4.24 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Java plugin based web server License: Apache-2.0 URL: https://geronimo.apache.org/xbean/ @@ -17,7 +17,7 @@ Patch2: 0002-Remove-dependency-on-log4j-and-commons-logging.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local-openjdk25 +BuildRequires: maven-local-openjdk21 BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.osgi:org.osgi.core) @@ -91,6 +91,9 @@ sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apac %license LICENSE NOTICE %changelog +* Wed Jul 30 2025 jiri vanek - 4.24-8 +- Rrevert to jdk21 + * Tue Jul 29 2025 jiri vanek - 4.24-7 - Rebuilt for java-25-openjdk as preffered jdk From 7305b4db3e4d572f913c5acac953af76ec8f34bf Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 19 Aug 2025 11:09:35 +0200 Subject: [PATCH 08/14] Update javapackages-validator URL --- plans/javapackages.fmf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index a2cdaba..075e436 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 - ref: f40 + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git + ref: main execute: how: tmt From 21a05de56c2b5fa83eeaaf31416c2599e604027a Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 19 Aug 2025 12:32:12 +0200 Subject: [PATCH 09/14] Drop -javadoc subpackage --- xbean.spec | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/xbean.spec b/xbean.spec index b25b65c..08df078 100644 --- a/xbean.spec +++ b/xbean.spec @@ -2,7 +2,7 @@ Name: xbean Version: 4.24 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Java plugin based web server License: Apache-2.0 URL: https://geronimo.apache.org/xbean/ @@ -14,6 +14,9 @@ Source0: https://repo1.maven.org/maven2/org/apache/%{name}/%{name}/%{vers Patch1: 0001-Unbundle-ASM.patch Patch2: 0002-Remove-dependency-on-log4j-and-commons-logging.patch +# TODO Remove in Fedora 47 +Obsoletes: %{name}-javadoc < 4.24-9 + %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else @@ -35,12 +38,6 @@ support for running with no IoC system, JMX without JMX code, lifecycle and class loader management, and a rock solid Spring integration. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -This package provides %{summary}. - %prep %setup -q %patch 1 -p1 @@ -79,7 +76,7 @@ rm -r xbean-finder/src/main/java/org/apache/xbean/finder{,/archive}/Bundle* sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apache/xbean/finder/archive/MJarJarArchiveTest.java %build -%mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 +%mvn_build -j -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 %install %mvn_install @@ -87,10 +84,10 @@ sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apac %files -f .mfiles %license LICENSE NOTICE -%files javadoc -f .mfiles-javadoc -%license LICENSE NOTICE - %changelog +* Tue Aug 19 2025 Marian Koncek - 4.24-9 +- Drop -javadoc subpackage + * Wed Jul 30 2025 jiri vanek - 4.24-8 - Rrevert to jdk21 From e540496e47aa0a727ae1f335c0914c0b5ad9cd24 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 19 Aug 2025 12:42:25 +0200 Subject: [PATCH 10/14] Use autorelease and autochangelog --- changelog | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++ xbean.spec | 312 +---------------------------------------------------- 2 files changed, 305 insertions(+), 307 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..549083e --- /dev/null +++ b/changelog @@ -0,0 +1,300 @@ +* Tue Aug 19 2025 Marian Koncek - 4.24-9 +- Drop -javadoc subpackage + +* Wed Jul 30 2025 jiri vanek - 4.24-8 +- Rrevert to jdk21 + +* Tue Jul 29 2025 jiri vanek - 4.24-7 +- Rebuilt for java-25-openjdk as preffered jdk + +* Fri Jul 25 2025 Fedora Release Engineering - 4.24-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 4.24-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Sat Jul 20 2024 Fedora Release Engineering - 4.24-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 4.24-3 +- Rebuilt for java-21-openjdk as system jdk + +* Sat Jan 27 2024 Fedora Release Engineering - 4.24-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Tue Dec 19 2023 Marian Koncek - 4.24-1 +- Update to upstream version 4.24 + +* Fri Sep 01 2023 Mikolaj Izdebski - 4.23-2 +- Rebuild + +* Thu Aug 17 2023 Marian Koncek - 4.23-1 +- Update to upstream version 4.23 + +* Sat Jul 22 2023 Fedora Release Engineering - 4.21-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 4.21-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Sep 09 2022 Marian Koncek - 4.21-1 +- Update to upstream version 4.21 + +* Sat Jul 23 2022 Fedora Release Engineering - 4.18-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 4.18-7 +- Rebuilt for java-17-openjdk as system jdk + +* Sat Jan 22 2022 Fedora Release Engineering - 4.18-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Nov 02 2021 Mikolaj Izdebski - 4.18-5 +- Set explicit Java compiler source/target levels to 1.7 + +* Fri Jul 23 2021 Fedora Release Engineering - 4.18-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Jun 21 2021 Mikolaj Izdebski - 4.18-3 +- Enable xbean-finder +- Resolves: rhbz#1969297 + +* Mon May 17 2021 Mikolaj Izdebski - 4.18-2 +- Bootstrap build +- Non-bootstrap build + +* Wed Jan 27 2021 Fedora Release Engineering - 4.15-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jan 26 2021 Marian Koncek - 4.18-1 +- Update to upstream version 4.18 + +* Wed Sep 09 2020 Fabio Valentini - 4.15-6 +- Switch from log4j 1.2 compat package to log4j 1.2 API shim. + +* Wed Jul 29 2020 Marian Koncek - 4.17-1 +- Update to upsteam version 4.17 + +* Wed Jul 29 2020 Mat Booth - 4.15-5 +- Remove springframework conditionals, the deps are a long time removed from + Fedora and this simplifies the spec a bit +- Disable unused modules that can't build on JDK 11 + +* Sat Jul 11 2020 Jiri Vanek - 4.15-4 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Thu Jun 25 2020 Jeff Johnston - 4.15-3 +- Fix JVM as 1.8.0 as package cannot be built with Java 9 and above + +* Fri May 15 2020 Mikolaj Izdebski - 4.14-4 +- Remove dependency on log4j and commons-logging + +* Fri Jan 31 2020 Fedora Release Engineering - 4.15-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Nov 13 2019 Fabio Valentini - 4.15-1 +- Update to version 4.15. + +* Tue Nov 05 2019 Mikolaj Izdebski - 4.14-3 +- Mass rebuild for javapackages-tools 201902 + +* Tue Nov 05 2019 Mikolaj Izdebski - 4.14-2 +- Disable all modules except xbean-reflect + +* Wed Sep 18 2019 Fabio Valentini - 4.14-2 +- Migrate from the obsolete felix-osgi-core to osgi-core. + +* Tue Aug 20 2019 Fabio Valentini - 4.14-1 +- Update to version 4.14. + +* Sun Jul 28 2019 Fabio Valentini - 4.9-5 +- Disable support for spring and groovy. + +* Sat Jul 27 2019 Fedora Release Engineering - 4.9-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Jul 09 2019 Fabio Valentini - 4.9-3 +- Disable eclipse equinox functionality to fix the FTBFS issue on 32bit arches. + +* Wed Jun 26 2019 Marian Koncek - 4.14-1 +- Update to upstream version 4.14 + +* Fri May 24 2019 Mikolaj Izdebski - 4.8-2 +- Mass rebuild for javapackages-tools 201901 + +* Sun Feb 03 2019 Fedora Release Engineering - 4.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Aug 07 2018 Michael Simacek - 4.9-1 +- Update to upstream version 4.9 + +* Sat Jul 14 2018 Fedora Release Engineering - 4.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Apr 19 2018 Michael Simacek - 4.8-1 +- Update to upstream version 4.8 + +* Tue Mar 13 2018 Michael Simacek - 4.6-1 +- Update to upstream version 4.6 + +* Fri Feb 09 2018 Fedora Release Engineering - 4.5-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 4.5-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 4.5-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Feb 1 2017 Mikolaj Izdebski - 4.5-6 +- Introduce groovy build conditional + +* Wed Feb 01 2017 Michael Simacek - 4.5-5 +- Fix build with conditionals + +* Wed Feb 01 2017 Michael Simacek - 4.5-4 +- Port to current QDox + +* Thu Jun 16 2016 Mikolaj Izdebski - 4.5-3 +- Add missing build-requires + +* Thu May 12 2016 Michael Simacek - 4.5-2 +- Enable xbean-asm-util + +* Mon May 02 2016 Michael Simacek - 4.5-1 +- Update to upstream version 4.5 + +* Fri Feb 05 2016 Fedora Release Engineering - 4.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Nov 24 2015 Michael Simacek - 4.4-1 +- Update to upstream version 4.4 +- Rebase patches +- Remove obsolete groovy patch + +* Mon Jul 13 2015 Mikolaj Izdebski - 4.3-1 +- Update to upstream version 4.3 + +* Fri Jun 19 2015 Fedora Release Engineering - 4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Apr 1 2015 Mikolaj Izdebski - 4.2-1 +- Update to upstream version 4.2 + +* Thu Feb 5 2015 Mikolaj Izdebski - 4.1-2 +- Fix patch unshading ASM + +* Fri Nov 21 2014 Mikolaj Izdebski - 4.1-1 +- Update to upstream version 4.1 + +* Sun Jun 08 2014 Fedora Release Engineering - 3.17-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon Apr 14 2014 Mikolaj Izdebski - 3.17-1 +- Update to upstream version 3.17 +- Add patch for Eclipse Luna + +* Thu Dec 5 2013 Mikolaj Izdebski - 3.16-1 +- Update to upstream version 3.16 + +* Thu Aug 08 2013 Stanislav Ochotnicky - 3.13-4 +- Update to latest packaging guidelines + +* Sun Aug 04 2013 Fedora Release Engineering - 3.13-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon Apr 29 2013 Mikolaj Izdebski - 3.13-2 +- Remove unneeded BR: maven-idea-plugin + +* Fri Mar 15 2013 Michal Srb - 3.13-1 +- Update to upstream version 3.13 + +* Fri Feb 15 2013 Fedora Release Engineering - 3.12-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 3.12-5 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Mon Dec 17 2012 Mikolaj Izdebski - 3.12-4 +- Enable xbean-spring, resolves rhbz#887496 +- Disable xbean-blueprint due to FTBFS + +* Mon Oct 22 2012 Mikolaj Izdebski - 3.12-3 +- Replace eclipse-rcp requires with eclipse-equinox-osgi +- Reenable Equinox + +* Tue Oct 16 2012 gil cattaneo - 3.12-2 +- Enable xbean-blueprint and xbean-classloader modules + +* Wed Oct 10 2012 Mikolaj Izdebski - 3.12-1 +- Update to upstream version 3.12 + +* Wed Oct 10 2012 Krzysztof Daniel 3.11.1-8 +- Revert previous changes. + +* Wed Oct 10 2012 Krzysztof Daniel 3.11.1-7 +- Disable parts dependent on Eclipse (for bootstraping purpose). + +* Wed Oct 10 2012 Mikolaj Izdebski - 3.11.1-6 +- Implement equinox and spring conditionals + +* Mon Sep 3 2012 Mikolaj Izdebski - 3.11.1-5 +- Fix eclipse requires + +* Mon Aug 27 2012 Mikolaj Izdebski - 3.11.1-4 +- Fix felix-framework enabling patch + +* Mon Aug 6 2012 Mikolaj Izdebski - 3.11.1-3 +- Enable xbean-spring +- Enable maven-xbean-plugin +- Remove RPM bug workaround + +* Sun Jul 22 2012 Fedora Release Engineering - 3.11.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jul 13 2012 Mikolaj Izdebski - 3.11.1-1 +- Update to the upstream version 3.11.1 +- Force use of Equinox instead of Felix +- Convert patch to POM macros + +* Thu May 3 2012 Stanislav Ochotnicky - 3.8-5 +- Remove mx4j from deps (javax.management provided by JDK 1.5+) + +* Tue Apr 24 2012 Alexander Kurtakov 3.8-4 +- BR felix-framework instead of felix-osgi-core. + +* Tue Apr 24 2012 Alexander Kurtakov 3.8-3 +- Do not build equinox specific parts for RHEL. + +* Sat Jan 14 2012 Fedora Release Engineering - 3.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Dec 6 2011 Stanislav Ochotnicky - 3.8-1 +- Update to latest upstream version +- Build with maven 3 +- Packaging & guidelines fixes + +* Sat May 28 2011 Marek Goldmann - 3.7-7 +- Added xbean-finder and xbean-bundleutils submodules + +* Fri Mar 4 2011 Stanislav Ochotnicky - 3.7-6 +- Add comment for removing javadoc +- Fix maven 3 build + +* Mon Feb 07 2011 Fedora Release Engineering - 3.7-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Dec 6 2010 Stanislav Ochotnicky - 3.7-4 +- Fix pom filename (Resolves rhbz#655827) +- Add depmap for main pom file +- Fixes according to new guidelines (versionless jars, javadocs) + +* Fri Jul 30 2010 Stanislav Ochotnicky - 3.7-3 +- Use javadoc:aggregate to generate javadocs + +* Fri Jul 9 2010 Stanislav Ochotnicky - 3.7-2 +- Add license to javadoc subpackage + +* Mon Jun 21 2010 Stanislav Ochotnicky - 3.7-1 +- First release diff --git a/xbean.spec b/xbean.spec index 08df078..ffcce68 100644 --- a/xbean.spec +++ b/xbean.spec @@ -2,7 +2,7 @@ Name: xbean Version: 4.24 -Release: 9%{?dist} +Release: %autorelease Summary: Java plugin based web server License: Apache-2.0 URL: https://geronimo.apache.org/xbean/ @@ -11,8 +11,8 @@ ExclusiveArch: %{java_arches} noarch Source0: https://repo1.maven.org/maven2/org/apache/%{name}/%{name}/%{version}/%{name}-%{version}-source-release.zip -Patch1: 0001-Unbundle-ASM.patch -Patch2: 0002-Remove-dependency-on-log4j-and-commons-logging.patch +Patch: 0001-Unbundle-ASM.patch +Patch: 0002-Remove-dependency-on-log4j-and-commons-logging.patch # TODO Remove in Fedora 47 Obsoletes: %{name}-javadoc < 4.24-9 @@ -39,9 +39,7 @@ lifecycle and class loader management, and a rock solid Spring integration. %prep -%setup -q -%patch 1 -p1 -%patch 2 -p1 +%autosetup -p1 -C cp xbean-asm-util/src/main/java/org/apache/xbean/asm9/original/commons/AsmConstants.java xbean-reflect/src/main/java/org/apache/xbean/recipe/ @@ -84,304 +82,4 @@ sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apac %files -f .mfiles %license LICENSE NOTICE -%changelog -* Tue Aug 19 2025 Marian Koncek - 4.24-9 -- Drop -javadoc subpackage - -* Wed Jul 30 2025 jiri vanek - 4.24-8 -- Rrevert to jdk21 - -* Tue Jul 29 2025 jiri vanek - 4.24-7 -- Rebuilt for java-25-openjdk as preffered jdk - -* Fri Jul 25 2025 Fedora Release Engineering - 4.24-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 4.24-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sat Jul 20 2024 Fedora Release Engineering - 4.24-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Feb 27 2024 Jiri Vanek - 4.24-3 -- Rebuilt for java-21-openjdk as system jdk - -* Sat Jan 27 2024 Fedora Release Engineering - 4.24-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Tue Dec 19 2023 Marian Koncek - 4.24-1 -- Update to upstream version 4.24 - -* Fri Sep 01 2023 Mikolaj Izdebski - 4.23-2 -- Rebuild - -* Thu Aug 17 2023 Marian Koncek - 4.23-1 -- Update to upstream version 4.23 - -* Sat Jul 22 2023 Fedora Release Engineering - 4.21-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 4.21-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Sep 09 2022 Marian Koncek - 4.21-1 -- Update to upstream version 4.21 - -* Sat Jul 23 2022 Fedora Release Engineering - 4.18-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Feb 05 2022 Jiri Vanek - 4.18-7 -- Rebuilt for java-17-openjdk as system jdk - -* Sat Jan 22 2022 Fedora Release Engineering - 4.18-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Nov 02 2021 Mikolaj Izdebski - 4.18-5 -- Set explicit Java compiler source/target levels to 1.7 - -* Fri Jul 23 2021 Fedora Release Engineering - 4.18-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon Jun 21 2021 Mikolaj Izdebski - 4.18-3 -- Enable xbean-finder -- Resolves: rhbz#1969297 - -* Mon May 17 2021 Mikolaj Izdebski - 4.18-2 -- Bootstrap build -- Non-bootstrap build - -* Wed Jan 27 2021 Fedora Release Engineering - 4.15-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jan 26 2021 Marian Koncek - 4.18-1 -- Update to upstream version 4.18 - -* Wed Sep 09 2020 Fabio Valentini - 4.15-6 -- Switch from log4j 1.2 compat package to log4j 1.2 API shim. - -* Wed Jul 29 2020 Marian Koncek - 4.17-1 -- Update to upsteam version 4.17 - -* Wed Jul 29 2020 Mat Booth - 4.15-5 -- Remove springframework conditionals, the deps are a long time removed from - Fedora and this simplifies the spec a bit -- Disable unused modules that can't build on JDK 11 - -* Sat Jul 11 2020 Jiri Vanek - 4.15-4 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Thu Jun 25 2020 Jeff Johnston - 4.15-3 -- Fix JVM as 1.8.0 as package cannot be built with Java 9 and above - -* Fri May 15 2020 Mikolaj Izdebski - 4.14-4 -- Remove dependency on log4j and commons-logging - -* Fri Jan 31 2020 Fedora Release Engineering - 4.15-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Nov 13 2019 Fabio Valentini - 4.15-1 -- Update to version 4.15. - -* Tue Nov 05 2019 Mikolaj Izdebski - 4.14-3 -- Mass rebuild for javapackages-tools 201902 - -* Tue Nov 05 2019 Mikolaj Izdebski - 4.14-2 -- Disable all modules except xbean-reflect - -* Wed Sep 18 2019 Fabio Valentini - 4.14-2 -- Migrate from the obsolete felix-osgi-core to osgi-core. - -* Tue Aug 20 2019 Fabio Valentini - 4.14-1 -- Update to version 4.14. - -* Sun Jul 28 2019 Fabio Valentini - 4.9-5 -- Disable support for spring and groovy. - -* Sat Jul 27 2019 Fedora Release Engineering - 4.9-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Tue Jul 09 2019 Fabio Valentini - 4.9-3 -- Disable eclipse equinox functionality to fix the FTBFS issue on 32bit arches. - -* Wed Jun 26 2019 Marian Koncek - 4.14-1 -- Update to upstream version 4.14 - -* Fri May 24 2019 Mikolaj Izdebski - 4.8-2 -- Mass rebuild for javapackages-tools 201901 - -* Sun Feb 03 2019 Fedora Release Engineering - 4.9-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Aug 07 2018 Michael Simacek - 4.9-1 -- Update to upstream version 4.9 - -* Sat Jul 14 2018 Fedora Release Engineering - 4.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Apr 19 2018 Michael Simacek - 4.8-1 -- Update to upstream version 4.8 - -* Tue Mar 13 2018 Michael Simacek - 4.6-1 -- Update to upstream version 4.6 - -* Fri Feb 09 2018 Fedora Release Engineering - 4.5-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 4.5-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 4.5-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Feb 1 2017 Mikolaj Izdebski - 4.5-6 -- Introduce groovy build conditional - -* Wed Feb 01 2017 Michael Simacek - 4.5-5 -- Fix build with conditionals - -* Wed Feb 01 2017 Michael Simacek - 4.5-4 -- Port to current QDox - -* Thu Jun 16 2016 Mikolaj Izdebski - 4.5-3 -- Add missing build-requires - -* Thu May 12 2016 Michael Simacek - 4.5-2 -- Enable xbean-asm-util - -* Mon May 02 2016 Michael Simacek - 4.5-1 -- Update to upstream version 4.5 - -* Fri Feb 05 2016 Fedora Release Engineering - 4.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Nov 24 2015 Michael Simacek - 4.4-1 -- Update to upstream version 4.4 -- Rebase patches -- Remove obsolete groovy patch - -* Mon Jul 13 2015 Mikolaj Izdebski - 4.3-1 -- Update to upstream version 4.3 - -* Fri Jun 19 2015 Fedora Release Engineering - 4.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Apr 1 2015 Mikolaj Izdebski - 4.2-1 -- Update to upstream version 4.2 - -* Thu Feb 5 2015 Mikolaj Izdebski - 4.1-2 -- Fix patch unshading ASM - -* Fri Nov 21 2014 Mikolaj Izdebski - 4.1-1 -- Update to upstream version 4.1 - -* Sun Jun 08 2014 Fedora Release Engineering - 3.17-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon Apr 14 2014 Mikolaj Izdebski - 3.17-1 -- Update to upstream version 3.17 -- Add patch for Eclipse Luna - -* Thu Dec 5 2013 Mikolaj Izdebski - 3.16-1 -- Update to upstream version 3.16 - -* Thu Aug 08 2013 Stanislav Ochotnicky - 3.13-4 -- Update to latest packaging guidelines - -* Sun Aug 04 2013 Fedora Release Engineering - 3.13-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Mon Apr 29 2013 Mikolaj Izdebski - 3.13-2 -- Remove unneeded BR: maven-idea-plugin - -* Fri Mar 15 2013 Michal Srb - 3.13-1 -- Update to upstream version 3.13 - -* Fri Feb 15 2013 Fedora Release Engineering - 3.12-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Feb 06 2013 Java SIG - 3.12-5 -- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild -- Replace maven BuildRequires with maven-local - -* Mon Dec 17 2012 Mikolaj Izdebski - 3.12-4 -- Enable xbean-spring, resolves rhbz#887496 -- Disable xbean-blueprint due to FTBFS - -* Mon Oct 22 2012 Mikolaj Izdebski - 3.12-3 -- Replace eclipse-rcp requires with eclipse-equinox-osgi -- Reenable Equinox - -* Tue Oct 16 2012 gil cattaneo - 3.12-2 -- Enable xbean-blueprint and xbean-classloader modules - -* Wed Oct 10 2012 Mikolaj Izdebski - 3.12-1 -- Update to upstream version 3.12 - -* Wed Oct 10 2012 Krzysztof Daniel 3.11.1-8 -- Revert previous changes. - -* Wed Oct 10 2012 Krzysztof Daniel 3.11.1-7 -- Disable parts dependent on Eclipse (for bootstraping purpose). - -* Wed Oct 10 2012 Mikolaj Izdebski - 3.11.1-6 -- Implement equinox and spring conditionals - -* Mon Sep 3 2012 Mikolaj Izdebski - 3.11.1-5 -- Fix eclipse requires - -* Mon Aug 27 2012 Mikolaj Izdebski - 3.11.1-4 -- Fix felix-framework enabling patch - -* Mon Aug 6 2012 Mikolaj Izdebski - 3.11.1-3 -- Enable xbean-spring -- Enable maven-xbean-plugin -- Remove RPM bug workaround - -* Sun Jul 22 2012 Fedora Release Engineering - 3.11.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Jul 13 2012 Mikolaj Izdebski - 3.11.1-1 -- Update to the upstream version 3.11.1 -- Force use of Equinox instead of Felix -- Convert patch to POM macros - -* Thu May 3 2012 Stanislav Ochotnicky - 3.8-5 -- Remove mx4j from deps (javax.management provided by JDK 1.5+) - -* Tue Apr 24 2012 Alexander Kurtakov 3.8-4 -- BR felix-framework instead of felix-osgi-core. - -* Tue Apr 24 2012 Alexander Kurtakov 3.8-3 -- Do not build equinox specific parts for RHEL. - -* Sat Jan 14 2012 Fedora Release Engineering - 3.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Dec 6 2011 Stanislav Ochotnicky - 3.8-1 -- Update to latest upstream version -- Build with maven 3 -- Packaging & guidelines fixes - -* Sat May 28 2011 Marek Goldmann - 3.7-7 -- Added xbean-finder and xbean-bundleutils submodules - -* Fri Mar 4 2011 Stanislav Ochotnicky - 3.7-6 -- Add comment for removing javadoc -- Fix maven 3 build - -* Mon Feb 07 2011 Fedora Release Engineering - 3.7-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Dec 6 2010 Stanislav Ochotnicky - 3.7-4 -- Fix pom filename (Resolves rhbz#655827) -- Add depmap for main pom file -- Fixes according to new guidelines (versionless jars, javadocs) - -* Fri Jul 30 2010 Stanislav Ochotnicky - 3.7-3 -- Use javadoc:aggregate to generate javadocs - -* Fri Jul 9 2010 Stanislav Ochotnicky - 3.7-2 -- Add license to javadoc subpackage - -* Mon Jun 21 2010 Stanislav Ochotnicky - 3.7-1 -- First release +%autochangelog From fc6e5b300c1d6453bc4144fc60e03ca18225d469 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Thu, 4 Sep 2025 17:31:51 +0200 Subject: [PATCH 11/14] manual bodhi update for jdk25 needed on selected pkgs From 1df289d87c3617482e813a5dac348b01c67d271f Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Mon, 5 Jan 2026 16:39:35 +0100 Subject: [PATCH 12/14] Bumped to jdk25 and skipped tests (fails) --- xbean.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xbean.spec b/xbean.spec index ffcce68..2499b2d 100644 --- a/xbean.spec +++ b/xbean.spec @@ -20,7 +20,7 @@ Obsoletes: %{name}-javadoc < 4.24-9 %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local-openjdk21 +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.osgi:org.osgi.core) @@ -74,7 +74,7 @@ rm -r xbean-finder/src/main/java/org/apache/xbean/finder{,/archive}/Bundle* sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apache/xbean/finder/archive/MJarJarArchiveTest.java %build -%mvn_build -j -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 +%mvn_build --force -j -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 %install %mvn_install From e58a9fa27a3df45dd370a65159b7324f286400b8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:28:14 +0000 Subject: [PATCH 13/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From ba8a4b3f3ea770d4fc2bc1fdf70709625712a354 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:01:39 +0000 Subject: [PATCH 14/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild