Skip to content

Commit

Permalink
GEODE-9010: Bump jetty from 9.4.34.v20201102 to 9.4.38.v20210224
Browse files Browse the repository at this point in the history
  • Loading branch information
onichols-pivotal committed Mar 6, 2021
1 parent 35d2305 commit 645d353
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 20 deletions.
4 changes: 2 additions & 2 deletions boms/geode-all-bom/src/test/resources/expected-pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -448,13 +448,13 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>9.4.34.v20201102</version>
<version>9.4.38.v20210224</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<version>9.4.34.v20201102</version>
<version>9.4.38.v20210224</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class DependencyConstraints implements Plugin<Project> {

// The jetty version is also hard-coded in geode-assembly:test
// at o.a.g.sessions.tests.GenericAppServerInstall.java
deps.put("jetty.version", "9.4.34.v20201102")
deps.put("jetty.version", "9.4.38.v20210224")

// These version numbers are consumed by protobuf configurations that are plugin-specific and not
// part of the typical Gradle dependency configurations.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
* specific code outside of the {@link GenericAppServerVersion}.
*/
public class GenericAppServerInstall extends ContainerInstall {
private static final String JETTY_VERSION = "9.4.34.v20201102";
private static final String JETTY_VERSION = "9.4.38.v20210224";

/**
* Get the version number, download URL, and container name of a generic app server using
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1027,14 +1027,15 @@ lib/javax.servlet-api-3.1.0.jar
lib/javax.transaction-api-1.3.jar
lib/jaxb-api-2.3.1.jar
lib/jaxb-impl-2.3.2.jar
lib/jetty-http-9.4.34.v20201102.jar
lib/jetty-io-9.4.34.v20201102.jar
lib/jetty-security-9.4.34.v20201102.jar
lib/jetty-server-9.4.34.v20201102.jar
lib/jetty-servlet-9.4.34.v20201102.jar
lib/jetty-util-9.4.34.v20201102.jar
lib/jetty-webapp-9.4.34.v20201102.jar
lib/jetty-xml-9.4.34.v20201102.jar
lib/jetty-http-9.4.38.v20210224.jar
lib/jetty-io-9.4.38.v20210224.jar
lib/jetty-security-9.4.38.v20210224.jar
lib/jetty-server-9.4.38.v20210224.jar
lib/jetty-servlet-9.4.38.v20210224.jar
lib/jetty-util-9.4.38.v20210224.jar
lib/jetty-util-ajax-9.4.38.v20210224.jar
lib/jetty-webapp-9.4.38.v20210224.jar
lib/jetty-xml-9.4.38.v20210224.jar
lib/jgroups-3.6.14.Final.jar
lib/jline-2.12.jar
lib/jna-5.5.0.jar
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ micrometer-core-1.6.3.jar
swagger-annotations-1.5.23.jar
fastutil-8.3.1.jar
javax.resource-api-1.7.1.jar
jetty-webapp-9.4.34.v20201102.jar
jetty-servlet-9.4.34.v20201102.jar
jetty-security-9.4.34.v20201102.jar
jetty-server-9.4.34.v20201102.jar
jetty-webapp-9.4.38.v20210224.jar
jetty-servlet-9.4.38.v20210224.jar
jetty-security-9.4.38.v20210224.jar
jetty-server-9.4.38.v20210224.jar
javax.servlet-api-3.1.0.jar
jna-platform-5.5.0.jar
jna-5.5.0.jar
Expand All @@ -73,10 +73,11 @@ HdrHistogram-2.1.12.jar
LatencyUtils-2.0.3.jar
javax.transaction-api-1.3.jar
spring-jcl-5.2.9.RELEASE.jar
jetty-http-9.4.34.v20201102.jar
jetty-io-9.4.34.v20201102.jar
jetty-xml-9.4.34.v20201102.jar
jetty-util-9.4.34.v20201102.jar
jetty-http-9.4.38.v20210224.jar
jetty-io-9.4.38.v20210224.jar
jetty-xml-9.4.38.v20210224.jar
jetty-util-ajax-9.4.38.v20210224.jar
jetty-util-9.4.38.v20210224.jar
log4j-slf4j-impl-2.13.1.jar
log4j-core-2.13.1.jar
log4j-jul-2.13.1.jar
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ jetty-security
jetty-server
jetty-servlet
jetty-util
jetty-util-ajax
jetty-webapp
jetty-xml
jgroups
Expand Down

0 comments on commit 645d353

Please sign in to comment.