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/04 00:18:46 UTC
[geode] branch support/1.13 updated: Revert "GEODE-8496: Bump jetty
from 9.4.21.v20190926 to 9.4.33.v20201020 (#5574)"
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 6b8f5b0 Revert "GEODE-8496: Bump jetty from 9.4.21.v20190926 to 9.4.33.v20201020 (#5574)"
6b8f5b0 is described below
commit 6b8f5b03cc3c0927cd7eef23e5cc627a780f8a0c
Author: Owen Nichols <on...@apache.org>
AuthorDate: Tue Nov 3 16:06:25 2020 -0800
Revert "GEODE-8496: Bump jetty from 9.4.21.v20190926 to 9.4.33.v20201020 (#5574)"
This reverts commits:
* 23d2dc7553cb30e600ba5792e87b0e26ce0eb028
* fdaa2be509d0a86de63f576f35b300d8f2aa6817
* 9b6ec9e6adbf55a07f62cb1fd89ca2e0e54a2d49
We should consider undoing this revert when the timing is better.
---
.../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, 35 insertions(+), 36 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 75ae8fc..45f57d9 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.33.v20201020</version>
+ <version>9.4.21.v20190926</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
- <version>9.4.33.v20201020</version>
+ <version>9.4.21.v20190926</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 375ac4a..01ae79f 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.33.v20201020")
+ deps.put("jetty.version", "9.4.21.v20190926")
// 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 2573346..96d5ace 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,8 +184,7 @@ public class ListIndexManagementDUnitTest {
public void getIndex_fails_when_region_name_is_missing_from_filter() {
indexConfig.setName("index1");
assertThatThrownBy(() -> cms.get(indexConfig))
- .isInstanceOf(IllegalArgumentException.class)
- .hasMessageContaining("Unable to construct the URI with the current configuration");
+ .hasMessageContaining("Error while extracting response for type");
}
@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 69e1333..a93e581 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.33.v20201020";
+ private static final String JETTY_VERSION = "9.4.21.v20190926";
/**
* 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 48bd348..d71a251 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.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/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/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 a8d1174..c0a6ca4 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.33.v20201020.jar
-jetty-servlet-9.4.33.v20201020.jar
-jetty-security-9.4.33.v20201020.jar
-jetty-server-9.4.33.v20201020.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
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.33.v20201020.jar
-jetty-io-9.4.33.v20201020.jar
-jetty-xml-9.4.33.v20201020.jar
-jetty-util-9.4.33.v20201020.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
log4j-slf4j-impl-2.13.1.jar
log4j-core-2.13.1.jar
log4j-jul-2.13.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 32a2bf7..6e73740 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,10 +103,8 @@ 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(null, INDEXES);
+ return new Links(getId(), 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 6b049c3..075fbae 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,20 +64,22 @@ public class IndexTest {
@Test
public void getEndPoint() {
- assertThat(index.getLinks().getList()).isEqualTo("/indexes");
+ assertSoftly(softly -> {
+ assertThat(index.getLinks().getList()).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.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.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");
+ 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");
+ });
}
@Test