You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by on...@apache.org on 2020/11/03 08:58:20 UTC
[geode] branch support/1.13 updated: Bump jetty from
9.4.21.v20190926 to 9.4.33.v20201020
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 23d2dc7 Bump jetty from 9.4.21.v20190926 to 9.4.33.v20201020
23d2dc7 is described below
commit 23d2dc7553cb30e600ba5792e87b0e26ce0eb028
Author: Owen Nichols <on...@apache.org>
AuthorDate: Tue Nov 3 00:54:44 2020 -0800
Bump jetty from 9.4.21.v20190926 to 9.4.33.v20201020
---
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 | 16 ++++++++--------
.../integrationTest/resources/dependency_classpath.txt | 16 ++++++++--------
5 files changed, 20 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 45f57d9..75ae8fc 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -442,13 +442,13 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>9.4.21.v20190926</version>
+ <version>9.4.33.v20201020</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
- <version>9.4.21.v20190926</version>
+ <version>9.4.33.v20201020</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 01ae79f..375ac4a 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.21.v20190926")
+ deps.put("jetty.version", "9.4.33.v20201020")
// 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 a93e581..69e1333 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.21.v20190926";
+ private static final String JETTY_VERSION = "9.4.33.v20201020";
/**
* 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 d71a251..48bd348 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -1027,14 +1027,14 @@ 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.21.v20190926.jar
-lib/jetty-io-9.4.21.v20190926.jar
-lib/jetty-security-9.4.21.v20190926.jar
-lib/jetty-server-9.4.21.v20190926.jar
-lib/jetty-servlet-9.4.21.v20190926.jar
-lib/jetty-util-9.4.21.v20190926.jar
-lib/jetty-webapp-9.4.21.v20190926.jar
-lib/jetty-xml-9.4.21.v20190926.jar
+lib/jetty-http-9.4.33.v20201020.jar
+lib/jetty-io-9.4.33.v20201020.jar
+lib/jetty-security-9.4.33.v20201020.jar
+lib/jetty-server-9.4.33.v20201020.jar
+lib/jetty-servlet-9.4.33.v20201020.jar
+lib/jetty-util-9.4.33.v20201020.jar
+lib/jetty-webapp-9.4.33.v20201020.jar
+lib/jetty-xml-9.4.33.v20201020.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 c0a6ca4..a8d1174 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.4.1.jar
swagger-annotations-1.5.23.jar
fastutil-8.3.1.jar
javax.resource-api-1.7.1.jar
-jetty-webapp-9.4.21.v20190926.jar
-jetty-servlet-9.4.21.v20190926.jar
-jetty-security-9.4.21.v20190926.jar
-jetty-server-9.4.21.v20190926.jar
+jetty-webapp-9.4.33.v20201020.jar
+jetty-servlet-9.4.33.v20201020.jar
+jetty-security-9.4.33.v20201020.jar
+jetty-server-9.4.33.v20201020.jar
javax.servlet-api-3.1.0.jar
jna-platform-5.5.0.jar
jna-5.5.0.jar
@@ -73,10 +73,10 @@ 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.21.v20190926.jar
-jetty-io-9.4.21.v20190926.jar
-jetty-xml-9.4.21.v20190926.jar
-jetty-util-9.4.21.v20190926.jar
+jetty-http-9.4.33.v20201020.jar
+jetty-io-9.4.33.v20201020.jar
+jetty-xml-9.4.33.v20201020.jar
+jetty-util-9.4.33.v20201020.jar
log4j-slf4j-impl-2.13.1.jar
log4j-core-2.13.1.jar
log4j-jul-2.13.1.jar