Merge branch 'master' into development-cloudconfig

Author: lony2003

sdk/src/test/java/io/dapr/client/DaprClientBuilderTest.java

@@ -18,6 +18,7 @@
 import io.dapr.exceptions.DaprException;
 import io.dapr.serializer.DaprObjectSerializer;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.AfterEach;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -27,6 +28,16 @@
 
 public class DaprClientBuilderTest {
 
+  private DaprClient client;
+
+  @AfterEach
+  public void cleanup() throws Exception {
+    if (client != null) {
+      client.close();
+      client = null;
+    }
+  }
+
   @Test
   public void build() {
     DaprObjectSerializer objectSerializer = mock(DaprObjectSerializer.class);
@@ -35,17 +46,17 @@ public void build() {
     DaprClientBuilder daprClientBuilder = new DaprClientBuilder();
     daprClientBuilder.withObjectSerializer(objectSerializer);
     daprClientBuilder.withStateSerializer(stateSerializer);
-    DaprClient daprClient = daprClientBuilder.build();
-    assertNotNull(daprClient);
+    client = daprClientBuilder.build();
+    assertNotNull(client);
   }
 
   @Test
   public void buildWithOverrideSidecarIP() {
     DaprClientBuilder daprClientBuilder = new DaprClientBuilder();
     daprClientBuilder.withPropertyOverride(Properties.SIDECAR_IP, "unknownhost");
-    DaprClient daprClient = daprClientBuilder.build();
-    assertNotNull(daprClient);
-    DaprException thrown = assertThrows(DaprException.class, () -> { daprClient.getMetadata().block(); });
+    client = daprClientBuilder.build();
+    assertNotNull(client);
+    DaprException thrown = assertThrows(DaprException.class, () -> { client.getMetadata().block(); });
     assertTrue(thrown.toString().contains("UNAVAILABLE"), thrown.toString());
 
   }

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>

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>

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>