Merge branch 'master' into development-cloudconfig

dapr · Mar 7, 2025 · 40abfab · 40abfab
2 parents bdfbd68 + ad917d2
commit 40abfab
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 18 deletions.
diff --git a/.github/workflows/create-release.yml b/.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 }}
diff --git a/spring-boot-examples/consumer-app/pom.xml b/spring-boot-examples/consumer-app/pom.xml
@@ -93,6 +93,22 @@
         <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>
+        <version>3.12.1</version>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 

diff --git a/spring-boot-examples/pom.xml b/spring-boot-examples/pom.xml
@@ -18,4 +18,24 @@
     <module>consumer-app</module>
   </modules>
 
+  <build>
+    <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>
+        <version>3.12.1</version>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/spring-boot-examples/producer-app/pom.xml b/spring-boot-examples/producer-app/pom.xml
@@ -80,6 +80,22 @@
         <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>
+        <version>3.12.1</version>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>