Skip to content

Commit f9716a5

Browse files
committed
Merge branch 'main' into Using-Prompt-Registry-Templates-in-SpringAi
# Conflicts: # orchestration/pom.xml
2 parents 321833d + b35d43e commit f9716a5

File tree

232 files changed

+17742
-5743
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

232 files changed

+17742
-5743
lines changed

.github/ISSUE_TEMPLATE/bug-report.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,13 @@ body:
4646
- Java and Maven version via `mvn --version`: ...
4747
- SAP Cloud SDK for AI version: ...
4848
- Spring Boot or CAP version: ...
49-
- <details><summary>Dependency tree via `mvn dependency:tree`</summary>
50-
51-
```
52-
Dependency tree here
53-
```
54-
</details>
49+
50+
<details><summary>Dependency tree via <code>mvn dependency:tree</code></summary>
51+
52+
```
53+
Dependency tree here
54+
```
55+
</details>
5556
validations:
5657
required: true
5758
- type: textarea

.github/workflows/continuous-integration.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
7373
- name: "Slack Notification"
7474
if: ${{ github.ref == 'refs/heads/main' && failure() }}
75-
uses: slackapi/[email protected].0
75+
uses: slackapi/[email protected].1
7676
with:
7777
webhook: ${{ secrets.SLACK_WEBHOOK }}
7878
webhook-type: incoming-webhook

.github/workflows/deploy-snapshot.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040

4141
- name: "Slack Notification"
4242
if: failure()
43-
uses: slackapi/[email protected].0
43+
uses: slackapi/[email protected].1
4444
with:
4545
webhook: ${{ secrets.SLACK_WEBHOOK }}
4646
webhook-type: incoming-webhook

.github/workflows/e2e-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ jobs:
8585

8686
- name: "Slack Notification"
8787
if: failure()
88-
uses: slackapi/[email protected].0
88+
uses: slackapi/[email protected].1
8989
with:
9090
webhook: ${{ secrets.SLACK_WEBHOOK }}
9191
webhook-type: incoming-webhook

.github/workflows/fosstars-report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676

7777
- name: "Slack Notification"
7878
if: failure()
79-
uses: slackapi/[email protected].0
79+
uses: slackapi/[email protected].1
8080
with:
8181
webhook: ${{ secrets.SLACK_WEBHOOK }}
8282
webhook-type: incoming-webhook

.github/workflows/pr-lint.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
Orchestration
2525
DevOps
2626
PromptRegistry
27+
Grounding
2728
headerPattern: '^(\w.+): (?:\[(\w.+)\] )?(.+)$'
2829
headerPatternCorrespondence: type, scope, subject
2930
# for available types, check:

.github/workflows/spec-update.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
required: false
1010
options:
1111
- core
12-
- grounding
12+
- document-grounding
1313
- orchestration
1414
- prompt-registry
1515
default: orchestration
@@ -83,7 +83,7 @@ jobs:
8383
API_URL="$API_BASE_URL/cloudsdk/cloud-sdk-java-tests/contents/aicore.yaml?ref=$REF"
8484
FILE_PATH='core/src/main/resources/spec/aicore.yaml'
8585
;;
86-
grounding)
86+
document-grounding)
8787
API_URL="$API_BASE_URL/AI/rage-proxy-inference/contents/docs/public/business_api_hub/api_hub_merged_spec.yaml?ref=$REF"
8888
FILE_PATH='core-services/document-grounding/src/main/resources/spec/grounding.yaml'
8989
;;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
matrix:
1313
file:
1414
- core
15-
- grounding
15+
- document-grounding
1616
- prompt-registry
1717

1818
steps:

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ The following table lists the required versions, based on the latest release:
4545
| SAP Cloud SDK | 5.6.0 | latest |
4646
| (optional) CAP Java | 3.0.0 | latest |
4747
| (optional) Spring Boot | 3.0 | latest |
48+
| (optional) Spring AI | 1.0.0 | latest |
4849

4950
See [an example `pom.xml` in our Spring Boot application](sample-code/spring-app/pom.xml).
5051

core-services/document-grounding/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.sap.ai.sdk</groupId>
66
<artifactId>sdk-parent</artifactId>
7-
<version>1.10.0-SNAPSHOT</version>
7+
<version>1.11.0-SNAPSHOT</version>
88
<relativePath>../../pom.xml</relativePath>
99
</parent>
1010
<artifactId>document-grounding</artifactId>

0 commit comments

Comments
 (0)