Skip to content

Commit 6f64136

Browse files
committed
address comments by ai
1 parent 7f86c79 commit 6f64136

File tree

5 files changed

+26
-11
lines changed

5 files changed

+26
-11
lines changed

client/java-spring-boot2-autoconfigure/build.gradle

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,13 @@ tasks.compileJava {
3333
}
3434
tasks.compileTestJava.source "${autoconfigure4ProjectDir}/src/test/java", "${autoconfigure4ProjectDir}/gen-src/test/java"
3535
tasks.processTestResources.from "${autoconfigure4ProjectDir}/src/test/resources"
36-
tasks.sourcesJar.from "${autoconfigure4ProjectDir}/src/main/java"
37-
tasks.sourcesJar.from "${autoconfigure4ProjectDir}/src/main/resources"
36+
tasks.sourcesJar {
37+
from fileTree("${autoconfigure4ProjectDir}/src/main/java") {
38+
exclude "**/CentralDogmaSettings.java"
39+
exclude "**/package-info.java"
40+
}
41+
from "${autoconfigure3ProjectDir}/src/main/java"
42+
}
3843
tasks.javadoc {
3944
source fileTree("${autoconfigure4ProjectDir}/src/main/java") {
4045
exclude "**/CentralDogmaSettings.java"

client/java-spring-boot3-autoconfigure/build.gradle

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ dependencies {
1414
// the IDE.
1515
def autoconfigureProjectDir = "${rootProject.projectDir}/client/java-spring-boot4-autoconfigure"
1616
tasks.compileJava {
17+
source "${project.projectDir}/src/main/java"
1718
source fileTree("${autoconfigureProjectDir}/src/main/java") {
1819
exclude "**/CentralDogmaSettings.java"
1920
exclude "**/package-info.java"
@@ -22,9 +23,15 @@ tasks.compileJava {
2223
tasks.processResources.from "${autoconfigureProjectDir}/src/main/resources"
2324
tasks.compileTestJava.source "${autoconfigureProjectDir}/src/test/java", "${autoconfigureProjectDir}/gen-src/test/java"
2425
tasks.processTestResources.from "${autoconfigureProjectDir}/src/test/resources"
25-
tasks.sourcesJar.from "${autoconfigureProjectDir}/src/main/java"
26-
tasks.sourcesJar.from "${autoconfigureProjectDir}/src/main/resources"
26+
tasks.sourcesJar {
27+
from "${project.projectDir}/src/main/java"
28+
from fileTree("${autoconfigureProjectDir}/src/main/java") {
29+
exclude "**/CentralDogmaSettings.java"
30+
exclude "**/package-info.java"
31+
}
32+
}
2733
tasks.javadoc {
34+
source "${project.projectDir}/src/main/java"
2835
source fileTree("${autoconfigureProjectDir}/src/main/java") {
2936
exclude "**/CentralDogmaSettings.java"
3037
exclude "**/package-info.java"
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
dependencies {
22
api project(':client:java-armeria')
33
api libs.spring.boot4.autoconfigure
4-
api libs.spring.boot4.validation
4+
api libs.spring.boot4.starter.validation
55
annotationProcessor libs.spring.boot4.configuration.processor
66

77
testImplementation libs.spring.boot4.starter.test
8-
testRuntimeOnly libs.hibernate.validator8
8+
testRuntimeOnly libs.hibernate.validator9
99
}
1010

client/java-spring-boot4-autoconfigure/src/main/java/com/linecorp/centraldogma/client/spring/CentralDogmaSettings.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
import java.util.ArrayList;
2020
import java.util.List;
2121

22-
import javax.annotation.Nullable;
23-
22+
import org.jspecify.annotations.Nullable;
2423
import org.springframework.boot.context.properties.ConfigurationProperties;
2524
import org.springframework.validation.annotation.Validated;
2625

dependencies.toml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ guava-failureaccess = "1.0.1"
2929
hamcrest-library = "3.0"
3030
hibernate-validator6 = "6.2.5.Final"
3131
hibernate-validator8 = "8.0.3.Final"
32+
hibernate-validator9 = "9.1.0.Final"
3233
jackson = "2.20.1"
3334
javassist = "3.30.2-GA"
3435
javax-annotation = "1.3.2"
@@ -210,6 +211,9 @@ version.ref = "hibernate-validator6"
210211
[libraries.hibernate-validator8]
211212
module = "org.hibernate.validator:hibernate-validator"
212213
version.ref = "hibernate-validator8"
214+
[libraries.hibernate-validator9]
215+
module = "org.hibernate.validator:hibernate-validator"
216+
version.ref = "hibernate-validator9"
213217

214218
[libraries.jackson-annotations]
215219
module = "com.fasterxml.jackson.core:jackson-annotations"
@@ -460,15 +464,15 @@ version.ref = "spring-boot4"
460464
module = "org.springframework.boot:spring-boot-starter"
461465
version.ref = "spring-boot4"
462466
javadocs = "https://docs.spring.io/spring/docs/current/javadoc-api/"
467+
[libraries.spring-boot4-starter-validation]
468+
module = "org.springframework.boot:spring-boot-starter-validation"
469+
version.ref = "spring-boot4"
463470
[libraries.spring-boot4-starter-test]
464471
module = "org.springframework.boot:spring-boot-starter-test"
465472
version.ref = "spring-boot4"
466473
[libraries.spring-boot4-configuration-processor]
467474
module = "org.springframework.boot:spring-boot-configuration-processor"
468475
version.ref = "spring-boot4"
469-
[libraries.spring-boot4-validation]
470-
module = "org.springframework.boot:spring-boot-validation"
471-
version.ref = "spring-boot4"
472476

473477
[libraries.spring-test-junit5]
474478
module = "com.github.sbrannen:spring-test-junit5"

0 commit comments

Comments
 (0)