Skip to content

Updated netty, bouncycastle, and log4j versions #696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 11, 2017
Merged

Updated netty, bouncycastle, and log4j versions #696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b26e7a
Updated netty, bouncycastle, and log4j versions
jekh Sep 11, 2017
5252aa9
Disabling travis-ci java 7 build, since oraclejdk7 is no longer
jekh Sep 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 5 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down