Skip to content

Commit 272310d

Browse files
committed
noticket: Update YOJ dependencies
- Protobuf: 3.24.0 -> 3.25.5 (fixes GHSA-735f-pc8j-v9w8) - Netty: 4.1.100.Final -> 4.1.118.Final (fixes GHSA-4g8c-wm8x-jfhw) - Jackson: 2.17.1 -> 2.17.3 - Log4j2: 2.17.2 -> 2.23.1 - GSON: 2.10.1 -> 2.12.1 - errorprone annotations: 2.14.0 -> 2.36.0 - Kotlin (optional dependency): 1.9.22 -> 1.9.24 - Mockito (test dependency): 5.5.0 -> 5.11.0 - SnakeYAML (test dependency, for Log4j2 YAML config in tests): 1.33 -> 2.3 - Testcontainers (test dependency, for testing `yoj-repository-ydb-v2`): 1.19.1 -> 1.19.5 - Docker Java (test dependency, for testing `yoj-repository-ydb-v2`): 3.3.3 -> 3.4.2 - Kotlin Compile Testing (test dependency, for testing `yoj-ext-meta-generator`): 1.5.0 -> 1.6.0
1 parent 62cd4b7 commit 272310d

File tree

4 files changed

+42
-25
lines changed

4 files changed

+42
-25
lines changed

WORKSPACE.bazel

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ANNOTATION_API_VERSION = "1.3.2"
55

66
ASPECTJ_VERSION = "1.9.21"
77

8-
ASSERTJ_VERSION = "3.25.1"
8+
ASSERTJ_VERSION = "3.25.3"
99

1010
COMMONS_TEXT_VERSION = "1.10.0"
1111

@@ -17,31 +17,31 @@ GRPC_VERSION = "1.61.0"
1717

1818
GUAVA_VERSION = "33.0.0-jre"
1919

20-
JACKSON_VERSION = "2.16.1"
20+
JACKSON_VERSION = "2.17.3"
2121

22-
JUNIT_JUPITER_VERSION = "5.10.1"
22+
JUNIT_JUPITER_VERSION = "5.10.5"
2323

2424
JUNIT_VERSION = "4.13.2"
2525

26-
KOTLIN_VERSION = "1.9.22"
26+
KOTLIN_VERSION = "1.9.24"
2727

28-
LOG4J_VERSION = "2.22.1"
28+
LOG4J_VERSION = "2.23.1"
2929

3030
LOMBOK_VERSION = "1.18.30"
3131

32-
MOCKITO_VERSION = "5.9.0"
32+
MOCKITO_VERSION = "5.11.0"
3333

3434
PROMETHEUS_VERSION = "1.1.0"
3535

3636
SIMPLECLIENT_VERSION = "0.9.0"
3737

38-
SLF4J_VERSION = "2.0.11"
38+
SLF4J_VERSION = "2.0.13"
3939

40-
SNAKEYAML_VERSION = "1.33"
40+
SNAKEYAML_VERSION = "2.3"
4141

42-
YDB_PROTOAPI_VERSION = "1.6.4"
42+
YDB_PROTOAPI_VERSION = "1.7.1"
4343

44-
YDB_SDK_VERSION = "2.3.9"
44+
YDB_SDK_VERSION = "2.3.14"
4545

4646
maven_install(
4747
name = "java_contribs_stable",

ext-meta-generator/pom.xml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,14 @@
3434
<groupId>org.apache.logging.log4j</groupId>
3535
<artifactId>log4j-core</artifactId>
3636
</dependency>
37+
<dependency>
38+
<groupId>com.fasterxml.jackson.core</groupId>
39+
<artifactId>jackson-databind</artifactId>
40+
</dependency>
41+
<dependency>
42+
<groupId>com.fasterxml.jackson.dataformat</groupId>
43+
<artifactId>jackson-dataformat-yaml</artifactId>
44+
</dependency>
3745

3846
<dependency>
3947
<groupId>javax.annotation</groupId>
@@ -63,6 +71,5 @@
6371
<version>${auto-service.version}</version>
6472
<scope>provided</scope>
6573
</dependency>
66-
6774
</dependencies>
68-
</project>
75+
</project>

ext-meta-generator/src/test/java/tech/ydb/yoj/generator/FieldGeneratorAnnotationProcessorTest.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,10 @@ public void nonEntity() {
7676
@Test
7777
public void kotlinSourceClass() {
7878
// Prepare
79-
SourceFile sourceFile = SourceFile.Companion.fromPath(new File("src/test/resources/input/KotlinDataClass.kt"));
79+
SourceFile sourceFile = SourceFile.Companion.fromPath(
80+
new File("src/test/resources/input/KotlinDataClass.kt"),
81+
false
82+
);
8083
KotlinCompilation compilation = new KotlinCompilation();
8184
compilation.setAnnotationProcessors(List.of(
8285
new FieldGeneratorAnnotationProcessor()

pom.xml

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,10 @@
119119
<lombok-maven-plugin.delombok.output>${project.build.directory}/delombok-for-javadoc</lombok-maven-plugin.delombok.output>
120120

121121
<!-- compile dependencies -->
122-
<protobuf.version>3.24.0</protobuf.version>
122+
<protobuf.version>3.25.5</protobuf.version>
123123
<grpc.version>1.59.1</grpc.version>
124124
<proto-google-common-protos.version>2.9.0</proto-google-common-protos.version>
125-
<netty.version>4.1.100.Final</netty.version>
125+
<netty.version>4.1.118.Final</netty.version>
126126
<javax.annotation-api.version>1.3.2</javax.annotation-api.version>
127127
<jsr305.version>3.0.2</jsr305.version>
128128
<guava.version>33.0.0-jre</guava.version>
@@ -131,27 +131,29 @@
131131
<commons-lang.version>3.13.0</commons-lang.version>
132132
<commons-text.version>1.10.0</commons-text.version>
133133
<compile-testing.version>0.21.0</compile-testing.version>
134-
<kotlin-compile-testing.version>1.5.0</kotlin-compile-testing.version>
134+
<kotlin-compile-testing.version>1.6.0</kotlin-compile-testing.version>
135135
<prometheus.version>0.6.0</prometheus.version>
136-
<error-prone-annotations.version>2.14.0</error-prone-annotations.version>
137-
<gson-version>2.10.1</gson-version>
136+
<error-prone-annotations.version>2.36.0</error-prone-annotations.version>
137+
<gson-version>2.12.1</gson-version>
138138
<auto-service.version>1.1.1</auto-service.version>
139139

140140
<!-- optional dependencies (Kotlin support) -->
141-
<kotlin.version>1.9.22</kotlin.version>
141+
<kotlin.version>1.9.24</kotlin.version>
142142

143143
<!-- test dependencies -->
144144
<junit.version>4.13.2</junit.version>
145145
<hamcrest-core.version>2.2</hamcrest-core.version>
146146
<assertj-core.version>3.25.3</assertj-core.version>
147-
<log4j2.version>2.17.2</log4j2.version>
148-
<mockito.version>5.5.0</mockito.version>
147+
<log4j2.version>2.23.1</log4j2.version>
148+
<mockito.version>5.11.0</mockito.version>
149149
<!-- NB: testcontainers and docker-java versions are related - when bumping one, check if another needs to be bumped too -->
150-
<docker-java.version>3.3.3</docker-java.version>
151-
<testcontainers.version>1.19.1</testcontainers.version>
152-
<jackson.version>2.17.1</jackson.version>
150+
<docker-java.version>3.4.2</docker-java.version>
151+
<testcontainers.version>1.21.1</testcontainers.version>
152+
<!-- testcontainers ships with a vulnerable commons-compress=1.24.0 -->
153+
<commons-compress.version>1.27.1</commons-compress.version>
154+
<jackson.version>2.17.3</jackson.version>
153155
<bytebuddy.version>1.14.11</bytebuddy.version>
154-
<snakeyaml.version>1.33</snakeyaml.version>
156+
<snakeyaml.version>2.3</snakeyaml.version>
155157
<aspectjweaver.version>1.9.21</aspectjweaver.version>
156158
<system-stubs.version>2.1.7</system-stubs.version>
157159
</properties>
@@ -644,6 +646,11 @@
644646
<artifactId>commons-text</artifactId>
645647
<version>${commons-text.version}</version>
646648
</dependency>
649+
<dependency>
650+
<groupId>org.apache.commons</groupId>
651+
<artifactId>commons-compress</artifactId>
652+
<version>${commons-compress.version}</version>
653+
</dependency>
647654
<dependency>
648655
<groupId>tech.ydb</groupId>
649656
<artifactId>ydb-sdk-bom</artifactId>

0 commit comments

Comments
 (0)