From 6d303d30c360b4dc25272d1df3a9bb7d69ceb83e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 23 Mar 2020 05:53:25 +0000
Subject: [PATCH 1/2] Bump jython-standalone from 2.5.3 to 2.7.2

Bumps jython-standalone from 2.5.3 to 2.7.2.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 metrics-graphite/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metrics-graphite/pom.xml b/metrics-graphite/pom.xml
index 3369ff2e2e..bcde054399 100644
--- a/metrics-graphite/pom.xml
+++ b/metrics-graphite/pom.xml
@@ -56,7 +56,7 @@
         <dependency>
             <groupId>org.python</groupId>
             <artifactId>jython-standalone</artifactId>
-            <version>2.5.3</version>
+            <version>2.7.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

From a80b7b9ad8a33b4101d97d2ea7797614220650cc Mon Sep 17 00:00:00 2001
From: Jochen Schalanda <jochen@schalanda.name>
Date: Mon, 23 Mar 2020 11:47:39 +0100
Subject: [PATCH 2/2] Fix PickledGraphiteTest

---
 .../com/codahale/metrics/graphite/PickledGraphiteTest.java     | 3 ++-
 metrics-graphite/src/test/resources/upickle.py                 | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/metrics-graphite/src/test/java/com/codahale/metrics/graphite/PickledGraphiteTest.java b/metrics-graphite/src/test/java/com/codahale/metrics/graphite/PickledGraphiteTest.java
index f98be57485..95bb590da7 100644
--- a/metrics-graphite/src/test/java/com/codahale/metrics/graphite/PickledGraphiteTest.java
+++ b/metrics-graphite/src/test/java/com/codahale/metrics/graphite/PickledGraphiteTest.java
@@ -27,6 +27,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.math.BigInteger;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.Socket;
@@ -163,7 +164,7 @@ private String unpickleOutput() throws Exception {
             bindings.put("payload", payload.substring(nextIndex));
             unpickleScript.eval(bindings);
             result.addAll(result.size(), (PyList) bindings.get("metrics"));
-            nextIndex += (Integer) bindings.get("batchLength");
+            nextIndex += ((BigInteger) bindings.get("batchLength")).intValue();
         }
 
         for (Object aResult : result) {
diff --git a/metrics-graphite/src/test/resources/upickle.py b/metrics-graphite/src/test/resources/upickle.py
index da4ad1a809..9d51d215c2 100644
--- a/metrics-graphite/src/test/resources/upickle.py
+++ b/metrics-graphite/src/test/resources/upickle.py
@@ -5,5 +5,5 @@
 format = '!L'
 headerLength = struct.calcsize(format)
 payloadLength, = struct.unpack(format, payload[:headerLength])
-batchLength = headerLength + payloadLength.intValue()
+batchLength = headerLength + payloadLength
 metrics = cPickle.loads(payload[headerLength:batchLength])