From c60bea18c2d413d8f2041f39ce95bc058cf2be7f Mon Sep 17 00:00:00 2001 From: Adam Samalik Date: Fri, 5 May 2023 22:13:09 +0200 Subject: [PATCH] import sources --- .gitignore | 1 + .xbean.metadata | 1 + 0001-Remove-unused-import.patch | 25 ++ 0002-Unbundle-ASM.patch | 42 +++ ...endency-on-log4j-and-commons-logging.patch | 35 ++ sources | 1 + xbean.spec | 353 ++++++++++++++++++ 7 files changed, 458 insertions(+) create mode 100644 .gitignore create mode 100644 .xbean.metadata create mode 100644 0001-Remove-unused-import.patch create mode 100644 0002-Unbundle-ASM.patch create mode 100644 0003-Remove-dependency-on-log4j-and-commons-logging.patch create mode 100644 sources create mode 100644 xbean.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0a0f0d0 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/xbean-4.18-source-release.zip diff --git a/.xbean.metadata b/.xbean.metadata new file mode 100644 index 0000000..45cca2b --- /dev/null +++ b/.xbean.metadata @@ -0,0 +1 @@ +3dd044457b459b0114bf218c52ff6af4d7bf7001 xbean-4.18-source-release.zip diff --git a/0001-Remove-unused-import.patch b/0001-Remove-unused-import.patch new file mode 100644 index 0000000..c0a9a2f --- /dev/null +++ b/0001-Remove-unused-import.patch @@ -0,0 +1,25 @@ +From c7b2913a7d552929a3182901466db69ba40e4340 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Thu, 12 Dec 2019 08:51:36 +0100 +Subject: [PATCH 1/3] Remove unused import + +--- + .../java/org/apache/xbean/propertyeditor/PropertyEditors.java | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java b/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java +index dda3bf4d..5c6285f2 100644 +--- a/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java ++++ b/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java +@@ -19,8 +19,6 @@ package org.apache.xbean.propertyeditor; + import java.beans.PropertyEditorManager; + import java.lang.reflect.Type; + +-import com.sun.org.apache.regexp.internal.RE; +- + /** + * The property editor manager. This orchestrates Geronimo usage of + * property editors, allowing additional search paths to be added and +-- +2.21.0 + diff --git a/0002-Unbundle-ASM.patch b/0002-Unbundle-ASM.patch new file mode 100644 index 0000000..eb40658 --- /dev/null +++ b/0002-Unbundle-ASM.patch @@ -0,0 +1,42 @@ +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/0003-Remove-dependency-on-log4j-and-commons-logging.patch b/0003-Remove-dependency-on-log4j-and-commons-logging.patch new file mode 100644 index 0000000..b1846ee --- /dev/null +++ b/0003-Remove-dependency-on-log4j-and-commons-logging.patch @@ -0,0 +1,35 @@ +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/sources b/sources new file mode 100644 index 0000000..fcc3e67 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (xbean-4.18-source-release.zip) = 766746caa4f9ea87ceff1af1fe052481a9478cab4754b18cb7c760fb9dc466e5fd85533f2040583c3378cf36a4e17ba357d48060896af86a933916008cb2dda6 diff --git a/xbean.spec b/xbean.spec new file mode 100644 index 0000000..e989ce0 --- /dev/null +++ b/xbean.spec @@ -0,0 +1,353 @@ +%bcond_with bootstrap + +Name: xbean +Version: 4.18 +Release: 8%{?dist} +Summary: Java plugin based web server +License: ASL 2.0 +URL: https://geronimo.apache.org/xbean/ +BuildArch: noarch +ExclusiveArch: %{java_arches} noarch + +Source0: https://repo1.maven.org/maven2/org/apache/%{name}/%{name}/%{version}/%{name}-%{version}-source-release.zip + +Patch1: 0001-Remove-unused-import.patch +Patch2: 0002-Unbundle-ASM.patch +Patch3: 0003-Remove-dependency-on-log4j-and-commons-logging.patch + +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else +BuildRequires: maven-local +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) +%endif + +%description +The goal of XBean project is to create a plugin based server +analogous to Eclipse being a plugin based IDE. XBean will be able to +discover, download and install server plugins from an Internet based +repository. In addition, we include support for multiple IoC systems, +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 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 + +cp xbean-asm-util/src/main/java/org/apache/xbean/asm9/original/commons/AsmConstants.java xbean-reflect/src/main/java/org/apache/xbean/recipe/ + +# Parent POM is not packaged +%pom_remove_parent + +%pom_disable_module xbean-classloader +%pom_disable_module xbean-classpath +%pom_disable_module xbean-bundleutils +%pom_disable_module xbean-asm9-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 + +# Plugins 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 one test that fails on JDK 11 +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.7 -Dmaven.compiler.target=1.7 + +%install +%mvn_install + +%files -f .mfiles +%license LICENSE NOTICE + +%files javadoc -f .mfiles-javadoc +%license LICENSE NOTICE + +%changelog +* 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