Skip to content

Commit 2b1cc3b

Browse files
coopernetescoopernetes
committed
chore: bump testcontainers in jgit-proxy-server, move all version setting to root
1 parent f334d1e commit 2b1cc3b

4 files changed

Lines changed: 96 additions & 62 deletions

File tree

‎build.gradle‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,57 @@ plugins {
44
}
55

66
ext {
7+
// Tooling
78
palantirJavaFormatVersion = '2.90.0'
9+
10+
// JGit
11+
jgitVersion = '7.6.0.202603022253-r'
12+
13+
// HTTP
14+
apacheHttpVersion = '4.5.14'
15+
16+
// Jetty / Servlet
17+
jettyVersion = '12.1.8'
18+
jakartaServletVersion = '6.1.0'
19+
20+
// Logging
21+
slf4jVersion = '2.0.17'
22+
logbackVersion = '1.5.32'
23+
24+
// Database
25+
hikariVersion = '7.0.2'
26+
h2Version = '2.4.240'
27+
sqliteVersion = '3.51.3.0'
28+
postgresVersion = '42.7.10'
29+
mongoVersion = '5.6.4'
30+
31+
// Jackson
32+
jacksonBomVersion = '3.1.1'
33+
jacksonLegacyBomVersion = '2.18.6'
34+
35+
// Spring
36+
springVersion = '7.0.6'
37+
38+
// YAML
39+
snakeyamlVersion = '2.2'
40+
41+
// BouncyCastle
42+
bouncyCastleVersion = '1.83'
43+
44+
// Commons
45+
commonsValidatorVersion = '1.10.1'
46+
47+
// Lombok
48+
lombokVersion = '1.18.44'
49+
50+
// Testing
51+
junitVersion = '5.14.3'
52+
junitPlatformVersion = '1.14.3'
53+
mockitoVersion = '5.17.0'
54+
testContainersVersion = '2.0.4'
55+
56+
// Gitleaks (bundled binary)
57+
gitleaksVersion = '8.21.2'
858
}
959

1060
allprojects {

‎jgit-proxy-core/build.gradle‎

Lines changed: 14 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ plugins {
1313
group = 'org.finos.gitproxy'
1414
version = '0.0.1-SNAPSHOT'
1515

16-
// Gitleaks version bundled into the JAR for hermetic secret scanning
17-
ext.gitleaksVersion = '8.21.2'
1816

1917
java {
2018
sourceCompatibility = JavaVersion.VERSION_21
@@ -32,20 +30,6 @@ repositories {
3230
}
3331
}
3432

35-
ext {
36-
jgitVersion = '7.6.0.202603022253-r'
37-
apacheHttpVersion = '4.5.14'
38-
jettyVersion = '12.1.8'
39-
jakartaServletVersion = '6.1.0'
40-
slf4jVersion = '2.0.17'
41-
logbackVersion = '1.5.32'
42-
hikariVersion = '7.0.2'
43-
h2Version = '2.4.240'
44-
sqliteVersion = '3.51.3.0'
45-
postgresVersion = '42.7.10'
46-
mongoVersion = '5.6.4'
47-
testContainersVersion = '2.0.4'
48-
}
4933

5034
dependencies {
5135
// Servlet API
@@ -55,12 +39,12 @@ dependencies {
5539
api "jakarta.annotation:jakarta.annotation-api:3.0.0"
5640

5741
// Apache Commons Validator for email validation
58-
implementation "commons-validator:commons-validator:1.10.1"
42+
implementation "commons-validator:commons-validator:${commonsValidatorVersion}"
5943

6044
// BouncyCastle for GPG signature verification
61-
implementation "org.bouncycastle:bcprov-jdk18on:1.83"
62-
implementation "org.bouncycastle:bcpg-jdk18on:1.83"
63-
45+
implementation "org.bouncycastle:bcprov-jdk18on:${bouncyCastleVersion}"
46+
implementation "org.bouncycastle:bcpg-jdk18on:${bouncyCastleVersion}"
47+
6448
// JGit dependencies
6549
api "org.eclipse.jgit:org.eclipse.jgit:${jgitVersion}"
6650
implementation "org.eclipse.jgit:org.eclipse.jgit.http.apache:${jgitVersion}"
@@ -71,7 +55,7 @@ dependencies {
7155

7256

7357
// Jackson for JSON — BOM pins all jackson-* modules to the same version
74-
api platform('tools.jackson:jackson-bom:3.1.1')
58+
api platform("tools.jackson:jackson-bom:${jacksonBomVersion}")
7559
api "tools.jackson.core:jackson-databind"
7660

7761
// Logging
@@ -97,23 +81,23 @@ dependencies {
9781
compileOnly "org.mongodb:mongodb-driver-sync:${mongoVersion}"
9882

9983
// Lombok
100-
compileOnly 'org.projectlombok:lombok:1.18.44'
101-
annotationProcessor 'org.projectlombok:lombok:1.18.44'
84+
compileOnly "org.projectlombok:lombok:${lombokVersion}"
85+
annotationProcessor "org.projectlombok:lombok:${lombokVersion}"
10286

10387
// Testing
104-
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.14.3'
105-
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.14.3'
88+
testImplementation "org.junit.jupiter:junit-jupiter-api:${junitVersion}"
89+
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitVersion}"
10690
testRuntimeOnly "com.h2database:h2:${h2Version}"
10791
testRuntimeOnly "org.xerial:sqlite-jdbc:${sqliteVersion}"
108-
testImplementation 'org.mockito:mockito-core:5.17.0'
109-
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.14.3'
110-
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.14.3'
92+
testImplementation "org.mockito:mockito-core:${mockitoVersion}"
93+
testImplementation "org.junit.jupiter:junit-jupiter-params:${junitVersion}"
94+
testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junitPlatformVersion}"
11195
testImplementation "org.mongodb:mongodb-driver-sync:${mongoVersion}"
11296
testImplementation "org.testcontainers:testcontainers:${testContainersVersion}"
11397
testImplementation "org.testcontainers:testcontainers-junit-jupiter:${testContainersVersion}"
11498
testImplementation "org.testcontainers:testcontainers-mongodb:${testContainersVersion}"
115-
testCompileOnly 'org.projectlombok:lombok:1.18.44'
116-
testAnnotationProcessor 'org.projectlombok:lombok:1.18.44'
99+
testCompileOnly "org.projectlombok:lombok:${lombokVersion}"
100+
testAnnotationProcessor "org.projectlombok:lombok:${lombokVersion}"
117101
}
118102

119103
tasks.named('test') {

‎jgit-proxy-dashboard/build.gradle‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,31 +49,31 @@ dependencies {
4949
implementation project(':jgit-proxy-server')
5050

5151
// Spring MVC for the REST API and dashboard
52-
implementation 'org.springframework:spring-webmvc:7.0.6'
52+
implementation "org.springframework:spring-webmvc:${springVersion}"
5353

5454
// Jackson JSON processing
5555
implementation "tools.jackson.core:jackson-databind"
5656

5757
// Database drivers at runtime (whichever store is configured)
58-
runtimeOnly 'com.h2database:h2:2.4.240'
59-
runtimeOnly 'org.xerial:sqlite-jdbc:3.51.3.0'
60-
runtimeOnly 'org.postgresql:postgresql:42.7.10'
61-
runtimeOnly 'org.mongodb:mongodb-driver-sync:5.6.4'
58+
runtimeOnly "com.h2database:h2:${h2Version}"
59+
runtimeOnly "org.xerial:sqlite-jdbc:${sqliteVersion}"
60+
runtimeOnly "org.postgresql:postgresql:${postgresVersion}"
61+
runtimeOnly "org.mongodb:mongodb-driver-sync:${mongoVersion}"
6262

6363
// YAML config
64-
implementation 'org.yaml:snakeyaml:2.2'
64+
implementation "org.yaml:snakeyaml:${snakeyamlVersion}"
6565

6666
// Lombok
67-
compileOnly 'org.projectlombok:lombok:1.18.44'
68-
annotationProcessor 'org.projectlombok:lombok:1.18.44'
67+
compileOnly "org.projectlombok:lombok:${lombokVersion}"
68+
annotationProcessor "org.projectlombok:lombok:${lombokVersion}"
6969

7070
// Testing
71-
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.14.3'
72-
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.14.3'
73-
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.14.3'
74-
testCompileOnly 'org.projectlombok:lombok:1.18.44'
75-
testAnnotationProcessor 'org.projectlombok:lombok:1.18.44'
76-
testRuntimeOnly 'com.h2database:h2:2.4.240'
71+
testImplementation "org.junit.jupiter:junit-jupiter-api:${junitVersion}"
72+
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitVersion}"
73+
testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junitPlatformVersion}"
74+
testCompileOnly "org.projectlombok:lombok:${lombokVersion}"
75+
testAnnotationProcessor "org.projectlombok:lombok:${lombokVersion}"
76+
testRuntimeOnly "com.h2database:h2:${h2Version}"
7777

7878
// Include core + server coverage in the aggregated JaCoCo report
7979
jacocoAggregation project(':jgit-proxy-core')

‎jgit-proxy-server/build.gradle‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -55,37 +55,37 @@ dependencies {
5555
implementation project(':jgit-proxy-core')
5656

5757
// YAML configuration
58-
implementation 'org.yaml:snakeyaml:2.2'
58+
implementation "org.yaml:snakeyaml:${snakeyamlVersion}"
5959

6060
// Jackson BOM — keeps all Jackson modules in sync
61-
implementation platform('com.fasterxml.jackson:jackson-bom:2.18.6')
61+
implementation platform("com.fasterxml.jackson:jackson-bom:${jacksonLegacyBomVersion}")
6262
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
6363

6464
// Database drivers - include all so standalone Jetty server can use any backend
65-
runtimeOnly 'com.h2database:h2:2.4.240'
66-
runtimeOnly 'org.xerial:sqlite-jdbc:3.51.3.0'
67-
runtimeOnly 'org.postgresql:postgresql:42.7.10'
68-
runtimeOnly 'org.mongodb:mongodb-driver-sync:5.6.4'
65+
runtimeOnly "com.h2database:h2:${h2Version}"
66+
runtimeOnly "org.xerial:sqlite-jdbc:${sqliteVersion}"
67+
runtimeOnly "org.postgresql:postgresql:${postgresVersion}"
68+
runtimeOnly "org.mongodb:mongodb-driver-sync:${mongoVersion}"
6969

7070
// Lombok
71-
compileOnly 'org.projectlombok:lombok:1.18.44'
72-
annotationProcessor 'org.projectlombok:lombok:1.18.44'
71+
compileOnly "org.projectlombok:lombok:${lombokVersion}"
72+
annotationProcessor "org.projectlombok:lombok:${lombokVersion}"
7373

7474
// Testing
75-
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.14.3'
76-
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.14.3'
77-
testImplementation 'org.mockito:mockito-core:5.17.0'
78-
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.14.3'
79-
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.14.3'
80-
testCompileOnly 'org.projectlombok:lombok:1.18.44'
81-
testAnnotationProcessor 'org.projectlombok:lombok:1.18.44'
75+
testImplementation "org.junit.jupiter:junit-jupiter-api:${junitVersion}"
76+
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitVersion}"
77+
testImplementation "org.mockito:mockito-core:${mockitoVersion}"
78+
testImplementation "org.junit.jupiter:junit-jupiter-params:${junitVersion}"
79+
testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junitPlatformVersion}"
80+
testCompileOnly "org.projectlombok:lombok:${lombokVersion}"
81+
testAnnotationProcessor "org.projectlombok:lombok:${lombokVersion}"
8282

8383
// Testcontainers for e2e tests
84-
testImplementation 'org.testcontainers:testcontainers:1.20.4'
85-
testImplementation 'org.testcontainers:junit-jupiter:1.20.4'
84+
testImplementation "org.testcontainers:testcontainers:${testContainersVersion}"
85+
testImplementation "org.testcontainers:testcontainers-junit-jupiter:${testContainersVersion}"
8686

8787
// H2 available at test runtime so the in-process proxy can use it
88-
testRuntimeOnly 'com.h2database:h2:2.4.240'
88+
testRuntimeOnly "com.h2database:h2:${h2Version}"
8989

9090
// Include core coverage in the aggregated JaCoCo report
9191
jacocoAggregation project(':jgit-proxy-core')

0 commit comments

Comments
 (0)