From 954f5a4461cc988047345a425709308a2d38790f Mon Sep 17 00:00:00 2001
From: Alexander Kriegisch <Alexander@Kriegisch.name>
Date: Tue, 14 Jul 2020 09:52:35 +0700
Subject: [PATCH] Use temporary Javassist #328 bugfix release with
 'de.scrum-master' coordinates

GAV: de.scrum-master.org.javassist:javassist:3.27.0-GA-bugfix-328

I pushed this to Maven Central myself today because the Javassist maintainer
does not plan a new release before end of 2020-08. Until then I do not wish to
rely on a local snapshot if I share the Sarek repository with anyone else.

TODO:
  - Remove workaround after fix for #328 is released, see
    https://github.com/jboss-javassist/javassist/issues/328
  - The ASM workaround also still is in the code base and the dependency in the
    POM. Either move the "repair stack map" method into a tool class or just
    delete it, then also get rid of the ByteBuddy dependency.
---
 pom.xml                                                   | 8 ++++++--
 sarek-constructor-mock-javassist/pom.xml                  | 4 +++-
 .../ConstructorMockJavassistTransformer.java              | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1cf4c39..ab3c120 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,9 @@
     <maven.compiler.target>1.8</maven.compiler.target>
 
     <bytebuddy.version>1.10.13</bytebuddy.version>
-    <javassist.version>3.27.0-GA</javassist.version>
+    <!-- TODO: remove after fix for https://github.com/jboss-javassist/javassist/issues/328 is released-->
+    <javassist.version>3.27.0-GA-bugfix-328</javassist.version>
+    <!--<javassist.version>3.27.0-GA</javassist.version>-->
     <objenesis.version>3.1</objenesis.version>
     <junit4.version>4.13</junit4.version>
     <junit5.version>5.6.2</junit5.version>
@@ -352,7 +354,9 @@
 
       <!-- Javassist -->
       <dependency>
-        <groupId>org.javassist</groupId>
+        <!-- TODO: remove after fix for https://github.com/jboss-javassist/javassist/issues/328 is released-->
+        <groupId>de.scrum-master.org.javassist</groupId>
+        <!--<groupId>org.javassist</groupId>-->
         <artifactId>javassist</artifactId>
         <version>${javassist.version}</version>
       </dependency>
diff --git a/sarek-constructor-mock-javassist/pom.xml b/sarek-constructor-mock-javassist/pom.xml
index 274220e..cb5efe6 100644
--- a/sarek-constructor-mock-javassist/pom.xml
+++ b/sarek-constructor-mock-javassist/pom.xml
@@ -30,7 +30,9 @@
   <dependencies>
 
     <dependency>
-      <groupId>org.javassist</groupId>
+      <!-- TODO: remove after fix for https://github.com/jboss-javassist/javassist/issues/328 is released-->
+      <groupId>de.scrum-master.org.javassist</groupId>
+      <!--<groupId>org.javassist</groupId>-->
       <artifactId>javassist</artifactId>
     </dependency>
     <dependency>
diff --git a/sarek-constructor-mock-javassist/src/main/java/dev/sarek/agent/constructor_mock/ConstructorMockJavassistTransformer.java b/sarek-constructor-mock-javassist/src/main/java/dev/sarek/agent/constructor_mock/ConstructorMockJavassistTransformer.java
index 38b190d..5fc508c 100644
--- a/sarek-constructor-mock-javassist/src/main/java/dev/sarek/agent/constructor_mock/ConstructorMockJavassistTransformer.java
+++ b/sarek-constructor-mock-javassist/src/main/java/dev/sarek/agent/constructor_mock/ConstructorMockJavassistTransformer.java
@@ -130,7 +130,7 @@ public byte[] transform(
     }
 
     // TODO: remove after fix for https://github.com/jboss-javassist/javassist/issues/328 is released
-    final boolean REPAIR = true;
+    final boolean REPAIR = false;
     if (REPAIR)
       transformedBytecode = repairStackMapUsingASM(className, transformedBytecode);