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/18 05:24:22 UTC
[geode] 01/02: GEODE-8682: 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.12
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 741b0b462193c79fc5965a7789e14a86148d0ca2
Author: Owen Nichols <on...@apache.org>
AuthorDate: Tue Nov 17 21:17:15 2020 -0800
GEODE-8682: Bump jetty from 9.4.21.v20190926 to 9.4.33.v20201020
This reverts the previous revert commit 4060542d8162ca466b27269f52dc7a312a2ed257.
---
.../src/test/resources/expected-pom.xml | 4 ++--
.../gradle/plugins/DependencyConstraints.groovy | 2 +-
.../rest/ListIndexManagementDUnitTest.java | 3 ++-
.../session/tests/GenericAppServerInstall.java | 2 +-
.../integrationTest/resources/assembly_content.txt | 16 +++++++--------
.../resources/dependency_classpath.txt | 16 +++++++--------
.../geode/management/configuration/Index.java | 4 +++-
.../geode/management/configuration/IndexTest.java | 24 ++++++++++------------
8 files changed, 36 insertions(+), 35 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 9d5ed5d..df799d9 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.21.v20190926</version>
+ <version>9.4.33.v20201020</version>
<scope>compile</scope>
</dependency>
<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>
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 08b4eb3..6cbd020 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/management/internal/rest/ListIndexManagementDUnitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ListIndexManagementDUnitTest.java
index 96d5ace..2573346 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ListIndexManagementDUnitTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ListIndexManagementDUnitTest.java
@@ -184,7 +184,8 @@ public class ListIndexManagementDUnitTest {
public void getIndex_fails_when_region_name_is_missing_from_filter() {
indexConfig.setName("index1");
assertThatThrownBy(() -> cms.get(indexConfig))
- .hasMessageContaining("Error while extracting response for type");
+ .isInstanceOf(IllegalArgumentException.class)
+ .hasMessageContaining("Unable to construct the URI with the current configuration");
}
@Test
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 eee6daa..effda08 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -1013,14 +1013,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 11bc339..5f99eb8 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.2.1.jar
fastutil-8.3.0.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-5.5.0.jar
jna-platform-5.5.0.jar
@@ -73,10 +73,10 @@ 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.21.v20190926.jar
-jetty-http-9.4.21.v20190926.jar
-jetty-io-9.4.21.v20190926.jar
-jetty-util-9.4.21.v20190926.jar
+jetty-xml-9.4.33.v20201020.jar
+jetty-http-9.4.33.v20201020.jar
+jetty-io-9.4.33.v20201020.jar
+jetty-util-9.4.33.v20201020.jar
log4j-slf4j-impl-2.12.1.jar
log4j-core-2.12.1.jar
log4j-jul-2.12.1.jar
diff --git a/geode-management/src/main/java/org/apache/geode/management/configuration/Index.java b/geode-management/src/main/java/org/apache/geode/management/configuration/Index.java
index 6e73740..32a2bf7 100644
--- a/geode-management/src/main/java/org/apache/geode/management/configuration/Index.java
+++ b/geode-management/src/main/java/org/apache/geode/management/configuration/Index.java
@@ -103,8 +103,10 @@ public class Index extends AbstractConfiguration<IndexInfo> implements RegionSco
@Override
public Links getLinks() {
String regionName = getRegionName();
+ // /indexes/indexName is not implemented in controller anymore. region name is required for the
+ // self link
if (StringUtils.isBlank(regionName)) {
- return new Links(getId(), INDEXES);
+ return new Links(null, INDEXES);
}
Links links = new Links(getId(), Region.REGION_CONFIG_ENDPOINT + "/" + regionName + INDEXES);
links.addLink("region", Region.REGION_CONFIG_ENDPOINT + "/" + regionName);
diff --git a/geode-management/src/test/java/org/apache/geode/management/configuration/IndexTest.java b/geode-management/src/test/java/org/apache/geode/management/configuration/IndexTest.java
index 075fbae..6b049c3 100644
--- a/geode-management/src/test/java/org/apache/geode/management/configuration/IndexTest.java
+++ b/geode-management/src/test/java/org/apache/geode/management/configuration/IndexTest.java
@@ -64,22 +64,20 @@ public class IndexTest {
@Test
public void getEndPoint() {
- assertSoftly(softly -> {
- assertThat(index.getLinks().getList()).isEqualTo("/indexes");
+ assertThat(index.getLinks().getList()).isEqualTo("/indexes");
- index.setName("testSelf");
- softly.assertThat(index.getLinks().getSelf()).as("only name defined - self")
- .isEqualTo("/indexes/testSelf");
- softly.assertThat(index.getLinks().getList()).as("only name defined - list")
- .isEqualTo("/indexes");
+ index.setName("testSelf");
+ assertThat(index.getLinks().getSelf()).as("only name defined - self")
+ .isNull();
+ assertThat(index.getLinks().getList()).as("only name defined - list")
+ .isEqualTo("/indexes");
- index.setRegionPath("/regionPath");
- softly.assertThat(index.getLinks().getSelf()).as("region and name defined - self")
- .isEqualTo("/regions/regionPath/indexes/testSelf");
- softly.assertThat(index.getLinks().getList()).as("region and name defined - list")
- .isEqualTo("/regions/regionPath/indexes");
+ index.setRegionPath("/regionPath");
+ assertThat(index.getLinks().getSelf()).as("region and name defined - self")
+ .isEqualTo("/regions/regionPath/indexes/testSelf");
+ assertThat(index.getLinks().getList()).as("region and name defined - list")
+ .isEqualTo("/regions/regionPath/indexes");
- });
}
@Test