From ff917acf4f5d52a38101d08551c115bc4496747a Mon Sep 17 00:00:00 2001
From: Cassie Coyle <cassie@diagrid.io>
Date: Fri, 7 Mar 2025 13:07:02 -0600
Subject: [PATCH] Consolidate SpringBoot Versions & Fix Release Pipeline
 (#1239)

* fix release

Signed-off-by: Cassandra Coyle <cassie@diagrid.io>

* remove springboot v3.2.6 and use dapr-sdk-parent version

Signed-off-by: Cassandra Coyle <cassie@diagrid.io>

---------

Signed-off-by: Cassandra Coyle <cassie@diagrid.io>
---
 spring-boot-examples/consumer-app/pom.xml | 17 -----------------
 spring-boot-examples/pom.xml              | 21 +++++++++++++--------
 spring-boot-examples/producer-app/pom.xml | 11 -----------
 3 files changed, 13 insertions(+), 36 deletions(-)

diff --git a/spring-boot-examples/consumer-app/pom.xml b/spring-boot-examples/consumer-app/pom.xml
index ca585da0b..01f72f991 100644
--- a/spring-boot-examples/consumer-app/pom.xml
+++ b/spring-boot-examples/consumer-app/pom.xml
@@ -12,9 +12,6 @@
   <name>consumer-app</name>
   <description>Spring Boot, Testcontainers and Dapr Integration Examples :: Consumer App</description>
 
-  <properties>
-    <springboot.version>3.2.6</springboot.version>
-  </properties>
 
   <dependencyManagement>
     <dependencies>
@@ -37,12 +34,6 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-actuator</artifactId>
     </dependency>
-    <dependency>
-      <groupId>io.dapr.spring</groupId>
-      <artifactId>dapr-spring-boot-starter</artifactId>
-      <version>${dapr-java-sdk.alpha-version}</version>
-    </dependency>
-
     <dependency>
       <groupId>io.dapr.spring</groupId>
       <artifactId>dapr-spring-boot-starter</artifactId>
@@ -93,14 +84,6 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <version>${maven-deploy-plugin.version}</version>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
diff --git a/spring-boot-examples/pom.xml b/spring-boot-examples/pom.xml
index e1d2c9f84..006e4e16c 100644
--- a/spring-boot-examples/pom.xml
+++ b/spring-boot-examples/pom.xml
@@ -13,21 +13,26 @@
   <version>0.15.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
+  <properties>
+    <maven.deploy.skip>true</maven.deploy.skip>
+  </properties>
+
   <modules>
     <module>producer-app</module>
     <module>consumer-app</module>
   </modules>
 
   <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.springframework.boot</groupId>
+          <artifactId>spring-boot-maven-plugin</artifactId>
+          <version>${springboot.version}</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <version>${maven-deploy-plugin.version}</version>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
diff --git a/spring-boot-examples/producer-app/pom.xml b/spring-boot-examples/producer-app/pom.xml
index 929ec3d0c..017bbd719 100644
--- a/spring-boot-examples/producer-app/pom.xml
+++ b/spring-boot-examples/producer-app/pom.xml
@@ -13,9 +13,6 @@
   <name>producer-app</name>
   <description>Spring Boot, Testcontainers and Dapr Integration Examples :: Producer App</description>
 
-  <properties>
-    <springboot.version>3.2.6</springboot.version>
-  </properties>
 
   <dependencyManagement>
     <dependencies>
@@ -80,14 +77,6 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <version>${maven-deploy-plugin.version}</version>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>