Skip to content

Commit afc92cd

Browse files
committed
fix: revert to Spring Boot 3.5
1 parent 91d2363 commit afc92cd

File tree

3 files changed

+17
-25
lines changed

3 files changed

+17
-25
lines changed

backend/build.gradle

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*/
1313
plugins {
1414
id 'java'
15-
id 'org.springframework.boot' version '4.0.0'
15+
id 'org.springframework.boot' version '3.5.8'
1616
id 'io.spring.dependency-management' version '1.1.7'
1717
}
1818

@@ -32,33 +32,23 @@ repositories {
3232

3333
dependencies {
3434
implementation platform("org.springframework.ai:spring-ai-bom:1.1.0")
35-
36-
implementation project(':frontend')
3735
implementation 'org.springframework.boot:spring-boot-starter-actuator'
3836
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
39-
implementation 'org.springframework.boot:spring-boot-starter-hateoas'
40-
implementation 'org.springframework.boot:spring-boot-starter-liquibase'
41-
implementation 'org.springframework.boot:spring-boot-starter-restclient'
4237
implementation 'org.springframework.boot:spring-boot-starter-security'
43-
implementation 'org.springframework.boot:spring-boot-starter-validation'
44-
implementation 'org.springframework.boot:spring-boot-starter-webmvc'
45-
runtimeOnly 'io.micrometer:micrometer-registry-prometheus'
46-
testImplementation 'org.springframework.boot:spring-boot-starter-actuator-test'
47-
testImplementation 'org.springframework.boot:spring-boot-starter-data-jpa-test'
48-
testImplementation 'org.springframework.boot:spring-boot-starter-hateoas-test'
49-
testImplementation 'org.springframework.boot:spring-boot-starter-liquibase-test'
50-
testImplementation 'org.springframework.boot:spring-boot-starter-restclient-test'
51-
testImplementation 'org.springframework.boot:spring-boot-starter-security-test'
52-
testImplementation 'org.springframework.boot:spring-boot-starter-validation-test'
53-
testImplementation 'org.springframework.boot:spring-boot-starter-webmvc-test'
38+
implementation 'org.springframework.boot:spring-boot-starter-web'
5439
implementation 'org.springframework.ai:spring-ai-starter-mcp-client'
40+
//implementation 'org.springframework.ai:spring-ai-starter-mcp-server-webmvc'
5541
implementation 'org.springframework.ai:spring-ai-tika-document-reader'
56-
implementation 'tools.jackson.dataformat:jackson-dataformat-csv:3.0.2'
42+
implementation 'org.liquibase:liquibase-core'
43+
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-csv'
44+
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
5745
implementation 'net.javacrumbs.shedlock:shedlock-spring:6.0.1'
5846
implementation 'net.javacrumbs.shedlock:shedlock-provider-jdbc-template:6.0.1'
5947
implementation 'org.springframework.ai:spring-ai-starter-vector-store-pgvector'
6048
implementation 'org.springframework.ai:spring-ai-starter-model-transformers'
61-
implementation 'org.springframework.ai:spring-ai-starter-model-ollama'
49+
implementation 'org.springframework.ai:spring-ai-starter-model-ollama'
50+
testImplementation 'org.springframework.boot:spring-boot-starter-test'
51+
testImplementation 'org.springframework.security:spring-security-test'
6252
testImplementation 'com.tngtech.archunit:archunit-junit5:1.4.1'
6353
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
6454
}

backend/src/main/java/ch/xxx/aidoclibchat/adapter/client/ImportRestClient.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
import org.springframework.stereotype.Component;
1818
import org.springframework.web.client.RestClient;
1919

20+
import com.fasterxml.jackson.dataformat.csv.CsvMapper;
21+
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
22+
2023
import ch.xxx.aidoclibchat.domain.client.ImportClient;
2124
import ch.xxx.aidoclibchat.domain.model.dto.ArtistDto;
2225
import ch.xxx.aidoclibchat.domain.model.dto.MuseumDto;
@@ -31,19 +34,18 @@
3134
import ch.xxx.aidoclibchat.domain.model.entity.Work;
3235
import ch.xxx.aidoclibchat.domain.model.entity.WorkLink;
3336
import ch.xxx.aidoclibchat.usecase.mapping.TableMapper;
34-
import tools.jackson.dataformat.csv.CsvMapper;
35-
import tools.jackson.dataformat.csv.CsvSchema;
3637

3738
@Component
3839
public class ImportRestClient implements ImportClient {
3940
private final CsvMapper csvMapper;
4041
private final TableMapper tableMapper;
4142
private final RestClient restClient;
4243

43-
public ImportRestClient(TableMapper tableMapper, RestClient restClient, CsvMapper csvMapper) {
44+
public ImportRestClient(TableMapper tableMapper, RestClient restClient) {
4445
this.tableMapper = tableMapper;
4546
this.restClient = restClient;
46-
this.csvMapper = csvMapper;
47+
this.csvMapper = new CsvMapper();
48+
this.csvMapper.registerModule(new JavaTimeModule());
4749
}
4850

4951
@Override

mcp-server/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*/
1313
plugins {
1414
id 'java'
15-
id 'org.springframework.boot' version '4.0.0'
15+
id 'org.springframework.boot' version '3.5.8'
1616
id 'io.spring.dependency-management' version '1.1.7'
1717
}
1818

@@ -34,7 +34,7 @@ dependencies {
3434
implementation platform("org.springframework.ai:spring-ai-bom:1.1.0")
3535
implementation 'org.springframework.boot:spring-boot-starter-actuator'
3636
implementation 'org.springframework.ai:spring-ai-starter-mcp-server-webmvc'
37-
testImplementation 'org.springframework.boot:spring-boot-starter-webmvc-test'
37+
testImplementation 'org.springframework.boot:spring-boot-starter-test'
3838
testImplementation 'com.tngtech.archunit:archunit-junit5:1.4.1'
3939
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
4040
}

0 commit comments

Comments
 (0)