Merge pull request #39 from kintone/chore-update-dependencies

chore: update dependencies

build.gradle

@@ -1,10 +1,9 @@
 plugins {
     id 'java'
-    id 'maven'
     id 'signing'
     id 'maven-publish'
-    id 'com.diffplug.spotless' version '6.2.0'
-    id 'com.github.hierynomus.license' version '0.15.0'
+    id 'com.diffplug.spotless' version '6.11.0'
+    id 'com.github.hierynomus.license' version '0.16.1'
 }
 
 version = '1.4.0'
@@ -26,18 +25,18 @@ artifacts {
 
 dependencies {
     implementation 'org.apache.httpcomponents.client5:httpclient5:5.1.3'
-    implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.2.2'
-    implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.2'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.4.2'
+    implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.4'
 
-    compileOnly 'org.projectlombok:lombok:1.18.22'
-    annotationProcessor 'org.projectlombok:lombok:1.18.22'
+    compileOnly 'org.projectlombok:lombok:1.18.24'
+    annotationProcessor 'org.projectlombok:lombok:1.18.24'
 
-    testImplementation 'com.google.guava:guava:30.1-jre'
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
-    testImplementation 'org.assertj:assertj-core:3.22.0'
-    testImplementation 'org.mock-server:mockserver-netty:5.11.2'
+    testImplementation 'com.google.guava:guava:31.1-jre'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.mock-server:mockserver-netty:5.14.0'
 
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
 }
 
 downloadLicenses {

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +175,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 

license-finder-decisions.yml

@@ -11,12 +11,30 @@
     :why:
     :versions: []
     :when: 2021-06-03 00:56:26.027980587 Z
+- - :permit
+  - The MIT License (MIT)
+  - :who:
+    :why:
+    :versions: []
+    :when: 2022-10-18 09:00:00.000000000 Z
 - - :permit
   - BSD
   - :who:
     :why:
     :versions: []
     :when: 2021-06-03 00:56:26.027980587 Z
+- - :permit
+  - New BSD
+  - :who:
+    :why:
+    :versions: []
+    :when: 2022-10-18 09:00:00.000000000 Z
+- - :permit
+  - The (New) BSD License
+  - :who:
+    :why:
+    :versions: []
+    :when: 2022-10-18 09:00:00.000000000 Z
 - - :permit
   - BSD License 3
   - :who:
@@ -30,32 +48,29 @@
     :versions: []
     :when: 2021-06-03 00:56:26.027980587 Z
 - - :permit
-  - Mozilla Public License 2.0
+  - Eclipse Distribution License - v 1.0
   - :who:
     :why:
     :versions: []
-    :when: 2021-06-03 00:56:26.027980587 Z
-- - :approve
-  - jakarta.activation-api
+    :when: 2022-10-18 09:00:00.000000000 Z
+- - :permit
+  - EDL 1.0
   - :who:
-    :why: Eclipse Distribution License 1.0
-    :versions:
-    - 1.2.1
-    :when: 2021-06-03 00:56:26.027980587 Z
-- - :approve
-  - jakarta.xml.bind-api
+    :why:
+    :versions: []
+    :when: 2022-10-18 09:00:00.000000000 Z
+- - :permit
+  - Mozilla Public License 2.0
   - :who:
-    :why: Eclipse Distribution License 1.0
-    :versions:
-    - 2.3.2
+    :why:
+    :versions: []
     :when: 2021-06-03 00:56:26.027980587 Z
-- - :approve
-  - javax.activation-api
+- - :permit
+  - Bouncy Castle Licence
   - :who:
-    :why: CDDL/GPLv2+CE
-    :versions:
-    - 1.2.0
-    :when: 2021-06-03 00:56:26.027980587 Z
+    :why:
+    :versions: []
+    :when: 2022-10-18 09:00:00.000000000 Z
 - - :approve
   - javax.servlet-api
   - :who:

src/test/java/com/kintone/client/InternalClientImplTest.java

@@ -351,7 +351,7 @@ public void upload() throws IOException {
         server.verify(httpRequest, VerificationTimes.once());
         assertThat(resp.getFileKey()).isEqualTo("testkey");
 
-        HttpRequest recordedRequest = (HttpRequest) server.retrieveRecordedRequests(httpRequest)[0];
+        HttpRequest recordedRequest = server.retrieveRecordedRequests(httpRequest)[0];
         String body = recordedRequest.getBodyAsString();
         assertThat(body).startsWith("--" + boundary + "\r\n");
         assertThat(body).endsWith("\r\n--" + boundary + "--\r\n");
@@ -387,7 +387,7 @@ public void upload_multibyte_character() throws IOException {
         server.verify(httpRequest, VerificationTimes.once());
         assertThat(resp.getFileKey()).isEqualTo("testkey");
 
-        HttpRequest recordedRequest = (HttpRequest) server.retrieveRecordedRequests(httpRequest)[0];
+        HttpRequest recordedRequest = server.retrieveRecordedRequests(httpRequest)[0];
         String body = recordedRequest.getBodyAsString();
         assertThat(body).startsWith("--" + boundary + "\r\n");
         assertThat(body).endsWith("\r\n--" + boundary + "--\r\n");