diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore index 8b65bd9..47514da 100644 --- a/.gitignore +++ b/.gitignore @@ -1,24 +1,6 @@ -/results_* -/*.src.rpm - -/xbean-3.7.tar.xz +xbean-3.7.tar.xz /xbean-3.8.tar.xz /xbean-3.11.1.tar.xz /xbean-3.13-source-release.zip /xbean-3.16-source-release.zip /xbean-3.17-source-release.zip -/xbean-4.1-source-release.zip -/xbean-4.2-source-release.zip -/xbean-4.3-source-release.zip -/xbean-4.4-source-release.zip -/xbean-4.5-source-release.zip -/xbean-4.6-source-release.zip -/xbean-4.8-source-release.zip -/xbean-4.9-source-release.zip -/xbean-4.14-source-release.zip -/xbean-4.15-source-release.zip -/xbean-4.17-source-release.zip -/xbean-4.18-source-release.zip -/xbean-4.21-source-release.zip -/xbean-4.23-source-release.zip -/xbean-4.24-source-release.zip diff --git a/0001-Unbundle-ASM.patch b/0001-Unbundle-ASM.patch deleted file mode 100644 index eb40658..0000000 --- a/0001-Unbundle-ASM.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 4f7a61dcd47ed0dee2d78e31e2dd50b88ab42f25 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Thu, 12 Dec 2019 08:51:57 +0100 -Subject: [PATCH 2/3] Unbundle ASM - ---- - .../xbean/recipe/XbeanAsmParameterNameLoader.java | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java b/xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java -index 20b646c..9e96775 100644 ---- a/xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java -+++ b/xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java -@@ -17,11 +17,11 @@ - */ - package org.apache.xbean.recipe; - --import org.apache.xbean.asm9.ClassReader; --import org.apache.xbean.asm9.ClassVisitor; --import org.apache.xbean.asm9.Label; --import org.apache.xbean.asm9.MethodVisitor; --import org.apache.xbean.asm9.Type; -+import org.objectweb.asm.ClassReader; -+import org.objectweb.asm.ClassVisitor; -+import org.objectweb.asm.Label; -+import org.objectweb.asm.MethodVisitor; -+import org.objectweb.asm.Type; - - import java.io.IOException; - import java.io.InputStream; -@@ -36,7 +36,7 @@ import java.util.List; - import java.util.Map; - import java.util.WeakHashMap; - --import static org.apache.xbean.asm9.shade.commons.AsmConstants.ASM_VERSION; -+import static org.apache.xbean.asm9.original.commons.AsmConstants.ASM_VERSION; - - /** - * Implementation of ParameterNameLoader that uses ASM to read the parameter names from the local variable table in the --- -2.29.2 - diff --git a/0002-Remove-dependency-on-log4j-and-commons-logging.patch b/0002-Remove-dependency-on-log4j-and-commons-logging.patch deleted file mode 100644 index b1846ee..0000000 --- a/0002-Remove-dependency-on-log4j-and-commons-logging.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 28e37850d8343f44f82e3138c772dd65d1d0ff2f Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Thu, 12 Dec 2019 08:52:26 +0100 -Subject: [PATCH 3/3] Remove dependency on log4j and commons-logging - ---- - .../xbean/propertyeditor/PropertyEditorRegistry.java | 12 ------------ - 1 file changed, 12 deletions(-) - -diff --git a/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditorRegistry.java b/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditorRegistry.java -index e7e17edd..be302861 100644 ---- a/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditorRegistry.java -+++ b/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditorRegistry.java -@@ -84,18 +84,6 @@ public class PropertyEditorRegistry implements Closeable { - register(new VectorEditor()); - register(new WeakHashMapEditor()); - -- try { -- register(new Log4jConverter()); -- } catch (final Throwable e) { -- // no-op -- } -- -- try { -- register(new CommonsLoggingConverter()); -- } catch (final Throwable e) { -- // no-op -- } -- - return this; - } - --- -2.21.0 - diff --git a/changelog b/changelog deleted file mode 100644 index 549083e..0000000 --- a/changelog +++ /dev/null @@ -1,300 +0,0 @@ -* 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/ci.fmf b/ci.fmf deleted file mode 100644 index c5aa0e0..0000000 --- a/ci.fmf +++ /dev/null @@ -1 +0,0 @@ -resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index 0d484d7..0000000 --- a/gating.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- !Policy -product_versions: - - fedora-* -decision_contexts: - - bodhi_update_push_testing - - bodhi_update_push_stable -rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional} diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf deleted file mode 100644 index 075e436..0000000 --- a/plans/javapackages.fmf +++ /dev/null @@ -1,7 +0,0 @@ -summary: Run javapackages-specific tests -discover: - how: fmf - url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git - ref: main -execute: - how: tmt diff --git a/sources b/sources index 225cbe3..94d743b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xbean-4.24-source-release.zip) = c88fc635e6365335cb8b78b28ac1324be0970e0d2bc000f5f43ff40d4ce6fbed04a61006788873dc0819e8f80913f40b2da4b9b264c2fe81e78ffcde5dd85e65 +5b30546ef2478d31c787079072bf9def xbean-3.17-source-release.zip diff --git a/xbean-asm4-unshade.patch b/xbean-asm4-unshade.patch new file mode 100644 index 0000000..70ca3f6 --- /dev/null +++ b/xbean-asm4-unshade.patch @@ -0,0 +1,46 @@ +--- xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java~ 2014-04-14 13:00:42.025851035 +0200 ++++ xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java 2014-04-14 13:01:13.794418041 +0200 +@@ -17,12 +17,12 @@ + */ + package org.apache.xbean.recipe; + +-import org.apache.xbean.asm5.shade.commons.EmptyVisitor; +-import org.apache.xbean.asm5.ClassReader; +-import org.apache.xbean.asm5.Label; +-import org.apache.xbean.asm5.MethodVisitor; +-import org.apache.xbean.asm5.Opcodes; +-import org.apache.xbean.asm5.Type; ++import org.objectweb.asm.ClassReader; ++import org.objectweb.asm.ClassVisitor; ++import org.objectweb.asm.Label; ++import org.objectweb.asm.MethodVisitor; ++import org.objectweb.asm.Opcodes; ++import org.objectweb.asm.Type; + + import java.io.IOException; + import java.io.InputStream; +@@ -211,7 +211,7 @@ + } + } + +- private static class AllParameterNamesDiscoveringVisitor extends EmptyVisitor { ++ private static class AllParameterNamesDiscoveringVisitor extends ClassVisitor { + private final Map> constructorParameters = new HashMap>(); + private final Map> methodParameters = new HashMap>(); + private final Map exceptions = new HashMap(); +@@ -220,6 +220,7 @@ + private final Map constructorMap = new HashMap(); + + public AllParameterNamesDiscoveringVisitor(Class type, String methodName) { ++ super(Opcodes.ASM4); + this.methodName = methodName; + + List methods = new ArrayList(Arrays.asList(type.getMethods())); +@@ -232,6 +233,7 @@ + } + + public AllParameterNamesDiscoveringVisitor(Class type) { ++ super(Opcodes.ASM4); + this.methodName = ""; + + List constructors = new ArrayList(Arrays.asList(type.getConstructors())); diff --git a/xbean-luna.patch b/xbean-luna.patch new file mode 100644 index 0000000..ae4db5d --- /dev/null +++ b/xbean-luna.patch @@ -0,0 +1,16 @@ +--- xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/DelegatingBundleContext.java~ 2014-04-14 13:39:32.316688191 +0200 ++++ xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/DelegatingBundleContext.java 2014-04-14 13:39:41.973106769 +0200 +@@ -153,5 +153,13 @@ + public Bundle getBundle(String location) { + return bundleContext.getBundle(location); + } ++ ++ public org.osgi.framework.ServiceObjects getServiceObjects(ServiceReference reference) { ++ return bundleContext.getServiceObjects(reference); ++ } ++ ++ public ServiceRegistration registerService(Class clazz, org.osgi.framework.ServiceFactory factory, Dictionary properties) { ++ return bundleContext.registerService(clazz, factory, properties); ++ } + + } diff --git a/xbean.depmap b/xbean.depmap new file mode 100644 index 0000000..25ffb7f --- /dev/null +++ b/xbean.depmap @@ -0,0 +1,50 @@ + + + + org.osgi + org.osgi.core + 4.2.0 + + + JPP/felix + org.osgi.core + 1.2.0 + + + + + asm + asm-commons + 3.1 + + + JPP/objectweb-asm + asm-commons + 3.2 + + + + + asm + asm + 3.1 + + + JPP/objectweb-asm + asm + 3.2 + + + + + asm + asm-tree + 3.1 + + + JPP/objectweb-asm + asm-tree + 3.2 + + + diff --git a/xbean.spec b/xbean.spec index 2499b2d..a8434cf 100644 --- a/xbean.spec +++ b/xbean.spec @@ -1,32 +1,68 @@ -%bcond_with bootstrap +# Conditionals to help breaking eclipse <-> xbean dependency cycle +# when bootstrapping for new architectures +%if 0%{?fedora} +%bcond_without equinox +%bcond_without spring +%endif Name: xbean -Version: 4.24 -Release: %autorelease -Summary: Java plugin based web server -License: Apache-2.0 -URL: https://geronimo.apache.org/xbean/ +Version: 3.17 BuildArch: noarch -ExclusiveArch: %{java_arches} noarch -Source0: https://repo1.maven.org/maven2/org/apache/%{name}/%{name}/%{version}/%{name}-%{version}-source-release.zip +Release: 2%{?dist} +Summary: Java plugin based web server -Patch: 0001-Unbundle-ASM.patch -Patch: 0002-Remove-dependency-on-log4j-and-commons-logging.patch +License: ASL 2.0 +URL: http://geronimo.apache.org/xbean/ -# TODO Remove in Fedora 47 -Obsoletes: %{name}-javadoc < 4.24-9 +Source0: http://repo2.maven.org/maven2/org/apache/%{name}/%{name}/%{version}/%{name}-%{version}-source-release.zip -%if %{with bootstrap} -BuildRequires: javapackages-bootstrap +# Fix dependency on xbean-asm4-shaded to original objectweb-asm +Patch0: %{name}-asm4-unshade.patch +# Compatibility with Eclipse Luna (rhbz#1087461) +Patch1: %{name}-luna.patch + +BuildRequires: java-devel +BuildRequires: apache-commons-beanutils +BuildRequires: apache-commons-logging +BuildRequires: objectweb-asm +BuildRequires: ant +BuildRequires: qdox +BuildRequires: slf4j +BuildRequires: maven-local +BuildRequires: maven-plugin-bundle +BuildRequires: maven-antrun-plugin +BuildRequires: maven-compiler-plugin +BuildRequires: maven-dependency-plugin +BuildRequires: maven-install-plugin +BuildRequires: maven-javadoc-plugin +BuildRequires: maven-resources-plugin +BuildRequires: maven-surefire-plugin +BuildRequires: maven-site-plugin +BuildRequires: maven-shade-plugin +%if %{with equinox} +BuildRequires: eclipse-equinox-osgi %else -BuildRequires: maven-local-openjdk25 -BuildRequires: mvn(junit:junit) -BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.osgi:org.osgi.core) -BuildRequires: mvn(org.ow2.asm:asm) -BuildRequires: mvn(org.ow2.asm:asm-commons) -BuildRequires: mvn(org.slf4j:slf4j-api) +BuildRequires: felix-framework +%endif +%if %{with spring} +BuildRequires: apache-commons-jexl +BuildRequires: aries-blueprint +# test deps BuildRequires: cglib +BuildRequires: felix-osgi-compendium +BuildRequires: felix-osgi-core +BuildRequires: geronimo-annotation +BuildRequires: pax-logging + +BuildRequires: maven-archiver +BuildRequires: maven-plugin-plugin +BuildRequires: maven-project +BuildRequires: plexus-archiver +BuildRequires: plexus-utils +BuildRequires: springframework +BuildRequires: springframework-beans +BuildRequires: springframework-context +BuildRequires: springframework-web %endif %description @@ -38,48 +74,237 @@ support for running with no IoC system, JMX without JMX code, lifecycle and class loader management, and a rock solid Spring integration. +%if %{with spring} +# For now blueprint module fails to compile. Disable it. +%if 0 +%package blueprint +Summary: Schema-driven namespace handler for Apache Aries Blueprint + +%description blueprint +This package provides %{summary}. +%endif + +%package classloader +Summary: A flexibie multi-parent classloader + +%description classloader +This package provides %{summary}. + +%package spring +Summary: Schema-driven namespace handler for spring contexts +Requires: %{name} = %{version}-%{release} + +%description spring +This package provides %{summary}. + +%package -n maven-%{name}-plugin +Summary: XBean plugin for Apache Maven + +%description -n maven-%{name}-plugin +This package provides %{summary}. +%endif + +%package javadoc +Summary: API documentation for %{name} + +%description javadoc +This package provides %{summary}. + %prep -%autosetup -p1 -C +%setup -q +# build failing on this due to doxia-sitetools problems +rm src/site/site.xml -cp xbean-asm-util/src/main/java/org/apache/xbean/asm9/original/commons/AsmConstants.java xbean-reflect/src/main/java/org/apache/xbean/recipe/ +%patch0 +%patch1 -# Parent POM is not packaged %pom_remove_parent +%pom_remove_dep mx4j:mx4j +%pom_remove_dep :xbean-asm5-shaded xbean-reflect -%pom_disable_module xbean-classloader -%pom_disable_module xbean-classpath -%pom_disable_module xbean-bundleutils -%pom_disable_module xbean-asm9-shaded +# These aren't needed for now +%pom_disable_module xbean-asm5-shaded %pom_disable_module xbean-finder-shaded -%pom_disable_module xbean-naming -%pom_disable_module xbean-blueprint -%pom_disable_module xbean-spring %pom_disable_module xbean-telnet -%pom_disable_module maven-xbean-plugin -%pom_remove_dep :commons-logging-api xbean-reflect -%pom_remove_dep :log4j xbean-reflect -%pom_remove_dep :xbean-asm9-shaded xbean-reflect -find -name CommonsLoggingConverter.java -delete -find -name Log4jConverter.java -delete +# Prevent modules depending on springframework from building. +%if %{without spring} + %pom_remove_dep org.springframework: + #%%pom_disable_module xbean-blueprint + %pom_disable_module xbean-classloader + %pom_disable_module xbean-spring + %pom_disable_module maven-xbean-plugin +%else + %mvn_package :xbean-classloader classloader + %mvn_package :xbean-spring spring + %mvn_package :maven-xbean-plugin maven-xbean-plugin +%endif +# blueprint FTBFS, disable for now +%pom_disable_module xbean-blueprint -# Plugins useful for upstream only +# Replace generic OSGi dependencies with either Equinox or Felix +%pom_remove_dep :org.osgi.core xbean-bundleutils +%pom_remove_dep org.eclipse:osgi xbean-bundleutils +%if %{with equinox} + %pom_add_dep org.eclipse.osgi:org.eclipse.osgi xbean-bundleutils +%else + rm -rf xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/equinox/ + %pom_add_dep org.apache.felix:org.apache.felix.framework xbean-bundleutils +%endif + +# maven-xbean-plugin invocation makes no sense as there are no namespaces +%pom_remove_plugin :maven-xbean-plugin xbean-classloader + +# As auditing tool RAT is useful for upstream only. %pom_remove_plugin :apache-rat-plugin -%pom_remove_plugin :maven-source-plugin -%pom_remove_dep :xbean-bundleutils xbean-finder -rm -r xbean-finder/src/main/java/org/apache/xbean/finder{,/archive}/Bundle* +# disable copy of internal aries-blueprint +sed -i "s|||" xbean-blueprint/pom.xml -# Disable one test that fails on JVM 11 -sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apache/xbean/finder/archive/MJarJarArchiveTest.java +# Fix ant groupId +find -name pom.xml -exec sed -i "s|ant|org.apache.ant|" {} \; +# Fix cglib artifactId +find -name pom.xml -exec sed -i "s|cglib-nodep|cglib|" {} \; %build -%mvn_build --force -j -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 +%mvn_build -f %install %mvn_install %files -f .mfiles -%license LICENSE NOTICE +%doc LICENSE NOTICE +%dir %{_javadir}/%{name} -%autochangelog +%if %{with spring} +%if 0 +%files blueprint -f .mfiles-blueprint +%doc LICENSE NOTICE %{name}-blueprint/target/restaurant.xsd* +%endif + +%files classloader -f .mfiles-classloader +%doc LICENSE NOTICE + +%files spring -f .mfiles-spring +%doc LICENSE NOTICE + +%files -n maven-%{name}-plugin -f .mfiles-maven-%{name}-plugin +%doc LICENSE NOTICE +%endif + +%files javadoc -f .mfiles-javadoc +%doc LICENSE NOTICE + +%changelog +* 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