From 3b26e7a32d26908118e9c1c913e8b94acb1ba794 Mon Sep 17 00:00:00 2001
From: Jason Hoetger <jekh@outlook.com>
Date: Sun, 10 Sep 2017 22:14:45 -0700
Subject: [PATCH 1/2] Updated netty, bouncycastle, and log4j versions

---
 pom.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1c5a819d6..160ab2a37 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,16 +69,16 @@
 
         <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
 
-        <log4j.version>2.8.2</log4j.version>
+        <log4j.version>2.9.0</log4j.version>
 
         <groovy.version>2.4.12</groovy.version>
         <groovy-eclipse-batch.version>2.4.3-01</groovy-eclipse-batch.version>
 
-        <netty.version>4.0.49.Final</netty.version>
+        <netty.version>4.0.51.Final</netty.version>
         <!-- netty 4.1 version to use for browsermob-dist and when using the netty-4.1 profile -->
-        <netty-4.1.version>4.1.13.Final</netty-4.1.version>
+        <netty-4.1.version>4.1.15.Final</netty-4.1.version>
 
-        <bouncycastle.version>1.57</bouncycastle.version>
+        <bouncycastle.version>1.58</bouncycastle.version>
     </properties>
 
     <build>
@@ -213,7 +213,7 @@
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
                 <!-- Remove the -android when dropping support for Java 7. -->
-                <version>22.0-android</version>
+                <version>23.0-android</version>
             </dependency>
 
             <dependency>

From 5252aa9bce64f3fabd3cc6b0ca5f231757cbd6d7 Mon Sep 17 00:00:00 2001
From: Jason Hoetger <jekh@outlook.com>
Date: Sun, 10 Sep 2017 22:24:28 -0700
Subject: [PATCH 2/2] Disabling travis-ci java 7 build, since oraclejdk7 is no
 longer provided, and travis' openjdk7 does not contain the necessary SunEC
 elliptic curve provider.

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index fa369a5af..016ceb70b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,9 @@ sudo: false
 
 language: java
 jdk:
-  - oraclejdk7
+    # Not running tests against openjdk7, since the SunEC is not included in travis-ci's version of openjdk7.
+    # Not running tests against oraclejdk7, since travis-ci no longer provides it.
+    # - openjdk7
   - oraclejdk8
 
 cache: