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:21 UTC
[geode] branch support/1.12 updated (b027331 -> 3d92903)
This is an automated email from the ASF dual-hosted git repository.
onichols pushed a change to branch support/1.12
in repository https://gitbox.apache.org/repos/asf/geode.git.
from b027331 GEODE-8607: Adding some test API to get oldest tombstone (#5623) (#5733)
new 741b0b4 GEODE-8682: Bump jetty from 9.4.21.v20190926 to 9.4.33.v20201020
new 3d92903 GEODE-8718: Bump shiro from 1.6.0 to 1.7.0
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/test/resources/expected-pom.xml | 6 ++--
.../gradle/plugins/DependencyConstraints.groovy | 4 +--
.../rest/ListIndexManagementDUnitTest.java | 3 +-
.../session/tests/GenericAppServerInstall.java | 2 +-
.../integrationTest/resources/assembly_content.txt | 34 +++++++++++-----------
.../resources/dependency_classpath.txt | 34 +++++++++++-----------
.../geode/management/configuration/Index.java | 4 ++-
.../geode/management/configuration/IndexTest.java | 24 +++++++--------
8 files changed, 56 insertions(+), 55 deletions(-)
[geode] 01/02: GEODE-8682: Bump jetty from 9.4.21.v20190926 to
9.4.33.v20201020
Posted by on...@apache.org.
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
[geode] 02/02: GEODE-8718: Bump shiro from 1.6.0 to 1.7.0
Posted by on...@apache.org.
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 3d929034e9f06041e93b592b0fb18fb8a8e29c13
Author: Owen Nichols <on...@apache.org>
AuthorDate: Tue Nov 17 21:18:01 2020 -0800
GEODE-8718: Bump shiro from 1.6.0 to 1.7.0
---
boms/geode-all-bom/src/test/resources/expected-pom.xml | 2 +-
.../geode/gradle/plugins/DependencyConstraints.groovy | 2 +-
.../src/integrationTest/resources/assembly_content.txt | 18 +++++++++---------
.../integrationTest/resources/dependency_classpath.txt | 18 +++++++++---------
4 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 df799d9..a11e9ee 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -346,7 +346,7 @@
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId>
- <version>1.6.0</version>
+ <version>1.7.0</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 6cbd020..6619edd 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
@@ -42,7 +42,7 @@ class DependencyConstraints implements Plugin<Project> {
deps.put("jgroups.version", "3.6.14.Final")
deps.put("log4j.version", "2.12.1")
deps.put("micrometer.version", "1.2.1")
- deps.put("shiro.version", "1.6.0")
+ deps.put("shiro.version", "1.7.0")
deps.put("slf4j-api.version", "1.7.28")
// These version numbers are used in testing various versions of tomcat and are consumed explicitly
diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt b/geode-assembly/src/integrationTest/resources/assembly_content.txt
index effda08..677163d 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -1044,15 +1044,15 @@ lib/netty-all-4.1.48.Final.jar
lib/protobuf-java-3.10.0.jar
lib/ra.jar
lib/rmiio-2.1.2.jar
-lib/shiro-cache-1.6.0.jar
-lib/shiro-config-core-1.6.0.jar
-lib/shiro-config-ogdl-1.6.0.jar
-lib/shiro-core-1.6.0.jar
-lib/shiro-crypto-cipher-1.6.0.jar
-lib/shiro-crypto-core-1.6.0.jar
-lib/shiro-crypto-hash-1.6.0.jar
-lib/shiro-event-1.6.0.jar
-lib/shiro-lang-1.6.0.jar
+lib/shiro-cache-1.7.0.jar
+lib/shiro-config-core-1.7.0.jar
+lib/shiro-config-ogdl-1.7.0.jar
+lib/shiro-core-1.7.0.jar
+lib/shiro-crypto-cipher-1.7.0.jar
+lib/shiro-crypto-core-1.7.0.jar
+lib/shiro-crypto-hash-1.7.0.jar
+lib/shiro-event-1.7.0.jar
+lib/shiro-lang-1.7.0.jar
lib/slf4j-api-1.7.28.jar
lib/snappy-0.4.jar
lib/spring-beans-5.2.9.RELEASE.jar
diff --git a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
index 5f99eb8..54a693a 100644
--- a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
+++ b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
@@ -34,8 +34,8 @@ antlr-2.7.7.jar
javax.activation-1.2.0.jar
istack-commons-runtime-3.0.9.jar
commons-validator-1.6.jar
-shiro-core-1.6.0.jar
-shiro-config-ogdl-1.6.0.jar
+shiro-core-1.7.0.jar
+shiro-config-ogdl-1.7.0.jar
commons-beanutils-1.9.4.jar
commons-collections-3.2.2.jar
commons-io-2.6.jar
@@ -56,13 +56,13 @@ jopt-simple-5.0.4.jar
httpcore-4.4.12.jar
snappy-0.4.jar
jgroups-3.6.14.Final.jar
-shiro-cache-1.6.0.jar
-shiro-crypto-hash-1.6.0.jar
-shiro-crypto-cipher-1.6.0.jar
-shiro-config-core-1.6.0.jar
-shiro-event-1.6.0.jar
-shiro-crypto-core-1.6.0.jar
-shiro-lang-1.6.0.jar
+shiro-cache-1.7.0.jar
+shiro-crypto-hash-1.7.0.jar
+shiro-crypto-cipher-1.7.0.jar
+shiro-config-core-1.7.0.jar
+shiro-event-1.7.0.jar
+shiro-crypto-core-1.7.0.jar
+shiro-lang-1.7.0.jar
slf4j-api-1.7.28.jar
swagger-annotations-1.5.23.jar
spring-core-5.2.9.RELEASE.jar