From 257a0acde3cab9c2581970955c457d8d5698a1b5 Mon Sep 17 00:00:00 2001 From: Evgeny Date: Sun, 4 Feb 2024 11:20:15 +0300 Subject: [PATCH] Updated dependencies (#57) * Chore(deps): bump ch.qos.logback:logback-classic from 1.4.11 to 1.4.11 from bom (#49) * Chore(deps): bump ch.qos.logback:logback-classic from 1.4.11 to 1.4.14 Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.4.11 to 1.4.14. - [Commits](https://github.com/qos-ch/logback/compare/v_1.4.11...v_1.4.14) --- updated-dependencies: - dependency-name: ch.qos.logback:logback-classic dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * chore: added logback-core to fix problems * test: fixed template builder tests * chore: removed versions from logback core and classic --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Evgeny * Chore(deps): bump io.spring.dependency-management from 1.1.3 to 1.1.4 (#48) Bumps [io.spring.dependency-management](https://github.com/spring-gradle-plugins/dependency-management-plugin) from 1.1.3 to 1.1.4. - [Release notes](https://github.com/spring-gradle-plugins/dependency-management-plugin/releases) - [Commits](https://github.com/spring-gradle-plugins/dependency-management-plugin/compare/v1.1.3...v1.1.4) --- updated-dependencies: - dependency-name: io.spring.dependency-management dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Chore(deps): bump org.springframework.boot from 3.1.3 to 3.2.2 (#47) * chore: updated README.md --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- README.md | 2 +- build.gradle | 12 ++++++++---- .../templatebuilder/TemplateBuilderImplTest.java | 8 ++++---- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 717ce5a..800be85 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ imported to anki ### Stack * Java 17 -* Spring boot 3.12 +* Spring boot 3.2.2 * Spring shell * Spring boot jdbc * Caffeine cache diff --git a/build.gradle b/build.gradle index 8d04092..b6b764a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' - id 'org.springframework.boot' version '3.1.3' - id 'io.spring.dependency-management' version '1.1.3' + id 'org.springframework.boot' version '3.2.2' + id 'io.spring.dependency-management' version '1.1.4' } group = 'ru.dankoy' @@ -30,9 +30,13 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-jdbc' implementation 'org.springframework.shell:spring-shell-starter' - implementation 'ch.qos.logback:logback-classic:1.4.11' + implementation 'ch.qos.logback:logback-classic' + implementation 'ch.qos.logback:logback-core' - implementation 'org.xerial:sqlite-jdbc' + // sqlite with default version from spring boot bom (3.42.1) doesn't work with spring boot 3.2.2 + // sqlite version 3.42.1 works with spring boot 3.1.3 + // Working sqlite version with spring boot 3.2.2 is 3.45.1.0 + implementation 'org.xerial:sqlite-jdbc:3.45.1.0' implementation 'com.fasterxml.jackson.core:jackson-databind' implementation 'com.squareup.okhttp3:okhttp' implementation 'com.squareup.okhttp3:logging-interceptor' diff --git a/src/test/java/ru/dankoy/korvotoanki/core/service/templatebuilder/TemplateBuilderImplTest.java b/src/test/java/ru/dankoy/korvotoanki/core/service/templatebuilder/TemplateBuilderImplTest.java index 3572c1c..097ec9b 100644 --- a/src/test/java/ru/dankoy/korvotoanki/core/service/templatebuilder/TemplateBuilderImplTest.java +++ b/src/test/java/ru/dankoy/korvotoanki/core/service/templatebuilder/TemplateBuilderImplTest.java @@ -25,8 +25,8 @@ import ru.dankoy.korvotoanki.core.exceptions.KorvoRootException; -@SpringBootTest -@Import(value = TemplateBuilderConfig.class) +@SpringBootTest(classes = {TemplateBuilder.class, TemplateBuilderConfig.class}) +//@Import(value = TemplateBuilderConfig.class) @DisplayName("Test TemplateBuilderImpl ") class TemplateBuilderImplTest { @@ -68,7 +68,7 @@ void writeTemplateMeaning() throws IOException, URISyntaxException { var path = Paths.get( getClass().getResource("/templates/correct/correct-meaning.ftl").toURI()); - var correct = String.join("\n", Files.readAllLines(path)); + var correct = String.join(System.lineSeparator(), Files.readAllLines(path)); Map templateData = new HashMap<>(); templateData.put("ankiData", ankiData); @@ -93,7 +93,7 @@ void writeTemplateAnkiExport() throws IOException, URISyntaxException { var path = Paths.get( getClass().getResource("/templates/correct/correct-korvo-to-anki-correct.ftl").toURI()); - var correct = String.join("\n", Files.readAllLines(path)); + var correct = String.join(System.lineSeparator(), Files.readAllLines(path)); Map templateData = new HashMap<>(); templateData.put("ankiDataList", Collections.singletonList(ankiData));