Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update dependencies #127

Merged
merged 3 commits into from
Oct 11, 2021
Merged

Update dependencies #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
05a0148
update dependencies of kontent-delivery and kontent-delivery-generators
connyduck Jan 15, 2021
1a04332
use JavaTimeModule instead of deprecated JSR310Module module
connyduck Jan 15, 2021
12b7a5d
Merge branch 'master' into update_dependencies
Simply007 Sep 30, 2021
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
14 changes: 7 additions & 7 deletions kontent-delivery-generators/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "io.franzbecker.gradle-lombok" version "1.14"
id "io.franzbecker.gradle-lombok" version "4.0.0"
}

apply plugin: 'java'
Expand All @@ -11,17 +11,17 @@ sourceCompatibility = "1.8"
targetCompatibility = "1.8"

dependencies {
compile('com.squareup:javapoet:1.9.0')
compile('com.google.guava:guava:23.0')
implementation('com.squareup:javapoet:1.13.0')
implementation('com.google.guava:guava:24.1-jre')
implementation project(':kontent-delivery')

testCompile("junit:junit:4.12");
testCompile("org.apache.httpcomponents:httpclient:4.5.3:tests");
testCompile("org.apache.httpcomponents:httpclient:4.5.3");
testImplementation("junit:junit:4.13.1");
testImplementation("org.apache.httpcomponents:httpclient:4.5.13:tests");
testImplementation("org.apache.httpcomponents:httpclient:4.5.13");
}

lombok {
version = "1.18.2"
version = "1.18.16"
sha256 = ""
}

Expand Down
24 changes: 12 additions & 12 deletions kontent-delivery/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "io.franzbecker.gradle-lombok" version "1.14"
id "io.franzbecker.gradle-lombok" version "4.0.0"
}

apply plugin: 'java'
Expand All @@ -10,27 +10,27 @@ sourceCompatibility = "1.8"
targetCompatibility = "1.8"

dependencies {
implementation("org.slf4j:slf4j-api:1.7.25")
implementation("org.slf4j:slf4j-api:1.7.30")

implementation("com.fasterxml.jackson.core:jackson-core:2.8.9")
implementation("com.fasterxml.jackson.core:jackson-databind:2.8.9")
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.4.0")
implementation("com.fasterxml.jackson.core:jackson-core:2.12.0")
implementation("com.fasterxml.jackson.core:jackson-databind:2.12.0")
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.12.0")

implementation("com.madrobot:madrobotbeans:0.1")
implementation("io.github.classgraph:classgraph:4.8.90")

implementation("com.squareup.okhttp3:okhttp:4.5.0")
implementation("com.squareup.okhttp3:okhttp:4.9.0")

compileOnly("org.thymeleaf:thymeleaf:3.0.0.RELEASE")
testCompile("org.thymeleaf:thymeleaf:3.0.0.RELEASE")
compileOnly("org.thymeleaf:thymeleaf:3.0.11.RELEASE")
testImplementation("org.thymeleaf:thymeleaf:3.0.11.RELEASE")

testCompile("junit:junit:4.12")
testCompile("org.apache.httpcomponents:httpclient:4.5.3:tests")
testCompile("org.apache.httpcomponents:httpclient:4.5.3")
testImplementation("junit:junit:4.13.1")
testImplementation("org.apache.httpcomponents:httpclient:4.5.13:tests")
testImplementation("org.apache.httpcomponents:httpclient:4.5.13")
}

lombok {
version = "1.18.2"
version = "1.18.16"
sha256 = ""
}

Expand Down
4 changes: 2 additions & 2 deletions kontent-delivery/src/main/java/kentico/kontent/delivery/DeliveryClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.datatype.jsr310.JSR310Module;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import kentico.kontent.delivery.template.TemplateEngineConfig;
import lombok.extern.slf4j.Slf4j;
import okhttp3.*;
Expand Down Expand Up @@ -666,7 +666,7 @@ private void reconfigureDeserializer() {
.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);

SimpleModule module = new SimpleModule();
objectMapper.registerModule(new JSR310Module());
objectMapper.registerModule(new JavaTimeModule());
objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);

objectMapper.registerModule(module);
Expand Down