From 2a37621c4efd0c05805274e326b947499ca0fa27 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Fri, 12 Feb 2021 10:42:33 +0100
Subject: [PATCH] Update to upstream version 4.18

---
 .gitignore              |  1 +
 0002-Unbundle-ASM.patch | 29 +++++++++++------------------
 sources                 |  2 +-
 xbean.spec              |  9 ++++++---
 4 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/.gitignore b/.gitignore
index ee2d408..2f3e4a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ xbean-3.7.tar.xz
 /xbean-4.8-source-release.zip
 /xbean-4.14-source-release.zip
 /xbean-4.17-source-release.zip
+/xbean-4.18-source-release.zip
diff --git a/0002-Unbundle-ASM.patch b/0002-Unbundle-ASM.patch
index 6dc968f..eb40658 100644
--- a/0002-Unbundle-ASM.patch
+++ b/0002-Unbundle-ASM.patch
@@ -4,22 +4,22 @@ Date: Thu, 12 Dec 2019 08:51:57 +0100
 Subject: [PATCH 2/3] Unbundle ASM
 
 ---
- .../xbean/recipe/XbeanAsmParameterNameLoader.java  | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
+ .../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 0da1987..a507156 100644
+index 20b646c..9e96775 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,11 +17,11 @@
   */
  package org.apache.xbean.recipe;
  
--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.apache.xbean.asm9.ClassReader;
+-import org.apache.xbean.asm9.ClassVisitor;
+-import org.apache.xbean.asm9.Label;
+-import org.apache.xbean.asm9.MethodVisitor;
+-import org.apache.xbean.asm9.Type;
 +import org.objectweb.asm.ClassReader;
 +import org.objectweb.asm.ClassVisitor;
 +import org.objectweb.asm.Label;
@@ -32,18 +32,11 @@ index 0da1987..a507156 100644
  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;
+-import static org.apache.xbean.asm9.shade.commons.AsmConstants.ASM_VERSION;
++import static org.apache.xbean.asm9.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.25.4
+2.29.2
 
diff --git a/sources b/sources
index 996abdc..fcc3e67 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xbean-4.17-source-release.zip) = 0cc86b846f4eb797649cb3229c2eac5d37d6549f1a7ac8bf3f85b873b3cd2d5db837387ac1891d257f46613c925e3f331fcb63c5a80bf0b1a8004b31031de5c8
+SHA512 (xbean-4.18-source-release.zip) = 766746caa4f9ea87ceff1af1fe052481a9478cab4754b18cb7c760fb9dc466e5fd85533f2040583c3378cf36a4e17ba357d48060896af86a933916008cb2dda6
diff --git a/xbean.spec b/xbean.spec
index eeaba9d..e1f63f9 100644
--- a/xbean.spec
+++ b/xbean.spec
@@ -1,5 +1,5 @@
 Name:           xbean
-Version:        4.17
+Version:        4.18
 Release:        1%{?dist}
 Summary:        Java plugin based web server
 License:        ASL 2.0
@@ -39,14 +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/
+cp xbean-asm-util/src/main/java/org/apache/xbean/asm9/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-asm8-shaded xbean-reflect
+%pom_remove_dep :xbean-asm9-shaded xbean-reflect
 find -name CommonsLoggingConverter.java -delete
 find -name Log4jConverter.java -delete
 
@@ -67,6 +67,9 @@ find -name Log4jConverter.java -delete
 %doc LICENSE NOTICE
 
 %changelog
+* Tue Jan 26 2021 Marian Koncek <mkoncek@redhat.com> - 4.18-1
+- Update to upstream version 4.18
+
 * Wed Jul 29 2020 Marian Koncek <mkoncek@redhat.com> - 4.17-1
 - Update to upsteam version 4.17