Skip to content

Commit f46e3ac

Browse files
author
jruaux
committed
build: Upgraded to spring boot 3.2.0
1 parent d078895 commit f46e3ac

File tree

8 files changed

+31
-36
lines changed

8 files changed

+31
-36
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.7.0
1+
1.7.1-SNAPSHOT

build.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,6 @@ subprojects {
102102
archiveClassifier = ''
103103
}
104104

105-
compileJava {
106-
options.release = 8
107-
}
108-
109105
configurations.all {
110106
resolutionStrategy.eachDependency { DependencyResolveDetails details ->
111107
if (details.requested.name == 'lettuce-core' ) {

gradle.properties

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
group = com.redis
2-
sourceCompatibility = 1.8
3-
targetCompatibility = 1.8
4-
testSourceCompatibility = 11
5-
testTargetCompatibility = 11
62
reproducibleBuild = true
73

8-
bootPluginVersion = 2.7.16
9-
kordampBuildVersion = 3.1.0
10-
kordampPluginVersion = 0.51.0
4+
bootPluginVersion = 3.2.0
5+
dependencyPluginVersion = 1.1.4
6+
kordampBuildVersion = 3.3.0
7+
kordampPluginVersion = 0.53.0
118

129
rsAdminVersion = 0.3.1
1310
jacocoVersion = 0.8.10
@@ -16,6 +13,6 @@ lettuceVersion = 6.2.6.RELEASE
1613
testcontainersVersion = 1.19.1
1714

1815
org.gradle.daemon = true
19-
org.gradle.caching = true
16+
org.gradle.caching = false
2017
systemProp.file.encoding = utf-8
2118
org.gradle.jvmargs = -Dfile.encoding=UTF-8

gradle/wrapper/gradle-wrapper.jar

2.1 KB
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
44
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

gradlew

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,8 @@ done
8383
# This is normally unused
8484
# shellcheck disable=SC2034
8585
APP_BASE_NAME=${0##*/}
86-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
87-
88-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
89-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
86+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87+
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
9088

9189
# Use the maximum available, or set MAX_FD != -1 to use that value.
9290
MAX_FD=maximum
@@ -133,26 +131,29 @@ location of your Java installation."
133131
fi
134132
else
135133
JAVACMD=java
136-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
134+
if ! command -v java >/dev/null 2>&1
135+
then
136+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137137
138138
Please set the JAVA_HOME variable in your environment to match the
139139
location of your Java installation."
140+
fi
140141
fi
141142

142143
# Increase the maximum file descriptors if we can.
143144
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144145
case $MAX_FD in #(
145146
max*)
146147
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
147-
# shellcheck disable=SC3045
148+
# shellcheck disable=SC2039,SC3045
148149
MAX_FD=$( ulimit -H -n ) ||
149150
warn "Could not query maximum file descriptor limit"
150151
esac
151152
case $MAX_FD in #(
152153
'' | soft) :;; #(
153154
*)
154155
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
155-
# shellcheck disable=SC3045
156+
# shellcheck disable=SC2039,SC3045
156157
ulimit -n "$MAX_FD" ||
157158
warn "Could not set maximum file descriptor limit to $MAX_FD"
158159
esac
@@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
197198
done
198199
fi
199200

200-
# Collect all arguments for the java command;
201-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
202-
# shell script including quotes and variable substitutions, so put them in
203-
# double quotes to make sure that they get re-expanded; and
204-
# * put everything else in single quotes, so that it's not re-expanded.
201+
202+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
203+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
204+
205+
# Collect all arguments for the java command:
206+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
207+
# and any embedded shellness will be escaped.
208+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
209+
# treated as '${Hostname}' itself on the command line.
205210

206211
set -- \
207212
"-Dorg.gradle.appname=$APP_BASE_NAME" \

jreleaser.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ project:
88
- Julien Ruaux
99
license: Apache-2.0
1010
java:
11-
groupId: com.redis.testcontainers
12-
version: 17
11+
groupId: com.redis
12+
version: '17'
1313
multiProject: true
14-
inceptionYear: 2020
14+
inceptionYear: '2020'
1515
tags:
1616
- 'redis'
1717
- 'testcontainers'
@@ -70,5 +70,5 @@ files:
7070
artifacts:
7171
- path: VERSION
7272
extraProperties:
73-
skipChecksum: true
74-
skipSigning: true
73+
skipChecksum: 'true'
74+
skipSigning: 'true'

settings.gradle

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ buildscript {
99
classpath "org.kordamp.gradle:jacoco-gradle-plugin:$kordampPluginVersion"
1010
classpath "org.kordamp.gradle:kordamp-parentbuild:$kordampBuildVersion"
1111
classpath "org.springframework.boot:spring-boot-gradle-plugin:$bootPluginVersion"
12+
classpath "io.spring.gradle:dependency-management-plugin:$dependencyPluginVersion"
1213
}
1314
}
1415

@@ -35,11 +36,6 @@ projects {
3536
}
3637

3738
enforce {
38-
rule(enforcer.rules.EnforceBytecodeVersion) { r ->
39-
// search only on compile and runtime classpaths
40-
r.configurations.addAll(['compileClasspath', 'runtimeClasspath'])
41-
r.maxJdkVersion = '1.8'
42-
}
4339
rule(enforcer.rules.BanDuplicateClasses) { r ->
4440
// search only on compile and runtime classpaths
4541
r.configurations.addAll(['compileClasspath', 'runtimeClasspath'])

0 commit comments

Comments
 (0)