Skip to content

Commit d303c8e

Browse files
upgrade java dependencies and remove jitpack
upgrade vertx 4.5.25 netty 4.1.131 grpc 1.72.0 jackson 2.19.0 logback 1.5.32 slf4j 2.0.17 guava 33.5.0 log4j 2.24.3 classgraph 4.8.184 bytebuddy 1.17.5 commons-io 2.18.0 gson 2.12.1 rxjava 3.1.11 google-common-protos 2.51.0 remove jitpack repository from root and server build files add jackson-jakarta-rs to version resolution strategy add junit-platform version resolution and launcher dependency use protocVersion variable in vertx-grpc build files
1 parent 6cca05c commit d303c8e

8 files changed

Lines changed: 28 additions & 22 deletions

File tree

build.gradle

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ allprojects {
2929
subprojects {
3030
repositories {
3131
mavenCentral()
32-
maven { url 'https://jitpack.io' }
3332
}
3433

3534
apply plugin: "maven-publish"
@@ -65,6 +64,7 @@ subprojects {
6564
if ([
6665
'com.fasterxml.jackson.core',
6766
'com.fasterxml.jackson.jaxrs',
67+
'com.fasterxml.jackson.jakarta.rs',
6868
'com.fasterxml.jackson.datatype',
6969
'com.fasterxml.jackson.module',
7070
'com.fasterxml.jackson.dataformat'
@@ -128,6 +128,10 @@ subprojects {
128128
details.useVersion junitVersion
129129
}
130130

131+
if (details.requested.group == 'org.junit.platform') {
132+
details.useVersion '1.14.3'
133+
}
134+
131135
if (details.requested.group == 'org.jetbrains' && details.requested.name == 'annotations') {
132136
details.useVersion '24.1.0'
133137
}

gradle.properties

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,38 +3,38 @@ org.gradle.parallel=true
33
org.gradle.vfs.watch=true
44
org.gradle.caching=true
55
docker.builder=true
6-
classgraphVersion=4.8.179
7-
jacksonVersion=2.18.1
8-
jacksonDatabindVersion=2.18.1
6+
classgraphVersion=4.8.184
7+
jacksonVersion=2.19.0
8+
jacksonDatabindVersion=2.19.0
99
jaegerVersion=1.8.1
10-
vertxVersion=4.5.11
10+
vertxVersion=4.5.25
1111
javaProtobufVersion=4.29.0
1212
junitVersion=5.14.3
1313
shadowPluginVersion=9.0.0-rc1
14-
guavaVersion=33.3.1-jre
14+
guavaVersion=33.5.0-jre
1515
keycloakVersion=22.0.3
1616
micrometerVersion=1.10.2
1717
jmhVersion=1.37
1818
testcontainersVersion=1.21.4
1919
postgresqlVersion=42.7.4
20-
nettyVersion=4.1.115.Final
21-
grpcVersion=1.68.1
20+
nettyVersion=4.1.131.Final
21+
grpcVersion=1.72.0
2222
protocVersion=4.29.0
2323
resteasyVersion=6.2.11.Final
24-
log4jVersion=2.24.1
25-
slf4jVersion=2.0.16
26-
logbackVersion=1.5.12
24+
log4jVersion=2.24.3
25+
slf4jVersion=2.0.17
26+
logbackVersion=1.5.32
2727
flywayVersion=9.3.0
2828
googleContainerToolsJibVersion=3.4.4
2929
infinispanVersion=15.0.11.Final
3030
kotlinVersion=1.9.25
3131
googleErrorproneVersion=2.28.0
32-
googleCommonsProtosVersion=2.41.0
32+
googleCommonsProtosVersion=2.51.0
3333
j2objcVersion=3.0.0
34-
bytebuddyVersion=1.15.10
35-
commonsIoVersion=2.16.1
34+
bytebuddyVersion=1.17.5
35+
commonsIoVersion=2.18.0
3636
mockitoCoreVersion=4.8.0
37-
gsonVersion=2.11.0
37+
gsonVersion=2.12.1
3838
xformersVersion=0.0.28.post3
3939
torchVersion=2.5.1
40-
rxJavaVersion=3.1.10
40+
rxJavaVersion=3.1.11

gradle/instrument.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ java {
1919
}
2020
}
2121

22+
dependencies {
23+
testRuntimeOnly "org.junit.platform:junit-platform-launcher"
24+
}
25+
2226
test {
2327
systemProperty("junit.jupiter.extensions.autodetection.enabled", true)
2428
}

spellsource-server/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ buildscript {
44
}
55
repositories {
66
mavenLocal()
7-
// for jooq from github
8-
maven { url 'https://jitpack.io' }
97
mavenCentral()
108
}
119
dependencies {

vertx-grpc/vertx-grpc-client/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ test {
5858

5959
protobuf {
6060
protoc {
61-
artifact = "com.google.protobuf:protoc:3.25.5"
61+
artifact = "com.google.protobuf:protoc:$protocVersion"
6262
}
6363
plugins {
6464
grpc {

vertx-grpc/vertx-grpc-context-storage/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ dependencies {
6969

7070
protobuf {
7171
protoc {
72-
artifact = "com.google.protobuf:protoc:3.25.5"
72+
artifact = "com.google.protobuf:protoc:$protocVersion"
7373
}
7474
plugins {
7575
grpc {

vertx-grpc/vertx-grpc-it/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ test {
5050

5151
protobuf {
5252
protoc {
53-
artifact = "com.google.protobuf:protoc:3.25.5"
53+
artifact = "com.google.protobuf:protoc:$protocVersion"
5454
}
5555
plugins {
5656
grpc {

vertx-grpc/vertx-grpc-server/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ test {
7272

7373
protobuf {
7474
protoc {
75-
artifact = "com.google.protobuf:protoc:3.25.5"
75+
artifact = "com.google.protobuf:protoc:$protocVersion"
7676
}
7777
plugins {
7878
grpc {

0 commit comments

Comments
 (0)