From bfa5830e3d7e092b33df92ba62f7591801165fec Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Mon, 9 Mar 2020 10:03:18 -0600 Subject: [PATCH] Update to Jetty 9.4.27 Fixes gh-7507 --- gradle/dependency-management.gradle | 22 +++++++++---------- .../samples/cas/JettyCasService.groovy | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index b5e4d3320c..692f93adab 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -151,17 +151,17 @@ dependencyManagement { dependency 'org.codehaus.groovy:groovy-json:2.4.17' dependency 'org.codehaus.groovy:groovy:2.4.14' dependency 'org.eclipse.jdt:ecj:3.12.3' - dependency 'org.eclipse.jetty.websocket:websocket-api:9.4.19.v20190610' - dependency 'org.eclipse.jetty.websocket:websocket-client:9.4.19.v20190610' - dependency 'org.eclipse.jetty.websocket:websocket-common:9.4.19.v20190610' - dependency 'org.eclipse.jetty:jetty-client:9.4.19.v20190610' - dependency 'org.eclipse.jetty:jetty-http:9.4.19.v20190610' - dependency 'org.eclipse.jetty:jetty-io:9.4.19.v20190610' - dependency 'org.eclipse.jetty:jetty-security:9.4.19.v20190610' - dependency 'org.eclipse.jetty:jetty-server:9.4.19.v20190610' - dependency 'org.eclipse.jetty:jetty-servlet:9.4.19.v20190610' - dependency 'org.eclipse.jetty:jetty-util:9.4.19.v20190610' - dependency 'org.eclipse.jetty:jetty-xml:9.4.19.v20190610' + dependency 'org.eclipse.jetty.websocket:websocket-api:9.4.27.v20200227' + dependency 'org.eclipse.jetty.websocket:websocket-client:9.4.27.v20200227' + dependency 'org.eclipse.jetty.websocket:websocket-common:9.4.27.v20200227' + dependency 'org.eclipse.jetty:jetty-client:9.4.27.v20200227' + dependency 'org.eclipse.jetty:jetty-http:9.4.27.v20200227' + dependency 'org.eclipse.jetty:jetty-io:9.4.27.v20200227' + dependency 'org.eclipse.jetty:jetty-security:9.4.27.v20200227' + dependency 'org.eclipse.jetty:jetty-server:9.4.27.v20200227' + dependency 'org.eclipse.jetty:jetty-servlet:9.4.27.v20200227' + dependency 'org.eclipse.jetty:jetty-util:9.4.27.v20200227' + dependency 'org.eclipse.jetty:jetty-xml:9.4.27.v20200227' dependency 'org.eclipse.persistence:javax.persistence:2.2.1' dependency 'org.gebish:geb-ast:0.10.0' dependency 'org.gebish:geb-core:0.10.0' diff --git a/samples/xml/cas/cassample/src/integration-test/groovy/org/springframework/security/samples/cas/JettyCasService.groovy b/samples/xml/cas/cassample/src/integration-test/groovy/org/springframework/security/samples/cas/JettyCasService.groovy index b5b8f2feb3..8be5860fb2 100644 --- a/samples/xml/cas/cassample/src/integration-test/groovy/org/springframework/security/samples/cas/JettyCasService.groovy +++ b/samples/xml/cas/cassample/src/integration-test/groovy/org/springframework/security/samples/cas/JettyCasService.groovy @@ -66,7 +66,7 @@ class JettyCasService extends Server { String password = System.getProperty('javax.net.ssl.trustStorePassword','password') - SslContextFactory sslContextFactory = new SslContextFactory(); + SslContextFactory sslContextFactory = new SslContextFactory.Server(); sslContextFactory.setKeyStorePath(getTrustStore()); sslContextFactory.setKeyStorePassword(password); sslContextFactory.setKeyManagerPassword(password);