Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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 {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
29 changes: 12 additions & 17 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

53 changes: 34 additions & 19 deletions license-finder-decisions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/kintone/client/InternalClientImplTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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");
Expand Down