Update to upstream version 4.14

This commit is contained in:
Marian Koncek 2019-06-27 10:06:59 +02:00
parent 34576dc0b5
commit e1f29279a4
3 changed files with 10 additions and 10 deletions

1
.gitignore vendored
View File

@ -11,3 +11,4 @@ xbean-3.7.tar.xz
/xbean-4.5-source-release.zip
/xbean-4.6-source-release.zip
/xbean-4.8-source-release.zip
/xbean-4.14-source-release.zip

View File

@ -1 +1 @@
SHA512 (xbean-4.8-source-release.zip) = 349f1becc801b180710b14f3f0cf6c148e08c0fc50078a754ee2f8e204c2e87ef430ddd8240db03b64618465080bad09f76c283504620c514db99ee03d56dd54
SHA512 (xbean-4.14-source-release.zip) = 1aaf9315d4f75a53b3a18da4f56d0737dbee75aa1516491aeea6d2d1b247fdcadc173c8b494efd2758e880b2512f7c015076322a57913ad1a491ea3871f9e5e1

View File

@ -2,8 +2,8 @@
# when bootstrapping for new architectures
Name: xbean
Version: 4.8
Release: 2%{?dist}
Version: 4.14
Release: 1%{?dist}
Summary: Java plugin based web server
License: ASL 2.0
URL: http://geronimo.apache.org/xbean/
@ -25,9 +25,6 @@ BuildRequires: mvn(org.ow2.asm:asm)
BuildRequires: mvn(org.ow2.asm:asm-commons)
BuildRequires: mvn(org.slf4j:slf4j-api)
%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
@ -55,14 +52,14 @@ rm src/site/site.xml
%pom_remove_dep mx4j:mx4j
# Unshade ASM
%pom_remove_dep -r :xbean-asm6-shaded
%pom_remove_dep -r :xbean-asm7-shaded
%pom_remove_dep -r :xbean-finder-shaded
%pom_disable_module xbean-asm6-shaded
%pom_disable_module xbean-asm7-shaded
%pom_disable_module xbean-finder-shaded
%pom_add_dep org.apache.xbean:xbean-asm-util:%{version} xbean-reflect
%pom_xpath_remove pom:optional xbean-reflect xbean-asm-util
%pom_xpath_remove 'pom:scope[text()="provided"]' xbean-reflect xbean-asm-util
sed -i 's/org\.apache\.xbean\.asm6/org.objectweb.asm/g' `find xbean-reflect -name '*.java'`
sed -i 's/org\.apache\.xbean\.asm7/org.objectweb.asm/g' `find xbean-reflect -name '*.java'`
# Prevent modules depending on springframework from building.
%pom_remove_dep org.springframework:
@ -97,13 +94,15 @@ sed -i "s|</Private-Package>|</Private-Package-->|" xbean-blueprint/pom.xml
%files -f .mfiles
%doc LICENSE NOTICE
%dir %{_javadir}/%{name}
%files javadoc -f .mfiles-javadoc
%doc LICENSE NOTICE
%changelog
* Wed Jun 26 2019 Marian Koncek <mkoncek@redhat.com> - 4.14-1
- Update to upstream version 4.14
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.8-2
- Mass rebuild for javapackages-tools 201901