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 2021/04/07 01:09:21 UTC
[geode] branch support/1.12 updated: GEODE-9126: Bump jetty from
9.4.38.v20210224 to 9.4.39.v20210325
This is an automated email from the ASF dual-hosted git repository.
onichols pushed a commit to branch support/1.12
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.12 by this push:
new 553b267 GEODE-9126: Bump jetty from 9.4.38.v20210224 to 9.4.39.v20210325
553b267 is described below
commit 553b2676f6a0b14814280eca5339d10c80bbf496
Author: Owen Nichols <on...@apache.org>
AuthorDate: Tue Apr 6 18:04:20 2021 -0700
GEODE-9126: Bump jetty from 9.4.38.v20210224 to 9.4.39.v20210325
---
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 | 18 +++++++++---------
.../integrationTest/resources/dependency_classpath.txt | 18 +++++++++---------
5 files changed, 22 insertions(+), 22 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 841fdcd..46a8834 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -376,13 +376,13 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
- <version>9.4.38.v20210224</version>
+ <version>9.4.39.v20210325</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>9.4.38.v20210224</version>
+ <version>9.4.39.v20210325</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 4100464..c6758c5 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.38.v20210224")
+ deps.put("jetty.version", "9.4.39.v20210325")
// 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 0d2c6a4..3310132 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.38.v20210224";
+ private static final String JETTY_VERSION = "9.4.39.v20210325";
/**
* 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 4dcc901..fca61e9 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -1013,15 +1013,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.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/jetty-http-9.4.39.v20210325.jar
+lib/jetty-io-9.4.39.v20210325.jar
+lib/jetty-security-9.4.39.v20210325.jar
+lib/jetty-server-9.4.39.v20210325.jar
+lib/jetty-servlet-9.4.39.v20210325.jar
+lib/jetty-util-9.4.39.v20210325.jar
+lib/jetty-util-ajax-9.4.39.v20210325.jar
+lib/jetty-webapp-9.4.39.v20210325.jar
+lib/jetty-xml-9.4.39.v20210325.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 99ab68f..5e2e46f 100644
--- a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
+++ b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
@@ -45,10 +45,10 @@ classgraph-4.8.52.jar
micrometer-core-1.6.3.jar
fastutil-8.3.0.jar
javax.resource-api-1.7.1.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
+jetty-webapp-9.4.39.v20210325.jar
+jetty-servlet-9.4.39.v20210325.jar
+jetty-security-9.4.39.v20210325.jar
+jetty-server-9.4.39.v20210325.jar
javax.servlet-api-3.1.0.jar
jna-5.5.0.jar
jna-platform-5.5.0.jar
@@ -73,11 +73,11 @@ LatencyUtils-2.0.3.jar
javax.transaction-api-1.3.jar
spring-jcl-5.2.9.RELEASE.jar
commons-codec-1.11.jar
-jetty-xml-9.4.38.v20210224.jar
-jetty-http-9.4.38.v20210224.jar
-jetty-io-9.4.38.v20210224.jar
-jetty-util-ajax-9.4.38.v20210224.jar
-jetty-util-9.4.38.v20210224.jar
+jetty-xml-9.4.39.v20210325.jar
+jetty-http-9.4.39.v20210325.jar
+jetty-io-9.4.39.v20210325.jar
+jetty-util-ajax-9.4.39.v20210325.jar
+jetty-util-9.4.39.v20210325.jar
log4j-slf4j-impl-2.12.1.jar
log4j-core-2.12.1.jar
log4j-jul-2.12.1.jar