Skip to content

Commit

Permalink
Merge pull request hazelcast#11 from leszko/fix-for-3-11
Browse files Browse the repository at this point in the history
Update to version 3.11
  • Loading branch information
Rafał Leszko committed Oct 26, 2018
2 parents 64e91bd + 07178c7 commit e8cc319
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<jdk.version>1.6</jdk.version>

<hazelcast.version>3.10.4</hazelcast.version>
<hazelcast.version>3.11</hazelcast.version>

<junit.version>4.12</junit.version>
<mockito.version>1.10.19</mockito.version>
Expand Down Expand Up @@ -353,7 +353,7 @@
<profile>
<id>master</id>
<properties>
<hazelcast.version>3.11-SNAPSHOT</hazelcast.version>
<hazelcast.version>3.12-SNAPSHOT</hazelcast.version>
</properties>
<dependencies>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/hazelcast/gcp/GcpAuthenticator.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/hazelcast/gcp/GcpComputeApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/hazelcast/gcp/GcpMetadataApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit e8cc319

Please sign in to comment.