Merge pull request #10 from griddb/5.6-rc

Update for 5.6

Author: AnggaSuherman

README.md

@@ -8,7 +8,7 @@ GridDB WebAPI is developed using GridDB Java Client and [Spring Boot](https://sp
 
 Building of the library and execution of the sample programs have been checked in the following environment.
 - OS: CentOS 7.9(x64)
-- [GridDB Server](https://github.com/griddb/griddb): 5.5
+- [GridDB Server](https://github.com/griddb/griddb): 5.6
 
 ## QuickStart
 

common/build.gradle

@@ -15,19 +15,19 @@ sourceSets {
 def gridstoreVersion = '5.5.0'
 
 dependencies { 
-    compile group: 'commons-io', name: 'commons-io', version: '2.4'
+    compile group: 'commons-io', name: 'commons-io', version: '2.15.1'
 
-    compile group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.2.3'
+    compile group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.16.1'
 
-    compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.2.3'
+    compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.16.1'
 
-    compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.2.3'
+    compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.16.1'
 
     compile group: 'javax.json', name: 'javax.json-api', version: '1.0'
 
     compile group: 'com.sun.jersey', name: 'jersey-client', version: '1.17.1'
 
-    compile group: 'com.sun.jersey', name: 'jersey-core', version: '1.17.1'
+    //compile group: 'com.sun.jersey', name: 'jersey-core', version: '1.17.1'
 
     compile files('../3rd_party/orion-ssh2/orion-ssh2-214.jar')
 

common/src/com/toshiba/mwcloud/gs/tools/common/GSCluster.java

@@ -57,6 +57,7 @@ public GSCluster(String clusterName, String multicastAddr, int port, List<T> nod
 		this.nodes = new ArrayList<T>(nodes);
 	}
 
+    @SafeVarargs
 	public GSCluster(String clusterName, String multicastAddr, int port, T... nodes) {
 		this(clusterName, multicastAddr, port, Arrays.asList(nodes));
 	}
@@ -77,6 +78,7 @@ public GSCluster(String clusterName, String multicastAddr, int port,
 		this.nodes = new ArrayList<T>(nodes);
 	}
 
+    @SafeVarargs
 	public GSCluster(String clusterName, String multicastAddr, int port,
 						String jdbcAddr, int jdbcPort, T... nodes){
 		this(clusterName, multicastAddr, port, jdbcAddr, jdbcPort, Arrays.asList(nodes));

webapi-ce/build.gradle

@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        springBootVersion = '2.1.0.RELEASE'
+        springBootVersion = '2.7.18'
     }
     repositories {
         mavenCentral()
@@ -16,7 +16,7 @@ apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 
 group = 'com.toshiba.mwcloud.gs.tools'
-version = '5.5.0'
+version = '5.6.0'
 sourceCompatibility = 1.8
 
 def gridstoreVersion = '5.5.0'
@@ -45,5 +45,5 @@ bootJar {
     }
     archivesBaseName = 'griddb-webapi-ce'
 
-    exclude("slf4j-jdk14-1.7.25.jar", "jackson-core-2.2.3.jar", "jackson-databind-2.2.3.jar", "jackson-annotations-2.2.3.jar")
+    exclude("slf4j-jdk14-1.7.36.jar", "jackson-core-2.16.1.jar", "jackson-databind-2.16.1.jar", "jackson-annotations-2.16.1.jar")
 }

webapi-ce/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists