Skip to content

Commit fd624a4

Browse files
sureshanapartidhslove
authored andcommitted
Updated protobuf version to 3.25.5, and protobuf & jackson maven dependencies (apache#12389)
1 parent 2b6bfc1 commit fd624a4

3 files changed

Lines changed: 42 additions & 0 deletions

File tree

plugins/hypervisors/kvm/pom.xml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,31 @@
7171
<artifactId>java-linstor</artifactId>
7272
<version>${cs.java-linstor.version}</version>
7373
</dependency>
74+
<dependency>
75+
<groupId>com.fasterxml.jackson.core</groupId>
76+
<artifactId>jackson-core</artifactId>
77+
<version>${cs.jackson.version}</version>
78+
</dependency>
79+
<dependency>
80+
<groupId>com.fasterxml.jackson.core</groupId>
81+
<artifactId>jackson-annotations</artifactId>
82+
<version>${cs.jackson.version}</version>
83+
</dependency>
84+
<dependency>
85+
<groupId>com.fasterxml.jackson.core</groupId>
86+
<artifactId>jackson-databind</artifactId>
87+
<version>${cs.jackson.version}</version>
88+
</dependency>
89+
<dependency>
90+
<groupId>com.fasterxml.jackson.datatype</groupId>
91+
<artifactId>jackson-datatype-jsr310</artifactId>
92+
<version>${cs.jackson.version}</version>
93+
</dependency>
94+
<dependency>
95+
<groupId>com.fasterxml.jackson.module</groupId>
96+
<artifactId>jackson-module-jaxb-annotations</artifactId>
97+
<version>${cs.jackson.version}</version>
98+
</dependency>
7499
<dependency>
75100
<groupId>net.java.dev.jna</groupId>
76101
<artifactId>jna</artifactId>

pom.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@
189189
<cs.gmavenplus.version>3.0.2</cs.gmavenplus.version>
190190
<cs.exec-maven-plugin.version>3.4.1</cs.exec-maven-plugin.version>
191191
<cs.okhttp3.version>4.9.3</cs.okhttp3.version>
192+
<cs.protobuf.version>3.25.5</cs.protobuf.version>
192193
</properties>
193194

194195
<distributionManagement>
@@ -736,6 +737,17 @@
736737
<artifactId>xml-apis</artifactId>
737738
<version>2.0.2</version>
738739
</dependency>
740+
<!-- enforced protobuf version here as mysql-connector-java is pulling older version (3.19.3) -->
741+
<dependency>
742+
<groupId>com.google.protobuf</groupId>
743+
<artifactId>protobuf-java</artifactId>
744+
<version>${cs.protobuf.version}</version>
745+
</dependency>
746+
<dependency>
747+
<groupId>com.google.protobuf</groupId>
748+
<artifactId>protobuf-java-util</artifactId>
749+
<version>${cs.protobuf.version}</version>
750+
</dependency>
739751
<dependency>
740752
<groupId>com.linbit.linstor.api</groupId>
741753
<artifactId>java-linstor</artifactId>

utils/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,11 @@
201201
<artifactId>jackson-databind</artifactId>
202202
<version>${cs.jackson.version}</version>
203203
</dependency>
204+
<dependency>
205+
<groupId>com.fasterxml.jackson.dataformat</groupId>
206+
<artifactId>jackson-dataformat-cbor</artifactId>
207+
<version>${cs.jackson.version}</version>
208+
</dependency>
204209
<dependency>
205210
<groupId>org.apache.commons</groupId>
206211
<artifactId>commons-compress</artifactId>

0 commit comments

Comments
 (0)