Update upstream

This commit is contained in:
Troy Frew 2016-07-31 13:59:19 -04:00
parent 1b23a84946
commit 2f7ff90ecc
No known key found for this signature in database
GPG Key ID: 2B07581071A3CA7D
3 changed files with 3 additions and 3 deletions

@ -1 +1 @@
Subproject commit b5121db88699fa8ec252e4cb8238dc03e0f33593
Subproject commit a605c1acbc413c2cf901d869e8c9a2ec7d3da4f4

View File

@ -567,7 +567,7 @@ index 53d3db1..ead929e 100644
+
<properties>
<build.number>unknown</build.number>
<netty.version>4.0.39.Final</netty.version>
<netty.version>4.0.40.Final</netty.version>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
+ <!-- Require Java 8 -->

View File

@ -14,7 +14,7 @@ index ead929e..bd19538 100644
<properties>
<build.number>unknown</build.number>
- <netty.version>4.0.39.Final</netty.version>
- <netty.version>4.0.40.Final</netty.version>
+ <netty.version>4.1.3.Final</netty.version>
<!-- Require Java 8 -->
<maven.compiler.source>1.8</maven.compiler.source>