This is an automated email from the ASF dual-hosted git repository.
onichols pushed a commit to branch support/1.13
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.13 by this push:
new 645d353 GEODE-9010: Bump jetty from 9.4.34.v20201102 to
9.4.38.v20210224
645d353 is described below
commit 645d3530f8f6a22432afe27c3381fe318ed59654
Author: Owen Nichols <[email protected]>
AuthorDate: Fri Mar 5 23:20:33 2021 -0800
GEODE-9010: Bump jetty from 9.4.34.v20201102 to 9.4.38.v20210224
---
boms/geode-all-bom/src/test/resources/expected-pom.xml | 4 ++--
.../geode/gradle/plugins/DependencyConstraints.groovy | 2 +-
.../geode/session/tests/GenericAppServerInstall.java | 2 +-
.../src/integrationTest/resources/assembly_content.txt | 17 +++++++++--------
.../integrationTest/resources/dependency_classpath.txt | 17 +++++++++--------
.../src/integrationTest/resources/expected_jars.txt | 1 +
6 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/boms/geode-all-bom/src/test/resources/expected-pom.xml
b/boms/geode-all-bom/src/test/resources/expected-pom.xml
index 5af6a6f..5d47f92 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -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>
diff --git
a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
index e170dab7..66da65e 100644
---
a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
+++
b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
@@ -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.
diff --git
a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java
b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java
index 01aa5a8..0d2c6a4 100644
---
a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java
+++
b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java
@@ -33,7 +33,7 @@ import java.util.function.IntSupplier;
* 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
diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt
b/geode-assembly/src/integrationTest/resources/assembly_content.txt
index b4502e3..6c25b6d 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -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
diff --git
a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
index bc97ae5..e70cadd 100644
--- a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
+++ b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
@@ -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
@@ -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
diff --git a/geode-assembly/src/integrationTest/resources/expected_jars.txt
b/geode-assembly/src/integrationTest/resources/expected_jars.txt
index c116f7c..feec158 100644
--- a/geode-assembly/src/integrationTest/resources/expected_jars.txt
+++ b/geode-assembly/src/integrationTest/resources/expected_jars.txt
@@ -51,6 +51,7 @@ jetty-security
jetty-server
jetty-servlet
jetty-util
+jetty-util-ajax
jetty-webapp
jetty-xml
jgroups
