Merge branch 'master' into users/svegiraju/conversation-api-2

Author: siri-varma

.github/workflows/create-release.yml

@@ -53,21 +53,4 @@ jobs:
           git remote set-url origin https://x-access-token:${{ secrets.DAPR_BOT_TOKEN }}@github.com/${GITHUB_REPOSITORY}.git
           # Copy first to allow automation to use the latest version and not the release branch's version.
           cp -R ./.github/scripts ${RUNNER_TEMP}/
-          ${RUNNER_TEMP}/scripts/create-release.sh ${{ inputs.rel_version }}
-  trigger:
-    name: Triggers the Dapr SDK build
-    runs-on: ubuntu-latest
-    needs: create-release
-    steps:
-      - name: Identify build ref to trigger build and release.
-        run: |
-          if [[ "${{ inputs.rel_version }}" == *"SNAPSHOT"* ]]; then
-            echo "BUILD_GIT_REF=master" >> $GITHUB_ENV
-          else
-            echo "BUILD_GIT_REF=v${{ inputs.rel_version }}" >> $GITHUB_ENV
-          fi
-      - name: Triggers the build and release.
-        env:
-          GITHUB_TOKEN: ${{ secrets.DAPR_BOT_TOKEN }}
-        run: |
-          gh workflow run build.yml --repo ${GITHUB_REPOSITORY} --ref '${{ env.BUILD_GIT_REF }}'
+          ${RUNNER_TEMP}/scripts/create-release.sh ${{ inputs.rel_version }}

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,6 +84,14 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <version>3.12.1</version>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 

spring-boot-examples/pom.xml

@@ -13,9 +13,34 @@
   <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-site-plugin</artifactId>
+        <version>3.12.1</version>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>

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,6 +77,14 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <version>3.12.1</version>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>