Merge pull request #1421 from camunda/meg-fix-protobuf-dep

ci: bump protobuf to 4.29.3 to align with camunda/camunda
camunda · Jan 15, 2025 · 1e3f5e7 · 1e3f5e7
2 parents 57c7de5 + 7a9a86d
commit 1e3f5e7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/pom.xml b/pom.xml
@@ -85,11 +85,12 @@
     <dependency.netty.version>4.1.116.Final</dependency.netty.version>
     <dependency.osgi.version>6.0.0</dependency.osgi.version>
     <dependency.proto.version>2.50.0</dependency.proto.version>
-    <dependency.protobuf.version>4.29.2</dependency.protobuf.version>
+    <dependency.protobuf.version>4.29.3</dependency.protobuf.version>
     <dependency.revapi.version>0.28.1</dependency.revapi.version>
     <dependency.scala.version>2.13.15</dependency.scala.version>
     <dependency.slf4j.version>2.0.16</dependency.slf4j.version>
     <dependency.snakeyaml.version>2.3</dependency.snakeyaml.version>
+    <dependency.spring-boot.version>3.3.7</dependency.spring-boot.version>
     <dependency.spring.version>6.1.14</dependency.spring.version>
     <dependency.testcontainers.version>1.20.4</dependency.testcontainers.version>
     <dependency.zeebe.version>8.7.0-SNAPSHOT</dependency.zeebe.version>
@@ -500,6 +501,14 @@
         <artifactId>checker-qual</artifactId>
         <version>3.48.4</version>
       </dependency>
+
+      <dependency>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-dependencies</artifactId>
+        <version>${dependency.spring-boot.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 

diff --git a/spring-test/pom.xml b/spring-test/pom.xml
@@ -22,22 +22,8 @@
 
   <properties>
     <plugin.version.license>4.6</plugin.version.license>
-    <version.spring-boot>3.3.7</version.spring-boot>
   </properties>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <!-- Import dependency management from Spring Boot -->
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-dependencies</artifactId>
-        <version>${version.spring-boot}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
   <build>
     <plugins>
       <plugin>