Ensure same Spring Boot version is used across different tests (#1109)

Signed-off-by: Artur Ciocanu <ciocanu@adobe.com> Co-authored-by: Artur Ciocanu <ciocanu@adobe.com>
dapr · Aug 22, 2024 · 93a7bc5 · 93a7bc5
1 parent 1681816
commit 93a7bc5
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 8 deletions.
diff --git a/examples/pom.xml b/examples/pom.xml
@@ -24,7 +24,6 @@
     <maven.deploy.skip>true</maven.deploy.skip>
     <spotbugs.fail>false</spotbugs.fail>
     <opentelemetry.version>0.14.0</opentelemetry.version>
-    <springboot.version>3.2.6</springboot.version>
   </properties>
 
   <dependencies>

diff --git a/pom.xml b/pom.xml
@@ -43,6 +43,7 @@
     <junit-bom.version>5.8.2</junit-bom.version>
     <snakeyaml.version>2.0</snakeyaml.version>
     <testcontainers.version>1.20.0</testcontainers.version>
+    <springboot.version>3.2.6</springboot.version>
   </properties>
 
   <distributionManagement>

diff --git a/sdk-actors/pom.xml b/sdk-actors/pom.xml
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-web</artifactId>
-      <version>2.7.18</version>
+      <version>${springboot.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/sdk-springboot/pom.xml b/sdk-springboot/pom.xml
@@ -18,7 +18,6 @@
 
   <properties>
     <maven.deploy.skip>false</maven.deploy.skip>
-    <springboot.version>3.2.6</springboot.version>
   </properties>
 
   <dependencyManagement>

diff --git a/sdk-tests/pom.xml b/sdk-tests/pom.xml
@@ -22,7 +22,7 @@
     <grpc.version>1.64.0</grpc.version>
     <protobuf.version>3.25.0</protobuf.version>
     <opentelemetry.version>1.39.0</opentelemetry.version>
-    <spring-boot.version>3.3.1</spring-boot.version>
+    <springboot.version>3.3.1</springboot.version>
     <logback-classic.version>1.4.12</logback-classic.version>
     <wiremock.version>3.9.1</wiremock.version>
   </properties>
@@ -33,7 +33,7 @@
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-dependencies</artifactId>
-        <version>${spring-boot.version}</version>
+        <version>${springboot.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -292,7 +292,7 @@
         </property>
       </activation>
       <properties>
-        <spring-boot.version>${env.PRODUCT_SPRING_BOOT_VERSION}</spring-boot.version>
+        <springboot.version>${env.PRODUCT_SPRING_BOOT_VERSION}</springboot.version>
       </properties>
       <dependencies>
         <dependency>

diff --git a/sdk/pom.xml b/sdk/pom.xml
@@ -97,13 +97,13 @@
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-web</artifactId>
-      <version>2.7.18</version>
+      <version>${springboot.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-autoconfigure</artifactId>
-      <version>2.7.18</version>
+      <version>${springboot.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>