PR#3: update to version 4.14 - rpms/xbean

rpms / xbean

#3 update to version 4.14

Merged 4 years ago by decathorpe. Opened 4 years ago by decathorpe.

Unknown source master into master

Fabio Valentini • 4 years ago

4e35e4c

.gitignore

file modified

		`@@ -15,3 +15,4 @@`
		`/xbean-4.6-source-release.zip`
		`/xbean-4.8-source-release.zip`
		`/xbean-4.9-source-release.zip`
		`+ /xbean-4.14-source-release.zip`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (xbean-4.9-source-release.zip) = 6682ae485bb14740eaf6d211f847f8c0eed55aa7cb57d1e05e0af896d7bb1c4085db8a1311374683d75d1b390329883a18484dc02077c10a2b04e13985826f76`
		`+ SHA512 (xbean-4.14-source-release.zip) = 1aaf9315d4f75a53b3a18da4f56d0737dbee75aa1516491aeea6d2d1b247fdcadc173c8b494efd2758e880b2512f7c015076322a57913ad1a491ea3871f9e5e1`

xbean.spec

file modified

+8 -7

		`@@ -4,8 +4,8 @@`

		`Name: xbean`
		`Summary: Java plugin based web server`
		`- Version: 4.9`
		`- Release: 5%{?dist}`
		`+ Version: 4.14`
		`+ Release: 1%{?dist}`
		`License: ASL 2.0`

		`URL: http://geronimo.apache.org/xbean/`
		`@@ -23,7 +23,6 @@`
		`BuildRequires: mvn(log4j:log4j:1.2.12)`
		`BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)`
		`BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin)`
		`- BuildRequires: mvn(org.apache.xbean:xbean-asm-util)`
		`BuildRequires: mvn(org.osgi:org.osgi.core)`
		`BuildRequires: mvn(org.ow2.asm:asm)`
		`BuildRequires: mvn(org.ow2.asm:asm-commons)`
		`@@ -114,14 +113,14 @@`
		`%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.`
		`%if %{without spring}`
		`@@ -169,7 +168,6 @@`

		`%files -f .mfiles`
		`%doc LICENSE NOTICE`
		`- %dir %{_javadir}/%{name}`

		`%if %{with spring}`
		`%files blueprint -f .mfiles-blueprint`
		`@@ -190,6 +188,9 @@`


		`%changelog`
		`+ * Tue Aug 20 2019 Fabio Valentini <decathorpe@gmail.com> - 4.14-1`
		`+ - Update to version 4.14.`
		`+`
		`* Sun Jul 28 2019 Fabio Valentini <decathorpe@gmail.com> - 4.9-5`
		`- Disable support for spring and groovy.`