Skip to content

Commit 9844a13

Browse files
committed
Update to 4.3.0
1 parent e06c625 commit 9844a13

File tree

8 files changed

+25
-24
lines changed

8 files changed

+25
-24
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ A docker image of [Spring Cloud Config Server](https://docs.spring.io/spring-clo
99
[![License](https://img.shields.io/github/license/hyness/spring-cloud-config-server)](https://www.apache.org/licenses/LICENSE-2.0.html)
1010

1111
### Supported tags
12-
* `4.2.2-jre17`, `4.2-jre17`, `jre17`, `4.2.2`, `4.2`, `latest`
13-
* `4.2.2-jdk17`, `4.2-jdk17`, `jdk17`
14-
* `4.2.2-jre21`, `4.2-jre21`, `jre21`
15-
* `4.2.2-jdk21`, `4.2-jdk21`, `jdk21`
12+
* `4.3.0-jre17`, `4.2-jre17`, `jre17`, `4.3.0`, `4.3`, `latest`
13+
* `4.3.0-jdk17`, `4.2-jdk17`, `jdk17`
14+
* `4.3.0-jre21`, `4.2-jre21`, `jre21`
15+
* `4.3.0-jdk21`, `4.2-jdk21`, `jdk21`
1616

1717
### Usage
1818
```

build.gradle.kts

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@ val imageTag: String? by project
1717
val testFilter: String? by project
1818

1919
tasks {
20+
java {
21+
toolchain {
22+
languageVersion.set(JavaLanguageVersion.of(jdkVersion.toInt()))
23+
}
24+
}
25+
2026
version = versionCatalogs.firstNotNullOf {
2127
it.findVersion("spring.cloud.config").orElse(null)
2228
}
@@ -51,7 +57,7 @@ tasks {
5157
"paketo-buildpacks/dist-zip",
5258
"paketo-buildpacks/spring-boot",
5359
"paketo-buildpacks/environment-variables",
54-
"gcr.io/paketo-buildpacks/health-checker:1.17.0"
60+
"paketobuildpacks/health-checker:1.17.0"
5561
)
5662
docker.publishRegistry {
5763
username = dockerUsername
@@ -94,12 +100,4 @@ dependencies {
94100
testImplementation(libs.testcontainers.junit5)
95101
testImplementation(libs.kotlin.logging)
96102
testImplementation(libs.awaitility.kotlin)
97-
}
98-
99-
configurations.all {
100-
resolutionStrategy.eachDependency {
101-
if (requested.name.startsWith("spring-cloud-function-")) {
102-
useVersion("4.2.2")
103-
}
104-
}
105103
}

gradle/libs.versions.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[versions]
2-
aws = "2.17.195"
2+
aws = "2.30.23"
33
aws-msk-iam-auth = "2.3.0"
4-
kotlin = "1.9.25"
5-
kotlin-logging = "7.0.4"
6-
spring-boot = "3.4.4"
7-
spring-cloud = "2024.0.1"
8-
spring-cloud-config = "4.2.2"
4+
kotlin = "2.1.0"
5+
kotlin-logging = "7.0.7"
6+
spring-boot = "3.5.0"
7+
spring-cloud = "2025.0.0"
8+
spring-cloud-config = "4.3.0"
99

1010
[plugins]
1111
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }

gradle/wrapper/gradle-wrapper.jar

59 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ case "$( uname )" in #(
114114
NONSTOP* ) nonstop=true ;;
115115
esac
116116

117-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
117+
CLASSPATH="\\\"\\\""
118118

119119

120120
# Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
213213
set -- \
214214
"-Dorg.gradle.appname=$APP_BASE_NAME" \
215215
-classpath "$CLASSPATH" \
216-
org.gradle.wrapper.GradleWrapperMain \
216+
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
217217
"$@"
218218

219219
# Stop when "xargs" is not available.

gradlew.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ goto fail
7070
:execute
7171
@rem Setup the command line
7272

73-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
73+
set CLASSPATH=
7474

7575

7676
@rem Execute Gradle
77-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
77+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
7878

7979
:end
8080
@rem End local scope for the variables with windows NT shell

settings.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
plugins {
2+
id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
3+
}

0 commit comments

Comments
 (0)