Merge branch 'main' into agent-workflow-examples

Author: newtork

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -46,12 +46,13 @@ body:
         - Java and Maven version via `mvn --version`: ...
         - SAP Cloud SDK for AI version: ...
         - Spring Boot or CAP version: ...
-        - <details><summary>Dependency tree via `mvn dependency:tree`</summary>
-            
-            ```
-            Dependency tree here
-            ```
-          </details>
+        
+          <details><summary>Dependency tree via <code>mvn dependency:tree</code></summary>
+        
+        ```
+        Dependency tree here
+        ```
+        </details>
     validations:
       required: true
   - type: textarea

.github/workflows/continuous-integration.yaml

@@ -72,7 +72,7 @@ jobs:
 
       - name: "Slack Notification"
         if: ${{ github.ref == 'refs/heads/main' && failure() }}
-        uses: slackapi/[email protected].0
+        uses: slackapi/[email protected].1
         with:
           webhook: ${{ secrets.SLACK_WEBHOOK }}
           webhook-type: incoming-webhook

.github/workflows/deploy-snapshot.yaml

@@ -40,7 +40,7 @@ jobs:
 
       - name: "Slack Notification"
         if: failure()
-        uses: slackapi/[email protected].0
+        uses: slackapi/[email protected].1
         with:
           webhook: ${{ secrets.SLACK_WEBHOOK }}
           webhook-type: incoming-webhook

.github/workflows/e2e-test.yaml

@@ -39,9 +39,25 @@ jobs:
           mvn $MVN_ARGS
 
       - name: "Run tests"
+        id: run_tests
         run: |
           MVN_ARGS="${{ env.MVN_MULTI_THREADED_ARGS }} surefire:test -pl :spring-app -DskipTests=false"
-          mvn $MVN_ARGS "-Daicore.landscape=${{ matrix.environment }}"
+          mvn $MVN_ARGS "-Daicore.landscape=${{ matrix.environment }}" | tee mvn_output.log # tee writes to both the console and a file
+
+          awk '/Results:/, /----/' mvn_output.log > test_error.log || true # true ensures the step doesn't fail if no match is found.
+          ERROR_MSG=$(cat test_error.log | tail +4 | head -n -4 | awk '{gsub(/"/, "\\\""); printf "%s\\n", $0}') # Slack formatting
+          echo "$ERROR_MSG"
+          echo "error_message=$ERROR_MSG" >> $GITHUB_OUTPUT
+
+          if grep -q "BUILD FAILURE" mvn_output.log; then
+            echo "Maven build failed."
+            exit 1
+          elif grep -q "BUILD SUCCESS" mvn_output.log; then
+            echo "Maven build succeeded."
+          else
+            echo "Maven build status unknown."
+            exit 1
+          fi
         env:
           # See "End-to-end test application instructions" on the README.md to update the secret
           AICORE_SERVICE_KEY: ${{ secrets[matrix.secret-name] }}
@@ -69,12 +85,17 @@ jobs:
 
       - name: "Slack Notification"
         if: failure()
-        uses: slackapi/[email protected].0
+        uses: slackapi/[email protected].1
         with:
           webhook: ${{ secrets.SLACK_WEBHOOK }}
           webhook-type: incoming-webhook
           payload: |
-            {
-              "text": "⚠️ End-to-end tests failed! 😬 Please inspect & fix by clicking <https://github.com/SAP/ai-sdk-java/actions/runs/${{ github.run_id }}|here>"
-            }
-
+            blocks:
+              - type: "section"
+                text:
+                    type: "mrkdwn"
+                    text: "⚠️ End-to-end tests failed! 😬 Please inspect & fix by clicking <https://github.com/SAP/ai-sdk-java/actions/runs/${{ github.run_id }}|here>"
+              - type: "section"
+                text:
+                  type: "plain_text"
+                  text: "${{ steps.run_tests.outputs.error_message }}"

.github/workflows/fosstars-report.yml

@@ -76,7 +76,7 @@ jobs:
 
       - name: "Slack Notification"
         if: failure()
-        uses: slackapi/[email protected].0
+        uses: slackapi/[email protected].1
         with:
           webhook: ${{ secrets.SLACK_WEBHOOK }}
           webhook-type: incoming-webhook

.github/workflows/spec-update.yaml

@@ -9,7 +9,7 @@ on:
         required: false
         options:
           - core
-          - grounding
+          - document-grounding
           - orchestration
           - prompt-registry
         default: orchestration
@@ -83,12 +83,12 @@ jobs:
               API_URL="$API_BASE_URL/cloudsdk/cloud-sdk-java-tests/contents/aicore.yaml?ref=$REF"
               FILE_PATH='core/src/main/resources/spec/aicore.yaml'
               ;;
-            grounding)
+            document-grounding)
               API_URL="$API_BASE_URL/AI/rage-proxy-inference/contents/docs/public/business_api_hub/api_hub_merged_spec.yaml?ref=$REF"
               FILE_PATH='core-services/document-grounding/src/main/resources/spec/grounding.yaml'
               ;;
             orchestration)
-              API_URL="$API_BASE_URL/AI/llm-orchestration/contents/src/spec/api.yaml?ref=$REF"
+              API_URL="$API_BASE_URL/AI/llm-orchestration/contents/src/spec/v2.yaml?ref=$REF"
               FILE_PATH='orchestration/src/main/resources/spec/orchestration.yaml'
               ;;
             prompt-registry)

.github/workflows/weekly-spec-update.yaml

@@ -12,7 +12,7 @@ jobs:
       matrix:
         file:
           - core
-          - grounding
+          - document-grounding
           - prompt-registry
 
     steps:

README.md

@@ -45,6 +45,7 @@ The following table lists the required versions, based on the latest release:
 | SAP Cloud SDK          | 5.6.0           | latest              |
 | (optional) CAP Java    | 3.0.0           | latest              |
 | (optional) Spring Boot | 3.0             | latest              |
+| (optional) Spring AI   | 1.0.0           | latest              |
 
 See [an example `pom.xml` in our Spring Boot application](sample-code/spring-app/pom.xml).
 

core-services/document-grounding/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.sap.ai.sdk</groupId>
     <artifactId>sdk-parent</artifactId>
-    <version>1.9.0-SNAPSHOT</version>
+    <version>1.10.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>document-grounding</artifactId>
@@ -30,6 +30,11 @@
       <organizationUrl>https://www.sap.com</organizationUrl>
     </developer>
   </developers>
+  <scm>
+    <connection>scm:git:git://github.com/SAP/ai-sdk-java.git</connection>
+    <developerConnection>scm:git:ssh://github.com:SAP/ai-sdk-java.git</developerConnection>
+    <url>https://github.com/SAP/ai-sdk-java/tree/main</url>
+  </scm>
   <properties>
     <project.rootdir>${project.basedir}/../../</project.rootdir>
     <coverage.complexity>80%</coverage.complexity>