Merge pull request #696 from jekh/update-dependencies

Updated netty, bouncycastle, and log4j versions
lightbody · Sep 11, 2017 · 9aef41a · 9aef41a
2 parents 89c876c + 5252aa9
commit 9aef41a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git 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:

diff --git 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>