SPECS/xbean.spec

@@ -2,12 +2,11 @@
 
 Name:           xbean
 Version:        4.18
-Release:        9%{?dist}
+Release:        5%{?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
 
@@ -15,16 +14,14 @@ Patch1:         0001-Remove-unused-import.patch
 Patch2:         0002-Unbundle-ASM.patch
 Patch3:         0003-Remove-dependency-on-log4j-and-commons-logging.patch
 
+BuildRequires:  maven-local
 %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
@@ -53,17 +50,6 @@ cp xbean-asm-util/src/main/java/org/apache/xbean/asm9/original/commons/AsmConsta
 # 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
@@ -74,14 +60,8 @@ find -name Log4jConverter.java -delete
 %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
+%mvn_build -- -f xbean-reflect
 
 %install
 %mvn_install
@@ -93,30 +73,15 @@ sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apac
 %license LICENSE NOTICE
 
 %changelog
-* Mon Apr 08 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 4.18-9
-- Rebuilt for MSVSphere 9.4 beta
-
-* Mon Feb 05 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.18-9
-- Rebuild to regenerate auto-requires
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.18-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 4.18-7
-- Rebuilt for java-17-openjdk as system jdk
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.18-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.18-5
-- Set explicit Java compiler source/target levels to 1.7
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 4.18-5
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.18-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.18-4
+- Rebuild to workaround DistroBaker issue
 
-* Mon Jun 21 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.18-3
-- Enable xbean-finder
-- Resolves: rhbz#1969297
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.18-3
+- Bootstrap Maven for CentOS Stream 9
 
 * Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.18-2
 - Bootstrap build