From 21d7670b02108dfa0e5092c5fd4d7efb4759d190 Mon Sep 17 00:00:00 2001 From: Rafal Leszko Date: Fri, 7 Sep 2018 16:42:51 +0200 Subject: [PATCH 1/2] Update to version 3.11 --- pom.xml | 2 +- src/main/java/com/hazelcast/gcp/GcpAuthenticator.java | 4 ++-- src/main/java/com/hazelcast/gcp/GcpComputeApi.java | 6 +++--- src/main/java/com/hazelcast/gcp/GcpMetadataApi.java | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index cf748c7b988b..913f9082c441 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ 1.6 - 3.10.4 + 3.11-BETA-1 4.12 1.10.19 diff --git a/src/main/java/com/hazelcast/gcp/GcpAuthenticator.java b/src/main/java/com/hazelcast/gcp/GcpAuthenticator.java index 6cf7015e96a2..6dae9c0178a3 100644 --- a/src/main/java/com/hazelcast/gcp/GcpAuthenticator.java +++ b/src/main/java/com/hazelcast/gcp/GcpAuthenticator.java @@ -16,8 +16,8 @@ package com.hazelcast.gcp; -import com.hazelcast.com.eclipsesource.json.Json; -import com.hazelcast.com.eclipsesource.json.JsonObject; +import com.hazelcast.internal.json.Json; +import com.hazelcast.internal.json.JsonObject; import com.hazelcast.core.HazelcastException; import com.hazelcast.util.Base64; diff --git a/src/main/java/com/hazelcast/gcp/GcpComputeApi.java b/src/main/java/com/hazelcast/gcp/GcpComputeApi.java index c886fd424dfb..8ec1932c9bd6 100644 --- a/src/main/java/com/hazelcast/gcp/GcpComputeApi.java +++ b/src/main/java/com/hazelcast/gcp/GcpComputeApi.java @@ -16,9 +16,9 @@ package com.hazelcast.gcp; -import com.hazelcast.com.eclipsesource.json.Json; -import com.hazelcast.com.eclipsesource.json.JsonArray; -import com.hazelcast.com.eclipsesource.json.JsonValue; +import com.hazelcast.internal.json.Json; +import com.hazelcast.internal.json.JsonArray; +import com.hazelcast.internal.json.JsonValue; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/hazelcast/gcp/GcpMetadataApi.java b/src/main/java/com/hazelcast/gcp/GcpMetadataApi.java index 5d159b8a0437..fb8fa436c609 100644 --- a/src/main/java/com/hazelcast/gcp/GcpMetadataApi.java +++ b/src/main/java/com/hazelcast/gcp/GcpMetadataApi.java @@ -16,7 +16,7 @@ package com.hazelcast.gcp; -import com.hazelcast.com.eclipsesource.json.Json; +import com.hazelcast.internal.json.Json; /** * Responsible for connecting to the Google Cloud Instance Metadata API. From 07178c75a4ce8c43a2969449d8242fd97bbe7c07 Mon Sep 17 00:00:00 2001 From: Rafal Leszko Date: Thu, 25 Oct 2018 09:40:39 +0200 Subject: [PATCH 2/2] Update Hazelcast to 3.11 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 913f9082c441..772a0b21e8b5 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ 1.6 - 3.11-BETA-1 + 3.11 4.12 1.10.19 @@ -353,7 +353,7 @@ master - 3.11-SNAPSHOT + 3.12-SNAPSHOT