Compare commits

...

No commits in common. 'stream-javapackages-tools-202201-rhel-9.1.0' and 'c9' have entirely different histories.

22
.gitignore vendored

@ -1,21 +1 @@
/results_* SOURCES/xbean-4.18-source-release.zip
/*.src.rpm
/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

@ -0,0 +1 @@
3dd044457b459b0114bf218c52ff6af4d7bf7001 SOURCES/xbean-4.18-source-release.zip

@ -2,12 +2,11 @@
Name: xbean Name: xbean
Version: 4.18 Version: 4.18
Release: 8%{?dist} Release: 5%{?dist}
Summary: Java plugin based web server Summary: Java plugin based web server
License: ASL 2.0 License: ASL 2.0
URL: https://geronimo.apache.org/xbean/ URL: https://geronimo.apache.org/xbean/
BuildArch: noarch BuildArch: noarch
ExclusiveArch: %{java_arches} noarch
Source0: https://repo1.maven.org/maven2/org/apache/%{name}/%{name}/%{version}/%{name}-%{version}-source-release.zip 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 Patch2: 0002-Unbundle-ASM.patch
Patch3: 0003-Remove-dependency-on-log4j-and-commons-logging.patch Patch3: 0003-Remove-dependency-on-log4j-and-commons-logging.patch
BuildRequires: maven-local
%if %{with bootstrap} %if %{with bootstrap}
BuildRequires: javapackages-bootstrap BuildRequires: javapackages-bootstrap
%else %else
BuildRequires: maven-local
BuildRequires: mvn(junit:junit) BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) 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)
BuildRequires: mvn(org.ow2.asm:asm-commons) BuildRequires: mvn(org.ow2.asm:asm-commons)
BuildRequires: mvn(org.slf4j:slf4j-api)
%endif %endif
%description %description
@ -53,17 +50,6 @@ cp xbean-asm-util/src/main/java/org/apache/xbean/asm9/original/commons/AsmConsta
# Parent POM is not packaged # Parent POM is not packaged
%pom_remove_parent %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 :commons-logging-api xbean-reflect
%pom_remove_dep :log4j xbean-reflect %pom_remove_dep :log4j xbean-reflect
%pom_remove_dep :xbean-asm9-shaded 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 :apache-rat-plugin
%pom_remove_plugin :maven-source-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 %build
%mvn_build -- -Dmaven.compiler.source=1.7 -Dmaven.compiler.target=1.7 %mvn_build -- -f xbean-reflect
%install %install
%mvn_install %mvn_install
@ -93,24 +73,15 @@ sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apac
%license LICENSE NOTICE %license LICENSE NOTICE
%changelog %changelog
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.18-8 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 4.18-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* 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
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.18-4 * Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.18-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - Rebuild to workaround DistroBaker issue
* Mon Jun 21 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.18-3 * Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.18-3
- Enable xbean-finder - Bootstrap Maven for CentOS Stream 9
- Resolves: rhbz#1969297
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.18-2 * Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.18-2
- Bootstrap build - Bootstrap build

@ -1 +0,0 @@
SHA512 (xbean-4.18-source-release.zip) = 766746caa4f9ea87ceff1af1fe052481a9478cab4754b18cb7c760fb9dc466e5fd85533f2040583c3378cf36a4e17ba357d48060896af86a933916008cb2dda6
Loading…
Cancel
Save