Skip to content

Commit db1c7d6

Browse files
Updated protobuf version to 3.25.5, and protobuf & jackson maven dependencies (#12389)
1 parent ef1aaa0 commit db1c7d6

File tree

3 files changed

+42
-0
lines changed

3 files changed

+42
-0
lines changed

plugins/hypervisors/kvm/pom.xml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,31 @@
6767
<artifactId>java-linstor</artifactId>
6868
<version>${cs.java-linstor.version}</version>
6969
</dependency>
70+
<dependency>
71+
<groupId>com.fasterxml.jackson.core</groupId>
72+
<artifactId>jackson-core</artifactId>
73+
<version>${cs.jackson.version}</version>
74+
</dependency>
75+
<dependency>
76+
<groupId>com.fasterxml.jackson.core</groupId>
77+
<artifactId>jackson-annotations</artifactId>
78+
<version>${cs.jackson.version}</version>
79+
</dependency>
80+
<dependency>
81+
<groupId>com.fasterxml.jackson.core</groupId>
82+
<artifactId>jackson-databind</artifactId>
83+
<version>${cs.jackson.version}</version>
84+
</dependency>
85+
<dependency>
86+
<groupId>com.fasterxml.jackson.datatype</groupId>
87+
<artifactId>jackson-datatype-jsr310</artifactId>
88+
<version>${cs.jackson.version}</version>
89+
</dependency>
90+
<dependency>
91+
<groupId>com.fasterxml.jackson.module</groupId>
92+
<artifactId>jackson-module-jaxb-annotations</artifactId>
93+
<version>${cs.jackson.version}</version>
94+
</dependency>
7095
<dependency>
7196
<groupId>net.java.dev.jna</groupId>
7297
<artifactId>jna</artifactId>

pom.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@
190190
<org.springframework.version>5.3.26</org.springframework.version>
191191
<cs.ini.version>0.5.4</cs.ini.version>
192192
<cs.caffeine.version>3.1.7</cs.caffeine.version>
193+
<cs.protobuf.version>3.25.5</cs.protobuf.version>
193194
</properties>
194195

195196
<distributionManagement>
@@ -727,6 +728,17 @@
727728
<artifactId>xml-apis</artifactId>
728729
<version>2.0.2</version>
729730
</dependency>
731+
<!-- enforced protobuf version here as mysql-connector-java is pulling older version (3.19.3) -->
732+
<dependency>
733+
<groupId>com.google.protobuf</groupId>
734+
<artifactId>protobuf-java</artifactId>
735+
<version>${cs.protobuf.version}</version>
736+
</dependency>
737+
<dependency>
738+
<groupId>com.google.protobuf</groupId>
739+
<artifactId>protobuf-java-util</artifactId>
740+
<version>${cs.protobuf.version}</version>
741+
</dependency>
730742
<dependency>
731743
<groupId>com.linbit.linstor.api</groupId>
732744
<artifactId>java-linstor</artifactId>

utils/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,11 @@
196196
<artifactId>jackson-databind</artifactId>
197197
<version>${cs.jackson.version}</version>
198198
</dependency>
199+
<dependency>
200+
<groupId>com.fasterxml.jackson.dataformat</groupId>
201+
<artifactId>jackson-dataformat-cbor</artifactId>
202+
<version>${cs.jackson.version}</version>
203+
</dependency>
199204
<dependency>
200205
<groupId>org.apache.commons</groupId>
201206
<artifactId>commons-compress</artifactId>

0 commit comments

Comments
 (0)