From 1be5e52161e01b50574d9ea89d1bd942d432e98f Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 10 Oct 2019 09:55:34 +0200
Subject: [PATCH] Bump Javassist to 3.26.0-GA

3.25 fixes:
- https://github.com/jboss-javassist/javassist/issues/72
- https://github.com/jboss-javassist/javassist/issues/241
- https://github.com/jboss-javassist/javassist/issues/242
- https://github.com/jboss-javassist/javassist/issues/246
- https://github.com/jboss-javassist/javassist/issues/252
3.26 fixes:
- https://github.com/jboss-javassist/javassist/issues/265
- https://github.com/jboss-javassist/javassist/issues/270
- https://github.com/jboss-javassist/javassist/issues/271
- https://github.com/jboss-javassist/javassist/issues/275

Of these #270 is most important, as it fixes an issue we've seen
with powermock downstream.

Change-Id: Ib4d75d6411e71438436249a8eb9313ccf4411ca2
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 6a404f16a3f5c8dff68e5a8ad9e3aa366082d014)
---
 features/odl-javassist-3/src/main/history/dependencies.xml | 2 +-
 odlparent/pom.xml                                          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/features/odl-javassist-3/src/main/history/dependencies.xml b/features/odl-javassist-3/src/main/history/dependencies.xml
index 0aebee6da0..4cdaa50cb6 100644
--- a/features/odl-javassist-3/src/main/history/dependencies.xml
+++ b/features/odl-javassist-3/src/main/history/dependencies.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="odl-javassist-3">
     <feature version="0.0.0">
-        <bundle>mvn:org.javassist/javassist/3.24.1-GA</bundle>
+        <bundle>mvn:org.javassist/javassist/3.26.0-GA</bundle>
     </feature>
 </features>
diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index f1d3f43be6..c1371e5975 100644
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -682,7 +682,7 @@
       <dependency>
         <groupId>org.javassist</groupId>
         <artifactId>javassist</artifactId>
-        <version>3.24.1-GA</version>
+        <version>3.26.0-GA</version>
       </dependency>
       <dependency>
         <groupId>org.jboss.spec.javax.transaction</groupId>