Skip to content

Commit

Permalink
Updated dependencies (#57)
Browse files Browse the repository at this point in the history
* 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](qos-ch/logback@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] <[email protected]>

* 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] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Evgeny <[email protected]>

* 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](spring-gradle-plugins/dependency-management-plugin@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] <[email protected]>
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] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
Dankoy and dependabot[bot] authored Feb 4, 2024
1 parent 3d67bd0 commit 257a0ac
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 9 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 8 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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'
Expand Down Expand Up @@ -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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down Expand Up @@ -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<String, Object> templateData = new HashMap<>();
templateData.put("ankiData", ankiData);
Expand All @@ -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<String, Object> templateData = new HashMap<>();
templateData.put("ankiDataList", Collections.singletonList(ankiData));
Expand Down

0 comments on commit 257a0ac

Please sign in to comment.