Skip to content

Commit 201f1a7

Browse files
committed
3823 Update spring boot to 4.0.1, spring ai to 2.0.0-M1, spring cloud to 2025.1.0, spring cloud aws to 4.0.0-M1
1 parent 28a4a97 commit 201f1a7

File tree

533 files changed

+1701
-1858
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

533 files changed

+1701
-1858
lines changed

build.gradle.kts

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ dependencyManagement {
2020

2121
versionCatalogUpdate {
2222
keep {
23-
versions.addAll("checkstyle", "gradle-git-properties", "jackson", "jacoco", "java", "jib-gradle-plugin", "pmd", "spotbugs", "spring-ai", "spring-boot", "spring-cloud-aws", "spring-cloud-dependencies", "spring-shell")
23+
versions.addAll("checkstyle", "gradle-git-properties", "jackson", "jacoco", "java", "jib-gradle-plugin", "pmd", "spotbugs", "spring-ai", "spring-boot", "spring-cloud-aws", "spring-cloud-dependencies", "spring-shell", "testcontainers")
2424
}
2525
}
2626

@@ -32,25 +32,19 @@ subprojects {
3232
dependencyManagement {
3333
dependencies {
3434
dependency("com.github.spotbugs:spotbugs-annotations:[4.9.3,)")
35-
dependency("org.quartz-scheduler:quartz:${rootProject.libs.versions.quartz.get()}")
3635
}
3736
}
3837

3938
dependencies {
4039
compileOnly(rootProject.libs.com.github.spotbugs.spotbugs.annotations)
4140

41+
implementation("org.jspecify:jspecify")
4242
implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES))
4343

4444
testCompileOnly(rootProject.libs.com.github.spotbugs.spotbugs.annotations)
4545

4646
testImplementation("org.springframework.boot:spring-boot-starter-test")
4747
}
48-
49-
configure<io.spring.gradle.dependencymanagement.dsl.DependencyManagementExtension> {
50-
imports {
51-
mavenBom("org.springframework.shell:spring-shell-dependencies:${rootProject.libs.versions.spring.shell.get()}")
52-
}
53-
}
5448
}
5549

5650
reporting {

buildSrc/src/main/kotlin/com.bytechef.java-common-conventions.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ plugins {
1515
pmd
1616
}
1717

18+
//https://melix.github.io/blog/2021/03/version-catalogs-faq.html#_can_i_use_the_version_catalog_in_buildsrc
19+
val libs = rootProject.extensions.getByType<VersionCatalogsExtension>().named("libs")
20+
1821
configurations.implementation {
1922
exclude(group = "org.slf4j", module = "slf4j-simple")
2023
}
2124

22-
//https://melix.github.io/blog/2021/03/version-catalogs-faq.html#_can_i_use_the_version_catalog_in_buildsrc
23-
val libs = rootProject.extensions.getByType<VersionCatalogsExtension>().named("libs")
24-
2525
checkstyle {
2626
toolVersion = "${libs.findVersion("checkstyle").get()}"
2727
configFile = file("${rootDir}/config/checkstyle/checkstyle.xml")

cli/build.gradle.kts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ sonarProperties.forEach { key, value ->
2020
subprojects {
2121
apply(plugin = "org.sonarqube")
2222

23-
dependencies {
24-
implementation("org.springframework.shell:spring-shell-starter")
25-
}
23+
// configure<io.spring.gradle.dependencymanagement.dsl.DependencyManagementExtension> {
24+
// imports {
25+
// mavenBom("org.springframework.shell:spring-shell-dependencies:${rootProject.libs.versions.spring.shell.get()}")
26+
// }
27+
// }
2628
}

cli/cli-app/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ dependencies {
2121
implementation(project(":cli:commands:component"))
2222

2323
implementation("org.springframework.boot:spring-boot-starter")
24-
implementation("org.springframework.shell:spring-shell-starter")
24+
implementation("org.springframework.boot:spring-boot-starter-validation")
25+
implementation("org.springframework.shell:spring-shell-starter:${rootProject.libs.versions.spring.shell.get()}")
2526

2627
testImplementation("org.springframework.boot:spring-boot-starter-test")
2728
}

cli/cli-app/src/main/java/com/bytechef/cli/CliApplication.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import com.bytechef.cli.command.component.ComponentCommand;
2020
import org.springframework.boot.SpringApplication;
2121
import org.springframework.boot.autoconfigure.SpringBootApplication;
22-
import org.springframework.shell.command.annotation.EnableCommand;
22+
import org.springframework.shell.core.command.annotation.EnableCommand;
2323

2424
/**
2525
* @author Ivica Cardic
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
dependencies {
22
implementation(project(":cli:commands:component:init:openapi"))
3+
implementation("org.springframework.shell:spring-shell-core:${rootProject.libs.versions.spring.shell.get()}")
34

45
testImplementation(project(":cli:cli-app"))
56
}

cli/commands/component/src/main/java/com/bytechef/cli/command/component/ComponentCommand.java

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,37 +18,33 @@
1818

1919
import com.bytechef.cli.command.component.init.openapi.ComponentInitOpenApiGenerator;
2020
import java.io.File;
21-
import org.springframework.shell.command.annotation.Command;
22-
import org.springframework.shell.command.annotation.Option;
21+
import org.springframework.shell.core.command.annotation.Command;
22+
import org.springframework.shell.core.command.annotation.Option;
2323

24-
@Command(command = "component", description = "Manage, create, and publish a component")
24+
@org.springframework.stereotype.Component
2525
public class ComponentCommand {
2626

2727
@Command
2828
public void component() {
2929
}
3030

31-
@Command(command = "init", description = "Generates project for a new component.")
31+
@Command(name = "init", description = "Generates project for a new component.")
3232
public void init(
3333
@Option(
34-
longNames = "base-package-name", label = "NAME", description = "package for generated classes",
34+
longName = "base-package-name", description = "package for generated classes",
3535
defaultValue = "com.bytechef.component") String basePackageName,
3636
@Option(
37-
longNames = "internal-component",
37+
longName = "internal-component",
3838
description = "if a component is the internal one(ships with the platform) or the custom one",
3939
defaultValue = "false") boolean internalComponent,
40+
@Option(longName = "name", shortName = 'n', description = "component name", required = true) String name,
41+
@Option(longName = "open-api-path", description = "path to the OpenAPI specification") String openApiPath,
4042
@Option(
41-
longNames = "name", shortNames = 'n', label = "NAME", description = "component name",
42-
required = true) String name,
43-
@Option(
44-
longNames = "open-api-path", label = "PATH",
45-
description = "path to the OpenAPI specification") String openApiPath,
46-
@Option(
47-
longNames = "output-path", shortNames = 'o', label = "PATH",
43+
longName = "output-path", shortName = 'o',
4844
description = "where to write the generated files (current dir by default)",
4945
required = true) String outputPath,
5046
@Option(
51-
longNames = "version", shortNames = 'v', label = "VERSION", description = "the component version",
47+
longName = "version", shortName = 'v', description = "the component version",
5248
defaultValue = "1") int version)
5349
throws Exception {
5450

gradle/libs.versions.toml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ jacoco = "0.8.13"
77
java = "25"
88
org-mapstruct = "1.6.3"
99
org-mapstruct-extensions-spring = "2.0.0"
10-
org-springdoc = "2.8.14"
10+
org-springdoc = "3.0.0"
1111
pmd = "7.19.0"
12-
quartz = "2.5.2"
1312
spotbugs = "4.9.8"
14-
spring-ai = "1.1.1"
15-
spring-boot = "3.5.8"
16-
spring-cloud-aws = "3.4.1"
17-
spring-cloud-dependencies = "2025.0.0"
18-
spring-shell = "3.4.1"
13+
spring-ai = "2.0.0-M1"
14+
spring-boot = "4.0.1"
15+
spring-cloud-aws = "4.0.0-M1"
16+
spring-cloud-dependencies = "2025.1.0"
17+
spring-shell = "4.0.0-RC1"
18+
testcontainers = "1.21.3"
1919

2020
[libraries]
2121
com-github-miachm-sods-sods = "com.github.miachm.sods:SODS:1.7.0"
@@ -42,7 +42,6 @@ org-mapstruct-extensions-spring-mapstruct-spring-annotations = { module = "org.m
4242
org-mapstruct-extensions-spring-mapstruct-spring-extensions = { module = "org.mapstruct.extensions.spring:mapstruct-spring-extensions", version.ref = "org-mapstruct-extensions-spring" }
4343
org-mapstruct-mapstruct-processor = { module = "org.mapstruct:mapstruct-processor", version.ref = "org-mapstruct" }
4444
org-openapitools-jackson-databind-nullable = "org.openapitools:jackson-databind-nullable:0.2.8"
45-
org-quartz-scheduler-quartz = { module = "org.quartz-scheduler:quartz", version.ref = "quartz" }
4645
org-springdoc-springdoc-openapi-starter-common = { module = "org.springdoc:springdoc-openapi-starter-common", version.ref = "org-springdoc" }
4746
org-springdoc-springdoc-openapi-starter-webmvc-ui = { module = "org.springdoc:springdoc-openapi-starter-webmvc-ui", version.ref = "org-springdoc" }
4847
org-wiremock-wiremock = "org.wiremock:wiremock-standalone:3.13.2"
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
version="1.0.0"
22

33
dependencies {
4-
implementation("com.fasterxml.jackson.core:jackson-databind")
5-
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jdk8")
6-
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
4+
implementation("tools.jackson.core:jackson-databind")
75
}

sdks/backend/java/ai-toolkit/src/main/java/com/bytechef/ai/toolkit/ToolClient.java

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,18 @@
1717
package com.bytechef.ai.toolkit;
1818

1919
import com.bytechef.ai.toolkit.model.ToolModel;
20-
import com.fasterxml.jackson.core.type.TypeReference;
21-
import com.fasterxml.jackson.databind.DeserializationFeature;
22-
import com.fasterxml.jackson.databind.ObjectMapper;
23-
import com.fasterxml.jackson.databind.SerializationFeature;
24-
import com.fasterxml.jackson.databind.json.JsonMapper;
25-
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
26-
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
2720
import java.io.IOException;
2821
import java.net.URI;
2922
import java.net.http.HttpClient;
3023
import java.net.http.HttpRequest;
3124
import java.net.http.HttpResponse;
3225
import java.util.List;
3326
import java.util.Map;
27+
import tools.jackson.core.type.TypeReference;
28+
import tools.jackson.databind.DeserializationFeature;
29+
import tools.jackson.databind.ObjectMapper;
30+
import tools.jackson.databind.SerializationFeature;
31+
import tools.jackson.databind.json.JsonMapper;
3432

3533
/**
3634
* @author Ivica Cardic
@@ -40,8 +38,6 @@ public class ToolClient {
4038
private static final ObjectMapper OBJECT_MAPPER = JsonMapper.builder()
4139
.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
4240
.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS)
43-
.addModules(new Jdk8Module())
44-
.addModules(new JavaTimeModule())
4541
.build();
4642

4743
private final String apiKey;

0 commit comments

Comments
 (0)