You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by db...@apache.org on 2020/01/22 22:48:04 UTC
[geode] 03/05: Adapt geode-assembly integration tests to Nordix
release 1.11.0.1
This is an automated email from the ASF dual-hosted git repository.
dbarnes pushed a commit to tag rel/v1.11.0.1
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 221c6a9953b4085f36ad3c84657b24e0e00f2249
Author: Mario Kevo <ma...@est.tech>
AuthorDate: Tue Jan 7 14:40:20 2020 +0100
Adapt geode-assembly integration tests to Nordix release 1.11.0.1
---
.../src/test/resources/expected-pom.xml | 4 +-
.../integrationTest/resources/assembly_content.txt | 56 +++++++++++-----------
.../resources/dependency_classpath.txt | 34 ++++++-------
.../src/test/resources/expected-pom.xml | 10 ++--
.../geode/rest/internal/web/util/JsonWriter.java | 2 +-
gradle.properties | 2 +-
6 files changed, 54 insertions(+), 54 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 ba90673..9bf25e3 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -136,7 +136,7 @@
<dependency>
<groupId>com.tngtech.archunit</groupId>
<artifactId>archunit-junit4</artifactId>
- <version>0.10.2</version>
+ <version>0.12.0</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -448,7 +448,7 @@
<dependency>
<groupId>org.springframework.hateoas</groupId>
<artifactId>spring-hateoas</artifactId>
- <version>0.25.0.RELEASE</version>
+ <version>1.0.1.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt b/geode-assembly/src/integrationTest/resources/assembly_content.txt
index 87af445..e254559 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -951,26 +951,26 @@ lib/commons-modeler-2.0.1.jar
lib/commons-validator-1.6.jar
lib/fastutil-8.3.0.jar
lib/geo-0.7.1.jar
-lib/geode-common-0.0.0.jar
-lib/geode-connectors-0.0.0.jar
-lib/geode-core-0.0.0.jar
-lib/geode-cq-0.0.0.jar
+lib/geode-common-0.0.0.1.jar
+lib/geode-connectors-0.0.0.1.jar
+lib/geode-core-0.0.0.1.jar
+lib/geode-cq-0.0.0.1.jar
lib/geode-dependencies.jar
-lib/geode-http-service-0.0.0.jar
-lib/geode-jca-0.0.0.rar
-lib/geode-log4j-0.0.0.jar
-lib/geode-logging-0.0.0.jar
-lib/geode-lucene-0.0.0.jar
-lib/geode-management-0.0.0.jar
-lib/geode-memcached-0.0.0.jar
-lib/geode-old-client-support-0.0.0.jar
-lib/geode-protobuf-0.0.0.jar
-lib/geode-protobuf-messages-0.0.0.jar
-lib/geode-rebalancer-0.0.0.jar
-lib/geode-redis-0.0.0.jar
-lib/geode-serialization-0.0.0.jar
-lib/geode-unsafe-0.0.0.jar
-lib/geode-wan-0.0.0.jar
+lib/geode-http-service-0.0.0.1.jar
+lib/geode-jca-0.0.0.1.rar
+lib/geode-log4j-0.0.0.1.jar
+lib/geode-logging-0.0.0.1.jar
+lib/geode-lucene-0.0.0.1.jar
+lib/geode-management-0.0.0.1.jar
+lib/geode-memcached-0.0.0.1.jar
+lib/geode-old-client-support-0.0.0.1.jar
+lib/geode-protobuf-0.0.0.1.jar
+lib/geode-protobuf-messages-0.0.0.1.jar
+lib/geode-rebalancer-0.0.0.1.jar
+lib/geode-redis-0.0.0.1.jar
+lib/geode-serialization-0.0.0.1.jar
+lib/geode-unsafe-0.0.0.1.jar
+lib/geode-wan-0.0.0.1.jar
lib/gfsh-dependencies.jar
lib/grumpy-core-0.2.2.jar
lib/httpclient-4.5.10.jar
@@ -1037,12 +1037,12 @@ lib/spring-expression-4.3.23.RELEASE.jar
lib/spring-shell-1.2.0.RELEASE.jar
lib/spring-web-5.2.1.RELEASE.jar
lib/swagger-annotations-1.5.23.jar
-tools/ClientProtocol/geode-protobuf-messages-definitions-0.0.0.zip
-tools/Extensions/geode-web-0.0.0.war
-tools/Extensions/geode-web-api-0.0.0.war
-tools/Extensions/geode-web-management-0.0.0.war
-tools/Modules/Apache_Geode_Modules-0.0.0-AppServer.zip
-tools/Modules/Apache_Geode_Modules-0.0.0-Tomcat.zip
-tools/Modules/Apache_Geode_Modules-0.0.0-tcServer.zip
-tools/Modules/Apache_Geode_Modules-0.0.0-tcServer30.zip
-tools/Pulse/geode-pulse-0.0.0.war
+tools/ClientProtocol/geode-protobuf-messages-definitions-0.0.0.1.zip
+tools/Extensions/geode-web-0.0.0.1.war
+tools/Extensions/geode-web-api-0.0.0.1.war
+tools/Extensions/geode-web-management-0.0.0.1.war
+tools/Modules/Apache_Geode_Modules-0.0.0.1-AppServer.zip
+tools/Modules/Apache_Geode_Modules-0.0.0.1-Tomcat.zip
+tools/Modules/Apache_Geode_Modules-0.0.0.1-tcServer.zip
+tools/Modules/Apache_Geode_Modules-0.0.0.1-tcServer30.zip
+tools/Pulse/geode-pulse-0.0.0.1.war
diff --git a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
index f642969..9b382ed 100644
--- a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
+++ b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
@@ -1,20 +1,20 @@
-geode-common-0.0.0.jar
-geode-connectors-0.0.0.jar
-geode-core-0.0.0.jar
-geode-cq-0.0.0.jar
-geode-http-service-0.0.0.jar
-geode-log4j-0.0.0.jar
-geode-logging-0.0.0.jar
-geode-lucene-0.0.0.jar
-geode-management-0.0.0.jar
-geode-memcached-0.0.0.jar
-geode-old-client-support-0.0.0.jar
-geode-protobuf-0.0.0.jar
-geode-protobuf-messages-0.0.0.jar
-geode-rebalancer-0.0.0.jar
-geode-redis-0.0.0.jar
-geode-serialization-0.0.0.jar
-geode-wan-0.0.0.jar
+geode-common-0.0.0.1.jar
+geode-connectors-0.0.0.1.jar
+geode-core-0.0.0.1.jar
+geode-cq-0.0.0.1.jar
+geode-http-service-0.0.0.1.jar
+geode-log4j-0.0.0.1.jar
+geode-logging-0.0.0.1.jar
+geode-lucene-0.0.0.1.jar
+geode-management-0.0.0.1.jar
+geode-memcached-0.0.0.1.jar
+geode-old-client-support-0.0.0.1.jar
+geode-protobuf-0.0.0.1.jar
+geode-protobuf-messages-0.0.0.1.jar
+geode-rebalancer-0.0.0.1.jar
+geode-redis-0.0.0.1.jar
+geode-serialization-0.0.0.1.jar
+geode-wan-0.0.0.1.jar
jackson-databind-2.10.0.jar
jackson-annotations-2.10.0.jar
jackson-core-2.10.0.jar
diff --git a/geode-http-service/src/test/resources/expected-pom.xml b/geode-http-service/src/test/resources/expected-pom.xml
index ad46c5b..3b75c2f 100644
--- a/geode-http-service/src/test/resources/expected-pom.xml
+++ b/geode-http-service/src/test/resources/expected-pom.xml
@@ -47,6 +47,11 @@
</dependencyManagement>
<dependencies>
<dependency>
+ <groupId>org.apache.geode</groupId>
+ <artifactId>geode-logging</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<scope>runtime</scope>
@@ -62,11 +67,6 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.geode</groupId>
- <artifactId>geode-logging</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<scope>runtime</scope>
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/util/JsonWriter.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/util/JsonWriter.java
index 62a4485..5af14a8 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/util/JsonWriter.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/util/JsonWriter.java
@@ -55,7 +55,7 @@ public class JsonWriter {
generator.writeStartObject();
generator.writeFieldName("rel");
- generator.writeString(value.getRel());
+ generator.writeString(value.getRel().value());
generator.writeFieldName("href");
generator.writeString(value.getHref());
diff --git a/gradle.properties b/gradle.properties
index b41b616..874ffb9 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -28,7 +28,7 @@
# <blank> - release
#
# The full version string consists of 'versionNumber + releaseQualifier + releaseType'
-version = 1.11.0
+version = 1.11.0.1
# Default Maven targets
mavenSnapshotUrl = gcs://maven.apachegeode-ci.info/snapshots