Skip to content

Commit 973cbf2

Browse files
zabilzabil
committed
Upgrade jetty minor version
1 parent 1689059 commit 973cbf2

File tree

7 files changed

+45
-41
lines changed

7 files changed

+45
-41
lines changed

‎agent/build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ dependencies {
3131
compile project(':common')
3232
compile group: 'org.objenesis', name: 'objenesis', version: '1.2'
3333
compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.47'
34-
compile group: 'org.eclipse.jetty.websocket', name: 'websocket-client', version: '9.2.17.v20160517'
34+
compile group: 'org.eclipse.jetty.websocket', name: 'websocket-client', version: versions.jetty
3535
compile group: 'commons-configuration', name: 'commons-configuration', version: '1.10'
3636
testCompile project(path: ':common', configuration: 'testOutput')
3737
testCompile project(path: ':config-api', configuration: 'testOutput')
@@ -130,8 +130,8 @@ task verifyJar(type: VerifyJarTask) {
130130
"jcommander-1.48.jar",
131131
"jdom-1.0.jar",
132132
"jettison-1.2.jar",
133-
"jetty-io-9.2.17.v20160517.jar",
134-
"jetty-util-9.2.17.v20160517.jar",
133+
"jetty-io-${versions.jetty}.jar",
134+
"jetty-util-${versions.jetty}.jar",
135135
"joda-time-2.3.jar",
136136
"jolt-core-0.0.20.jar",
137137
"json-utils-0.0.20.jar",
@@ -158,9 +158,9 @@ task verifyJar(type: VerifyJarTask) {
158158
"stax-api-1.0.1.jar",
159159
"tfs-impl.jar",
160160
"util-${project.version}.jar",
161-
"websocket-api-9.2.17.v20160517.jar",
162-
"websocket-client-9.2.17.v20160517.jar",
163-
"websocket-common-9.2.17.v20160517.jar",
161+
"websocket-api-${versions.jetty}.jar",
162+
"websocket-client-${versions.jetty}.jar",
163+
"websocket-common-${versions.jetty}.jar",
164164
"xml-apis-1.0.b2.jar",
165165
]
166166
]

‎build.gradle‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,3 +272,7 @@ task allDependencies {
272272

273273
description = "Print dependency tree of all projects"
274274
}
275+
276+
ext.versions = [
277+
jetty: '9.2.18.v20160721'
278+
]

‎development-utility/development-server/build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ description = 'GoCD Server used for development'
1818

1919
dependencies {
2020
compile project(':server')
21-
compile group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.2.17.v20160517'
22-
compile group: 'org.eclipse.jetty', name: 'jetty-plus', version: '9.2.17.v20160517'
23-
compile group: 'org.eclipse.jetty', name: 'jetty-jmx', version: '9.2.17.v20160517'
24-
compile group: 'org.eclipse.jetty', name: 'jetty-servlets', version: '9.2.17.v20160517'
25-
compile group: 'org.eclipse.jetty', name: 'jetty-util', version: '9.2.17.v20160517'
26-
compile group: 'org.eclipse.jetty.websocket', name: 'websocket-server', version: '9.2.17.v20160517'
21+
compile group: 'org.eclipse.jetty', name: 'jetty-server', version: versions.jetty
22+
compile group: 'org.eclipse.jetty', name: 'jetty-plus', version: versions.jetty
23+
compile group: 'org.eclipse.jetty', name: 'jetty-jmx', version: versions.jetty
24+
compile group: 'org.eclipse.jetty', name: 'jetty-servlets', version: versions.jetty
25+
compile group: 'org.eclipse.jetty', name: 'jetty-util', version: versions.jetty
26+
compile group: 'org.eclipse.jetty.websocket', name: 'websocket-server', version: versions.jetty
2727
compile group: 'org.eclipse.jgit', name: 'org.eclipse.jgit.http.server', version: '4.1.0.201509280440-r'
2828
compile project(':jetty9')
2929
compile group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'

‎jetty9/build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ dependencies {
4141
testCompile project(':config-api')
4242
testCompile project(':test-utils')
4343

44-
compileOnly(group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.2.17.v20160517')
45-
compileOnly(group: 'org.eclipse.jetty', name: 'jetty-plus', version: '9.2.17.v20160517')
46-
compileOnly(group: 'org.eclipse.jetty', name: 'jetty-jmx', version: '9.2.17.v20160517')
47-
compileOnly(group: 'org.eclipse.jetty', name: 'jetty-servlets', version: '9.2.17.v20160517')
48-
compileOnly(group: 'org.eclipse.jetty', name: 'jetty-util', version: '9.2.17.v20160517')
49-
compileOnly(group: 'org.eclipse.jetty.websocket', name: 'websocket-server', version: '9.2.17.v20160517')
44+
compileOnly(group: 'org.eclipse.jetty', name: 'jetty-server', version: versions.jetty)
45+
compileOnly(group: 'org.eclipse.jetty', name: 'jetty-plus', version: versions.jetty)
46+
compileOnly(group: 'org.eclipse.jetty', name: 'jetty-jmx', version: versions.jetty)
47+
compileOnly(group: 'org.eclipse.jetty', name: 'jetty-servlets', version: versions.jetty)
48+
compileOnly(group: 'org.eclipse.jetty', name: 'jetty-util', version: versions.jetty)
49+
compileOnly(group: 'org.eclipse.jetty.websocket', name: 'websocket-server', version: versions.jetty)
5050
compileOnly(group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.47')
5151
}

‎server-launcher/build.gradle‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -283,29 +283,29 @@ task verifyFatJar(type: VerifyJarTask) {
283283
"go-plugin-activator.jar",
284284
"javasysmon-0.3.6.jar",
285285
"javax.servlet-api-3.1.0.jar",
286-
"jetty-continuation-9.2.17.v20160517.jar",
287-
"jetty-http-9.2.17.v20160517.jar",
288-
"jetty-io-9.2.17.v20160517.jar",
289-
"jetty-jmx-9.2.17.v20160517.jar",
290-
"jetty-jndi-9.2.17.v20160517.jar",
291-
"jetty-plus-9.2.17.v20160517.jar",
292-
"jetty-security-9.2.17.v20160517.jar",
293-
"jetty-server-9.2.17.v20160517.jar",
294-
"jetty-servlet-9.2.17.v20160517.jar",
295-
"jetty-servlets-9.2.17.v20160517.jar",
296-
"jetty-util-9.2.17.v20160517.jar",
297-
"jetty-webapp-9.2.17.v20160517.jar",
298-
"jetty-xml-9.2.17.v20160517.jar",
286+
"jetty-continuation-${versions.jetty}.jar",
287+
"jetty-http-${versions.jetty}.jar",
288+
"jetty-io-${versions.jetty}.jar",
289+
"jetty-jmx-${versions.jetty}.jar",
290+
"jetty-jndi-${versions.jetty}.jar",
291+
"jetty-plus-${versions.jetty}.jar",
292+
"jetty-security-${versions.jetty}.jar",
293+
"jetty-server-${versions.jetty}.jar",
294+
"jetty-servlet-${versions.jetty}.jar",
295+
"jetty-servlets-${versions.jetty}.jar",
296+
"jetty-util-${versions.jetty}.jar",
297+
"jetty-webapp-${versions.jetty}.jar",
298+
"jetty-xml-${versions.jetty}.jar",
299299
"joda-time-2.3.jar",
300300
"log4j-1.2.17.jar",
301301
"slf4j-api-1.7.12.jar",
302302
"slf4j-log4j12-1.7.12.jar",
303303
"tfs-impl.jar",
304-
"websocket-api-9.2.17.v20160517.jar",
305-
"websocket-client-9.2.17.v20160517.jar",
306-
"websocket-common-9.2.17.v20160517.jar",
307-
"websocket-server-9.2.17.v20160517.jar",
308-
"websocket-servlet-9.2.17.v20160517.jar",
304+
"websocket-api-${versions.jetty}.jar",
305+
"websocket-client-${versions.jetty}.jar",
306+
"websocket-common-${versions.jetty}.jar",
307+
"websocket-server-${versions.jetty}.jar",
308+
"websocket-servlet-${versions.jetty}.jar",
309309
]
310310
]
311311
}

‎server/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ dependencies {
199199
testCompile group: 'org.xmlunit', name: 'xmlunit-matchers', version: '2.2.1'
200200
compileOnly project(':app-server')
201201
compileOnly group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.47'
202-
compileOnly group: 'org.eclipse.jetty.websocket', name: 'websocket-server', version: '9.2.17.v20160517'
202+
compileOnly group: 'org.eclipse.jetty.websocket', name: 'websocket-server', version: versions.jetty
203203
}
204204

205205

‎test-utils/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ dependencies {
2424
compile group: 'org.objenesis', name: 'objenesis', version: '1.2'
2525
compile group: 'com.sdicons.jsontools', name: 'jsontools-core', version: '1.7'
2626
compile group: 'org.springframework', name: 'spring-test', version: '3.1.3.RELEASE'
27-
compile group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.2.17.v20160517'
28-
compile group: 'org.eclipse.jetty', name: 'jetty-plus', version: '9.2.17.v20160517'
29-
compile group: 'org.eclipse.jetty', name: 'jetty-jmx', version: '9.2.17.v20160517'
30-
compile group: 'org.eclipse.jetty', name: 'jetty-util', version: '9.2.17.v20160517'
27+
compile group: 'org.eclipse.jetty', name: 'jetty-server', version: versions.jetty
28+
compile group: 'org.eclipse.jetty', name: 'jetty-plus', version: versions.jetty
29+
compile group: 'org.eclipse.jetty', name: 'jetty-jmx', version: versions.jetty
30+
compile group: 'org.eclipse.jetty', name: 'jetty-util', version: versions.jetty
3131
compile group: 'com.sun.mail', name: 'mailapi', version: '1.4.4'
3232
compile group: 'junit', name: 'junit', version: '4.11'
3333
compile group: 'com.googlecode', name: 'junit-ext', version: '1.0'

0 commit comments

Comments
 (0)