Update to upsteam version 4.17

.gitignore

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

0002-Unbundle-ASM.patch

@@ -4,32 +4,46 @@ Date: Thu, 12 Dec 2019 08:51:57 +0100
 Subject: [PATCH 2/3] Unbundle ASM
 
 ---
- .../xbean/recipe/XbeanAsmParameterNameLoader.java    | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
+ .../xbean/recipe/XbeanAsmParameterNameLoader.java  | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 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 7ced2653..1d4b00bc 100644
+index 0da1987..a507156 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 @@
+@@ -17,11 +17,11 @@
   */
  package org.apache.xbean.recipe;
  
--import org.apache.xbean.asm7.ClassReader;
--import org.apache.xbean.asm7.ClassVisitor;
--import org.apache.xbean.asm7.Label;
--import org.apache.xbean.asm7.MethodVisitor;
--import org.apache.xbean.asm7.Opcodes;
--import org.apache.xbean.asm7.Type;
+-import org.apache.xbean.asm8.ClassReader;
+-import org.apache.xbean.asm8.ClassVisitor;
+-import org.apache.xbean.asm8.Label;
+-import org.apache.xbean.asm8.MethodVisitor;
+-import org.apache.xbean.asm8.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;
+@@ -36,7 +36,7 @@ import java.util.List;
+ import java.util.Map;
+ import java.util.WeakHashMap;
+ 
+-import static org.apache.xbean.asm8.shade.commons.AsmConstants.ASM_VERSION;
++import static org.apache.xbean.asm8.original.commons.AsmConstants.ASM_VERSION;
+ 
+ /**
+  * Implementation of ParameterNameLoader that uses ASM to read the parameter names from the local variable table in the
+@@ -315,4 +315,4 @@ public class XbeanAsmParameterNameLoader implements ParameterNameLoader {
+             return null;
+         }
+     }
+-}
+\ No newline at end of file
++}
 -- 
-2.21.0
+2.25.4
 

sources

@@ -1 +1 @@
-SHA512 (xbean-4.14-source-release.zip) = 1aaf9315d4f75a53b3a18da4f56d0737dbee75aa1516491aeea6d2d1b247fdcadc173c8b494efd2758e880b2512f7c015076322a57913ad1a491ea3871f9e5e1
+SHA512 (xbean-4.17-source-release.zip) = 0cc86b846f4eb797649cb3229c2eac5d37d6549f1a7ac8bf3f85b873b3cd2d5db837387ac1891d257f46613c925e3f331fcb63c5a80bf0b1a8004b31031de5c8

xbean.spec

@@ -1,12 +1,12 @@
 Name:           xbean
-Version:        4.14
-Release:        4%{?dist}
+Version:        4.17
+Release:        1%{?dist}
 Summary:        Java plugin based web server
 License:        ASL 2.0
-URL:            http://geronimo.apache.org/xbean/
+URL:            https://geronimo.apache.org/xbean/
 BuildArch:      noarch
 
-Source0:        http://repo2.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
 
 Patch1:         0001-Remove-unused-import.patch
 Patch2:         0002-Unbundle-ASM.patch
@@ -27,7 +27,6 @@ support for running with no IoC system, JMX without JMX code,
 lifecycle and class loader management, and a rock solid Spring
 integration.
 
-
 %package        javadoc
 Summary:        API documentation for %{name}
 
@@ -40,12 +39,14 @@ This package provides %{summary}.
 %patch2 -p1
 %patch3 -p1
 
+cp xbean-asm-util/src/main/java/org/apache/xbean/asm8/original/commons/AsmConstants.java xbean-reflect/src/main/java/org/apache/xbean/recipe/
+
 # Parent POM is not packaged
 %pom_remove_parent
 
 %pom_remove_dep :commons-logging-api xbean-reflect
 %pom_remove_dep :log4j xbean-reflect
-%pom_remove_dep :xbean-asm7-shaded xbean-reflect
+%pom_remove_dep :xbean-asm8-shaded xbean-reflect
 find -name CommonsLoggingConverter.java -delete
 find -name Log4jConverter.java -delete
 
@@ -62,11 +63,13 @@ find -name Log4jConverter.java -delete
 %files -f .mfiles
 %doc LICENSE NOTICE
 
-
 %files javadoc -f .mfiles-javadoc
 %doc LICENSE NOTICE
 
 %changelog
+* Wed Jul 29 2020 Marian Koncek <mkoncek@redhat.com> - 4.17-1
+- Update to upsteam version 4.17
+
 * Fri May 15 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.14-4
 - Remove dependency on log4j and commons-logging