rpms/xbean
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to upstream version 4.6

Browse Source
This commit is contained in:
Michael Simacek 2018-03-13 13:18:12 +01:00
parent 641e6c0e45
commit 0615fa0b74
4 changed files with 14 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -9,3 +9,4 @@ xbean-3.7.tar.xz
/xbean-4.3-source-release.zip
/xbean-4.4-source-release.zip
/xbean-4.5-source-release.zip
/xbean-4.6-source-release.zip

35
0001-Unshade-ASM.patch
View File

@ -1,35 +0,0 @@
From 5b1a0fe4400bffddd1ab31af91beaef7bb560f6c Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Thu, 12 May 2016 11:40:13 +0200
Subject: [PATCH 1/3] Unshade ASM
---
.../org/apache/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 dea2f2a..303dfc3 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,12 +17,12 @@
*/
package org.apache.xbean.recipe;
-import org.apache.xbean.asm5.ClassReader;
-import org.apache.xbean.asm5.ClassVisitor;
-import org.apache.xbean.asm5.Label;
-import org.apache.xbean.asm5.MethodVisitor;
-import org.apache.xbean.asm5.Opcodes;
-import org.apache.xbean.asm5.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.Opcodes;
+import org.objectweb.asm.Type;
import java.io.IOException;
import java.io.InputStream;
--
2.9.3

2
sources
View File

@ -1 +1 @@
f9b31c472dc627f3d4bc7fd8a232def9 xbean-4.5-source-release.zip
SHA512 (xbean-4.6-source-release.zip) = 2a563945ff31bec6a4dc6c49c75e029bf0012cd248c18ff28dc49665b042d035ab40a739f17b48da21fa8978c4b7e6368fdf71341fbd1466b8e50b3d713a9eab

22
xbean.spec
View File

@ -5,8 +5,8 @@
%bcond_without spring
Name: xbean
Version: 4.5
Release: 9%{?dist}
Version: 4.6
Release: 1%{?dist}
Summary: Java plugin based web server
License: ASL 2.0
URL: http://geronimo.apache.org/xbean/
@ -14,8 +14,6 @@ BuildArch: noarch
Source0: http://repo2.maven.org/maven2/org/apache/%{name}/%{name}/%{version}/%{name}-%{version}-source-release.zip
# Fix dependency on xbean-asm4-shaded to original objectweb-asm
Patch0: 0001-Unshade-ASM.patch
# Compatibility with Eclipse Luna (rhbz#1087461)
Patch1: 0002-Port-to-Eclipse-Luna-OSGi.patch
Patch2: 0003-Port-to-QDox-2.0.patch
@ -105,7 +103,6 @@ This package provides %{summary}.
# build failing on this due to doxia-sitetools problems
rm src/site/site.xml
%patch0 -p1
%if %{with equinox}
%patch1 -p1
%endif
@ -114,13 +111,15 @@ rm src/site/site.xml
%pom_remove_parent
%pom_remove_dep mx4j:mx4j
%pom_remove_dep -r :xbean-asm5-shaded
# Unshade ASM
%pom_remove_dep -r :xbean-asm6-shaded
%pom_remove_dep -r :xbean-finder-shaded
%pom_disable_module xbean-asm5-shaded
%pom_disable_module xbean-asm6-shaded
%pom_disable_module xbean-finder-shaded
%pom_xpath_remove pom:scope xbean-asm-util
%pom_xpath_remove pom:optional xbean-asm-util
%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'`
# Prevent modules depending on springframework from building.
%if %{without spring}
@ -187,6 +186,9 @@ sed -i "s|</Private-Package>|</Private-Package-->|" xbean-blueprint/pom.xml
%doc LICENSE NOTICE
%changelog
* Tue Mar 13 2018 Michael Simacek <msimacek@redhat.com> - 4.6-1
- Update to upstream version 4.6
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.5-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild