Skip to content

Commit c1ea3cf

Browse files
committed
chore: update dependencies
1 parent afadb3e commit c1ea3cf

3 files changed

Lines changed: 25 additions & 10 deletions

File tree

.github/workflows/gradle.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ jobs:
2323

2424
steps:
2525
- uses: actions/checkout@v4
26-
- name: Set up JDK 17
26+
- name: Set up JDK 21
2727
uses: actions/setup-java@v4
2828
with:
2929
distribution: 'corretto'
30-
java-version: '17'
30+
java-version: '21'
3131
cache: 'gradle'
3232
- run: ./gradlew build --no-daemon

build.gradle

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
1+
buildscript {
2+
dependencies {
3+
classpath "com.google.cloud.tools:jib-spring-boot-extension-gradle:0.1.0"
4+
}
5+
}
6+
17
plugins {
28
id "java"
39
id "groovy"
410
id "idea"
511
id "org.springframework.boot" version "${springBootVersion}"
6-
id "com.google.cloud.tools.jib" version "3.3.2"
12+
id "com.google.cloud.tools.jib" version "3.4.2"
713
id "com.diffplug.spotless" version "${spotlessVersion}"
814
}
915

@@ -45,9 +51,9 @@ spotless {
4551
lineEndings "UNIX"
4652
}
4753

48-
sourceCompatibility = "17"
54+
sourceCompatibility = "21"
4955
[compileJava, compileTestJava, compileGroovy, compileTestGroovy]*.options*.encoding = "UTF-8"
50-
[compileJava, compileTestJava, compileGroovy, compileTestGroovy]*.options*.compilerArgs = ["--enable-preview", "-Xlint:all"]
56+
[compileJava, compileTestJava, compileGroovy, compileTestGroovy]*.options*.compilerArgs = ["-Adoma.metamodel.enabled=true", "-parameters", "-Xlint:all"]
5157

5258
dependencyManagement {
5359
imports {
@@ -72,7 +78,6 @@ dependencies {
7278
implementation "org.springframework.integration:spring-integration-jdbc"
7379
developmentOnly "org.springframework.boot:spring-boot-docker-compose"
7480

75-
7681
implementation "org.flywaydb:flyway-core"
7782
implementation "org.flywaydb:flyway-mysql"
7883
runtimeOnly "com.mysql:mysql-connector-j"
@@ -95,8 +100,13 @@ dependencies {
95100
}
96101

97102
jib {
103+
pluginExtensions {
104+
pluginExtension {
105+
implementation = "com.google.cloud.tools.jib.gradle.extension.springboot.JibSpringBootExtension"
106+
}
107+
}
98108
from {
99-
image = "amazoncorretto:17"
109+
image = "public.ecr.aws/amazoncorretto/amazoncorretto:21"
100110
}
101111
container {
102112
jvmFlags = [
@@ -115,7 +125,12 @@ tasks.named("test") {
115125
useJUnitPlatform()
116126
testLogging {
117127
events "passed", "skipped", "failed"
128+
exceptionFormat = "full"
129+
showCauses = true
130+
showExceptions = true
131+
showStackTraces = true
118132
}
133+
systemProperty "spring.profiles.active", "test"
119134
}
120135

121136
compileJava.dependsOn "spotlessApply"

gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ org.gradle.jvmargs=-Duser.language=ja -Duser.country=JP \
66
--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
77
--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
88
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
9-
springBootVersion=3.1.7
10-
springCloudVersion=2022.0.4
11-
spotlessVersion=6.10.0
9+
springBootVersion=3.4.1
10+
springCloudVersion=2024.0.0
11+
spotlessVersion=7.0.1

0 commit comments

Comments
 (0)