Skip to content

Commit cb24289

Browse files
committed
Upgrade to Jetty 9.4.1
1 parent f095aa2 commit cb24289

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

build.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ configure(allprojects) { project ->
6161
ext.jaxbVersion = "2.2.11"
6262
ext.jaxwsVersion = "2.2.11"
6363
ext.jcaVersion = "1.7"
64-
ext.jettyVersion = "9.4.0.v20161208"
64+
ext.jettyVersion = "9.4.1.v20170120"
6565
ext.jmsVersion = "2.0.1"
6666
ext.jodaVersion = "2.9.7"
6767
ext.jpaVersion = "2.1.1"
@@ -71,7 +71,7 @@ configure(allprojects) { project ->
7171
ext.junitVersion = "4.12"
7272
ext.junitJupiterVersion = '5.0.0-M3'
7373
ext.junitPlatformVersion = '1.0.0-M3'
74-
ext.kotlinVersion = "1.1.0-beta-17" // Also change kotlin-gradle-plugin version when upgrading
74+
ext.kotlinVersion = "1.1.0-beta-17" // also change kotlin-gradle-plugin version when upgrading
7575
ext.log4jVersion = '2.7'
7676
ext.nettyVersion = "4.1.7.Final"
7777
ext.okhttpVersion = "2.7.5"
@@ -118,10 +118,10 @@ configure(allprojects) { project ->
118118
}
119119

120120
configurations.all {
121-
// check for updates every build
121+
// Check for updates every build
122122
resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
123123

124-
// consistent netty version (e.g. clashes between netty-all vs netty-common)
124+
// Consistent netty version (e.g. clashes between netty-all vs netty-common)
125125
resolutionStrategy.eachDependency { DependencyResolveDetails details ->
126126
if (details.requested.group == 'io.netty') {
127127
details.useVersion nettyVersion
@@ -362,9 +362,9 @@ project("spring-core") {
362362
configurations.cglib.each { originalJar ->
363363
zipfileset(src: originalJar)
364364
}
365-
// repackage net.sf.cglib => org.springframework.cglib
365+
// Repackage net.sf.cglib => org.springframework.cglib
366366
rule(pattern: "net.sf.cglib.**", result: "org.springframework.cglib.@1")
367-
// as mentioned above, transform cglib"s internal asm dependencies from
367+
// As mentioned above, transform cglib"s internal asm dependencies from
368368
// org.objectweb.asm => org.springframework.asm. Doing this counts on the
369369
// the fact that Spring and cglib depend on the same version of asm!
370370
rule(pattern: "org.objectweb.asm.**", result: "org.springframework.asm.@1")
@@ -385,7 +385,7 @@ project("spring-core") {
385385
configurations.objenesis.each { originalJar ->
386386
zipfileset(src: originalJar)
387387
}
388-
// repackage org.objenesis => org.springframework.objenesis
388+
// Repackage org.objenesis => org.springframework.objenesis
389389
rule(pattern: "org.objenesis.**", result: "org.springframework.objenesis.@1")
390390
}
391391
}
@@ -420,7 +420,7 @@ project("spring-core") {
420420
}
421421

422422
jar {
423-
// inline repackaged cglib classes directly into the spring-core jar
423+
// Inline repackaged cglib classes directly into spring-core jar
424424
dependsOn cglibRepackJar
425425
from(zipTree(cglibRepackJar.archivePath)) {
426426
include "org/springframework/cglib/**"

0 commit comments

Comments
 (0)