diff --git a/build.gradle b/build.gradle index bbecfc90..0bded1fa 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '3.1.4' - id 'io.spring.dependency-management' version '1.1.3' + id 'org.springframework.boot' version '3.4.2' + id 'io.spring.dependency-management' version '1.1.7' id 'java' id 'java-library' id 'groovy' @@ -10,7 +10,11 @@ plugins { group = 'com.etendorx' version = "$gradle.ext.version" -sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} repositories { mavenCentral() @@ -121,4 +125,4 @@ task jacocoRootReport(type: JacocoReport) { xml.required = true html.required = true } -} \ No newline at end of file +} diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index db9a6b82..e18bc253 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/com.etendorx.clientrest_core/build.gradle b/libs/com.etendorx.clientrest_core/build.gradle index ea677c06..92593bd2 100644 --- a/libs/com.etendorx.clientrest_core/build.gradle +++ b/libs/com.etendorx.clientrest_core/build.gradle @@ -9,7 +9,11 @@ plugins { group = 'com.etendorx' version = "$gradle.ext.version" -sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} repositories { mavenCentral() @@ -51,7 +55,7 @@ dependencies { } ext { - set('springCloudVersion', "2022.0.4") + set('springCloudVersion', "2024.0.0") } dependencyManagement { diff --git a/libs/com.etendorx.das_core/build.gradle b/libs/com.etendorx.das_core/build.gradle index bfb24142..f63f29c0 100644 --- a/libs/com.etendorx.das_core/build.gradle +++ b/libs/com.etendorx.das_core/build.gradle @@ -9,7 +9,11 @@ plugins { group = 'com.etendorx' version = "$gradle.ext.version" -sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} repositories { mavenCentral() diff --git a/libs/com.etendorx.lib.asyncprocess/build.gradle b/libs/com.etendorx.lib.asyncprocess/build.gradle index 616818fe..90fe4a4b 100644 --- a/libs/com.etendorx.lib.asyncprocess/build.gradle +++ b/libs/com.etendorx.lib.asyncprocess/build.gradle @@ -27,7 +27,7 @@ dependencies { } ext { - set('springCloudVersion', "2022.0.4") + set('springCloudVersion', "2024.0.0") } dependencyManagement { diff --git a/libs/com.etendorx.lib.kafka/build.gradle b/libs/com.etendorx.lib.kafka/build.gradle index a0936988..d8f295a7 100644 --- a/libs/com.etendorx.lib.kafka/build.gradle +++ b/libs/com.etendorx.lib.kafka/build.gradle @@ -15,7 +15,7 @@ repositories { } dependencies { - implementation 'org.springframework.boot:spring-boot-starter-web:3.1.4' + implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.apache.kafka:kafka-streams:3.6.0' implementation 'org.projectlombok:lombok:1.18.30' @@ -24,7 +24,7 @@ dependencies { } ext { - set('springCloudVersion', "2022.0.4") + set('springCloudVersion', "2024.0.0") } dependencyManagement { diff --git a/libs/com.etendorx.utils.auth/build.gradle b/libs/com.etendorx.utils.auth/build.gradle index 12306b57..2cfa64ae 100644 --- a/libs/com.etendorx.utils.auth/build.gradle +++ b/libs/com.etendorx.utils.auth/build.gradle @@ -9,7 +9,11 @@ plugins { group = 'com.etendorx' version = "$gradle.ext.version" -sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} publishing { publications { @@ -34,7 +38,7 @@ repositories { mavenCentral() } ext { - set('springCloudVersion', "2022.0.4") + set('springCloudVersion', "2024.0.0") } dependencyManagement { imports { diff --git a/libs/com.etendorx.utils.common/build.gradle b/libs/com.etendorx.utils.common/build.gradle index ff437194..2c5c550b 100644 --- a/libs/com.etendorx.utils.common/build.gradle +++ b/libs/com.etendorx.utils.common/build.gradle @@ -9,7 +9,11 @@ plugins { group = 'com.etendorx' version = "$gradle.ext.version" -sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} publishing { publications { @@ -34,7 +38,7 @@ repositories { mavenCentral() } ext { - set('springCloudVersion', "2022.0.4") + set('springCloudVersion', "2024.0.0") } dependencyManagement { imports { diff --git a/modules_core/com.etendorx.asyncprocess/build.gradle b/modules_core/com.etendorx.asyncprocess/build.gradle index 96cfb1fb..d3672593 100644 --- a/modules_core/com.etendorx.asyncprocess/build.gradle +++ b/modules_core/com.etendorx.asyncprocess/build.gradle @@ -7,7 +7,12 @@ plugins { group = 'com.etendorx' version = "$gradle.ext.version" -java.sourceCompatibility = JavaVersion.VERSION_17 + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} repositories { mavenCentral() @@ -72,7 +77,7 @@ bootBuildImage { } ext { - set('springCloudVersion', "2022.0.4") + set('springCloudVersion', "2024.0.0") } dependencyManagement { diff --git a/modules_core/com.etendorx.auth/build.gradle b/modules_core/com.etendorx.auth/build.gradle index a6584eff..31185693 100644 --- a/modules_core/com.etendorx.auth/build.gradle +++ b/modules_core/com.etendorx.auth/build.gradle @@ -7,7 +7,11 @@ plugins { group = 'com.etendorx' version = "$gradle.ext.version" -sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} repositories { mavenCentral() @@ -75,7 +79,7 @@ dependencies { } ext { - set('springCloudVersion', "2022.0.4") + set('springCloudVersion', "2024.0.0") } sourceSets { diff --git a/modules_core/com.etendorx.configserver/build.gradle b/modules_core/com.etendorx.configserver/build.gradle index 5a373ac9..aa33616e 100644 --- a/modules_core/com.etendorx.configserver/build.gradle +++ b/modules_core/com.etendorx.configserver/build.gradle @@ -7,7 +7,11 @@ plugins { group = 'com.etendorx' version = "$gradle.ext.version" -sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} repositories { mavenCentral() @@ -34,7 +38,7 @@ publishing { } ext { - set('springCloudVersion', "2022.0.4") + set('springCloudVersion', "2024.0.0") } dependencies { diff --git a/modules_core/com.etendorx.das/build.gradle b/modules_core/com.etendorx.das/build.gradle index ba77fc5f..5f9c97f6 100644 --- a/modules_core/com.etendorx.das/build.gradle +++ b/modules_core/com.etendorx.das/build.gradle @@ -8,7 +8,11 @@ plugins { group = 'com.etendorx' version = "$gradle.ext.version" -sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} repositories { mavenCentral() @@ -46,7 +50,7 @@ publishing { } ext { - set('springCloudVersion', "2022.0.4") + set('springCloudVersion', "2024.0.0") } dependencyManagement { diff --git a/modules_core/com.etendorx.edge/build.gradle b/modules_core/com.etendorx.edge/build.gradle index 0297b0a7..21ca29f1 100644 --- a/modules_core/com.etendorx.edge/build.gradle +++ b/modules_core/com.etendorx.edge/build.gradle @@ -7,7 +7,11 @@ plugins { group = 'com.etendorx' version = "$gradle.ext.version" -sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} repositories { mavenCentral() @@ -34,7 +38,7 @@ publishing { } ext { - set('springCloudVersion', "2022.0.4") + set('springCloudVersion', "2024.0.0") } dependencies { diff --git a/modules_core/com.etendorx.webflux/build.gradle b/modules_core/com.etendorx.webflux/build.gradle index b9cb1ab2..584cece3 100644 --- a/modules_core/com.etendorx.webflux/build.gradle +++ b/modules_core/com.etendorx.webflux/build.gradle @@ -8,7 +8,11 @@ plugins { group = 'com.etendorx.webflux' version = "$gradle.ext.version" -sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} repositories { mavenCentral() diff --git a/modules_gen/com.etendorx.clientrest/build.gradle b/modules_gen/com.etendorx.clientrest/build.gradle index 377649c1..0ab362be 100644 --- a/modules_gen/com.etendorx.clientrest/build.gradle +++ b/modules_gen/com.etendorx.clientrest/build.gradle @@ -8,7 +8,11 @@ plugins { group = 'com.etendorx.entitiesModel' version = "$gradle.ext.version" -sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} repositories { mavenCentral() @@ -23,7 +27,7 @@ dependencies { } ext { - set('springCloudVersion', "2022.0.4") + set('springCloudVersion', "2024.0.0") } dependencyManagement { diff --git a/modules_gen/com.etendorx.entities/build.gradle b/modules_gen/com.etendorx.entities/build.gradle index b6f36e4c..65900aae 100644 --- a/modules_gen/com.etendorx.entities/build.gradle +++ b/modules_gen/com.etendorx.entities/build.gradle @@ -7,7 +7,11 @@ plugins { group = 'com.etendorx.entities' version = "$gradle.ext.version" -sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} repositories { mavenCentral() diff --git a/modules_gen/com.etendorx.entitiesModel/build.gradle b/modules_gen/com.etendorx.entitiesModel/build.gradle index 377649c1..0ab362be 100644 --- a/modules_gen/com.etendorx.entitiesModel/build.gradle +++ b/modules_gen/com.etendorx.entitiesModel/build.gradle @@ -8,7 +8,11 @@ plugins { group = 'com.etendorx.entitiesModel' version = "$gradle.ext.version" -sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} repositories { mavenCentral() @@ -23,7 +27,7 @@ dependencies { } ext { - set('springCloudVersion', "2022.0.4") + set('springCloudVersion', "2024.0.0") } dependencyManagement { diff --git a/modules_gen/com.etendorx.grpc.common/build.gradle b/modules_gen/com.etendorx.grpc.common/build.gradle index 0be5e852..dd4b8411 100644 --- a/modules_gen/com.etendorx.grpc.common/build.gradle +++ b/modules_gen/com.etendorx.grpc.common/build.gradle @@ -13,7 +13,11 @@ plugins { id "com.google.protobuf" version "0.8.18" } apply from: "grpc.gradle" -sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} repositories { mavenCentral() diff --git a/modules_test/com.etendorx.test.eventhandler/build.gradle b/modules_test/com.etendorx.test.eventhandler/build.gradle index bf3bc1cd..fe89d7d4 100644 --- a/modules_test/com.etendorx.test.eventhandler/build.gradle +++ b/modules_test/com.etendorx.test.eventhandler/build.gradle @@ -10,14 +10,18 @@ plugins { group = 'com.etendorx' version = "$gradle.ext.version" -sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} repositories { mavenCentral() } ext { - set('springCloudVersion', "2022.0.4") + set('springCloudVersion', "2024.0.0") includeInDasDependencies = project.hasProperty("exclude.entities.jar") ? !project.property("exclude.entities.jar") : false } diff --git a/resources/dynamic-das/modules_gen/com.etendorx.entities/build.gradle b/resources/dynamic-das/modules_gen/com.etendorx.entities/build.gradle index 53eae2e7..51f27e87 100644 --- a/resources/dynamic-das/modules_gen/com.etendorx.entities/build.gradle +++ b/resources/dynamic-das/modules_gen/com.etendorx.entities/build.gradle @@ -6,7 +6,11 @@ plugins { group = 'com.etendorx.entities' version = "1.0.0" -sourceCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} repositories { mavenCentral()