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

Update to upstream version 3.16

Browse Source
This commit is contained in:
Mikolaj Izdebski 2013-12-05 12:28:39 +01:00
parent b9433e80c4
commit 6eb71d50f2
4 changed files with 64 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -2,3 +2,4 @@ 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

2
sources
View File

@ -1 +1 @@
1d2641559f39a32747b5cd23acfbe1b2 xbean-3.13-source-release.zip
6b63160673fa34c87068f2f6f78551b8 xbean-3.16-source-release.zip

46
xbean-asm4-unshade.patch Normal file
View File

@ -0,0 +1,46 @@
--- xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java~ 2013-11-13 22:39:12.000000000 +0100
+++ xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java 2013-12-05 13:46:32.916772376 +0100
@@ -17,12 +17,12 @@
*/
package org.apache.xbean.recipe;
-import org.apache.xbean.asm4.ClassReader;
-import org.apache.xbean.asm4.Label;
-import org.apache.xbean.asm4.MethodVisitor;
-import org.apache.xbean.asm4.Opcodes;
-import org.apache.xbean.asm4.Type;
-import org.apache.xbean.asm4.shade.commons.EmptyVisitor;
+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;
@@ -211,7 +211,7 @@
}
}
- private static class AllParameterNamesDiscoveringVisitor extends EmptyVisitor {
+ private static class AllParameterNamesDiscoveringVisitor extends ClassVisitor {
private final Map<Constructor,List<String>> constructorParameters = new HashMap<Constructor,List<String>>();
private final Map<Method,List<String>> methodParameters = new HashMap<Method,List<String>>();
private final Map<String,Exception> exceptions = new HashMap<String,Exception>();
@@ -220,6 +220,7 @@
private final Map<String,Constructor> constructorMap = new HashMap<String,Constructor>();
public AllParameterNamesDiscoveringVisitor(Class type, String methodName) {
+ super(Opcodes.ASM4);
this.methodName = methodName;
List<Method> methods = new ArrayList<Method>(Arrays.asList(type.getMethods()));
@@ -232,6 +233,7 @@
}
public AllParameterNamesDiscoveringVisitor(Class type) {
+ super(Opcodes.ASM4);
this.methodName = "<init>";
List<Constructor> constructors = new ArrayList<Constructor>(Arrays.asList(type.getConstructors()));

23
xbean.spec
View File

@ -6,10 +6,10 @@
%endif
Name: xbean
Version: 3.13
Version: 3.16
BuildArch: noarch
Release: 4%{?dist}
Release: 1%{?dist}
Summary: Java plugin based web server
License: ASL 2.0
@ -17,6 +17,9 @@ URL: http://geronimo.apache.org/xbean/
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: %{name}-asm4-unshade.patch
BuildRequires: java-devel
BuildRequires: apache-commons-beanutils
BuildRequires: apache-commons-logging
@ -110,12 +113,15 @@ This package provides %{summary}.
# build failing on this due to doxia-sitetools problems
rm src/site/site.xml
%patch0
%pom_remove_parent
%pom_remove_dep mx4j:mx4j
%pom_remove_dep :xbean-asm-shaded xbean-reflect
%pom_remove_dep :xbean-asm4-shaded xbean-reflect
# These aren't needed for now
%pom_disable_module xbean-asm-shaded
%pom_disable_module xbean-asm4-shaded
%pom_disable_module xbean-finder-shaded
%pom_disable_module xbean-telnet
@ -134,7 +140,6 @@ rm src/site/site.xml
# blueprint FTBFS, disable for now
%pom_disable_module xbean-blueprint
# Replace generic OSGi dependencies with either Equinox or Felix
%pom_remove_dep :org.osgi.core xbean-bundleutils
%pom_remove_dep org.eclipse:osgi xbean-bundleutils
@ -145,10 +150,11 @@ rm src/site/site.xml
%pom_add_dep org.apache.felix:org.apache.felix.framework xbean-bundleutils
%endif
# maven-xbean-plugin invocation makes no sense as there are no namespaces
%pom_remove_plugin :maven-xbean-plugin xbean-classloader
# Fix dependency on xbean-asm-shaded to original objectweb-asm
sed -i 's/org.apache.xbean.asm/org.objectweb.asm/' \
xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java
# As auditing tool RAT is useful for upstream only.
%pom_remove_plugin :apache-rat-plugin
# disable copy of internal aries-blueprint
sed -i "s|<Private-Package>|<!--Private-Package>|" xbean-blueprint/pom.xml
@ -189,6 +195,9 @@ find -name pom.xml -exec sed -i "s|<artifactId>cglib-nodep</artifactId>|<artifac
%doc LICENSE NOTICE
%changelog
* Thu Dec 5 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.16-1
- Update to upstream version 3.16
* Thu Aug 08 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.13-4
- Update to latest packaging guidelines