Skip to content

Commit af94581

Browse files
committed
Use Java 17 and update tooling
1 parent 60c2f6c commit af94581

File tree

17 files changed

+36
-10
lines changed

17 files changed

+36
-10
lines changed

.github/workflows/ci-docker-wormhole.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,5 @@ jobs:
5353
-v "$PWD:$PWD" \
5454
-w "$PWD" \
5555
-e AUTO_APPLY_GIT_HOOKS=false \
56-
openjdk:8-jdk-alpine \
56+
eclipse-temurin:17-jdk-alpine \
5757
./gradlew --no-daemon --continue --scan testcontainers:test --tests '*GenericContainerRuleTest'

.sdkmanrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Enable auto-env through the sdkman_auto_env config
22
# Add key=value pairs of SDKs to use below
3-
java=8.0.372-tem
3+
java=17.0.12-tem

build.gradle

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ plugins {
1414
id 'io.franzbecker.gradle-lombok' version '5.0.0'
1515
id 'com.github.johnrengelman.shadow' version '8.1.1'
1616
id 'me.champeau.gradle.japicmp' version '0.4.2' apply false
17-
id 'com.diffplug.spotless' version '6.13.0' apply false
17+
id 'com.diffplug.spotless' version '6.22.0' apply false
1818
}
1919

2020
apply from: "$rootDir/gradle/ci-support.gradle"
@@ -35,6 +35,12 @@ subprojects {
3535

3636
group = "org.testcontainers"
3737

38+
java {
39+
toolchain {
40+
languageVersion = JavaLanguageVersion.of(17)
41+
}
42+
}
43+
3844
sourceCompatibility = 1.8
3945
targetCompatibility = 1.8
4046
compileJava.options.encoding = 'UTF-8'
@@ -126,7 +132,7 @@ subprojects {
126132
}
127133

128134
checkstyle {
129-
toolVersion = "9.3"
135+
toolVersion = "10.12.4"
130136
configFile = rootProject.file('config/checkstyle/checkstyle.xml')
131137
}
132138
}

core/src/main/java/org/testcontainers/containers/DockerCompose.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
interface DockerCompose {
66
String ENV_PROJECT_NAME = "COMPOSE_PROJECT_NAME";
7+
78
String ENV_COMPOSE_FILE = "COMPOSE_FILE";
89

910
DockerCompose withCommand(String cmd);

core/src/main/java/org/testcontainers/images/builder/Transferable.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
public interface Transferable {
1212
int DEFAULT_FILE_MODE = 0100644;
13+
1314
int DEFAULT_DIR_MODE = 040755;
1415

1516
static Transferable of(String string) {

core/src/test/java/org/testcontainers/TestImages.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,14 @@
44

55
public interface TestImages {
66
DockerImageName REDIS_IMAGE = DockerImageName.parse("redis:6-alpine");
7+
78
DockerImageName RABBITMQ_IMAGE = DockerImageName.parse("rabbitmq:3.7.25");
9+
810
DockerImageName MONGODB_IMAGE = DockerImageName.parse("mongo:4.4");
11+
912
DockerImageName ALPINE_IMAGE = DockerImageName.parse("alpine:3.17");
13+
1014
DockerImageName DOCKER_REGISTRY_IMAGE = DockerImageName.parse("registry:2.7.0");
15+
1116
DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.17");
1217
}

examples/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// empty build.gradle for dependabot
22
plugins {
3-
id 'com.diffplug.spotless' version '6.13.0' apply false
3+
id 'com.diffplug.spotless' version '6.22.0' apply false
44
}
55

66
apply from: "$rootDir/../gradle/ci-support.gradle"
@@ -15,7 +15,7 @@ subprojects {
1515
}
1616

1717
checkstyle {
18-
toolVersion = "9.3"
18+
toolVersion = "10.12.4"
1919
configFile = rootProject.file('../config/checkstyle/checkstyle.xml')
2020
}
2121
}

gradle/spotless.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ spotless {
1818
}
1919
groovyGradle {
2020
target '**/*.groovy'
21-
greclipse('4.19.0')
21+
greclipse('4.26')
2222
}
2323
}

modules/clickhouse/src/test/java/org/testcontainers/ClickhouseTestImages.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44

55
public interface ClickhouseTestImages {
66
DockerImageName YANDEX_CLICKHOUSE_IMAGE = DockerImageName.parse("yandex/clickhouse-server:18.10.3");
7+
78
DockerImageName CLICKHOUSE_IMAGE = DockerImageName.parse("clickhouse/clickhouse-server:21.9.2-alpine");
89
}

modules/cockroachdb/src/test/java/org/testcontainers/CockroachDBTestImages.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
public interface CockroachDBTestImages {
66
DockerImageName COCKROACHDB_IMAGE = DockerImageName.parse("cockroachdb/cockroach:v22.2.3");
7+
78
DockerImageName FIRST_COCKROACHDB_IMAGE_WITH_ENV_VARS_SUPPORT = DockerImageName.parse(
89
"cockroachdb/cockroach:v22.1.0"
910
);

0 commit comments

Comments
 (0)