Skip to content

Commit bef8e2b

Browse files
authored
Merge branch 'main' into remove-disclaimer
2 parents 0d5b931 + 884fad5 commit bef8e2b

File tree

118 files changed

+4155
-1110
lines changed

Some content is hidden

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

118 files changed

+4155
-1110
lines changed

.github/workflows/continuous-integration.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,9 @@ jobs:
7474
if: ${{ github.ref == 'refs/heads/main' && failure() }}
7575
uses: slackapi/[email protected]
7676
with:
77+
webhook: ${{ secrets.SLACK_WEBHOOK }}
78+
webhook-type: incoming-webhook
7779
payload: |
7880
{
7981
"text": "🚨 Main Build Failed! 😬 Please inspect & fix by clicking <https://github.com/SAP/ai-sdk-java/actions/runs/${{ github.run_id }}|here>"
8082
}
81-
env:
82-
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
83-
SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK

.github/workflows/e2e-test.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@ jobs:
7171
if: failure()
7272
uses: slackapi/[email protected]
7373
with:
74+
webhook: ${{ secrets.SLACK_WEBHOOK }}
75+
webhook-type: incoming-webhook
7476
payload: |
7577
{
7678
"text": "⚠️ End-to-end tests failed! 😬 Please inspect & fix by clicking <https://github.com/SAP/ai-sdk-java/actions/runs/${{ github.run_id }}|here>"
7779
}
78-
env:
79-
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
80-
SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
80+

.github/workflows/fosstars-report.yml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ jobs:
2626
java-version: ${{ env.JAVA_VERSION }}
2727
cache: 'maven'
2828

29-
- name: Restore CVE Database
29+
- name: "Restore CVE Database"
3030
uses: actions/cache/restore@v4
3131
with:
3232
path: ${{ env.CVE_CACHE_DIR }}
3333
key: ${{ env.CVE_CACHE_KEY }}
34-
# fail-on-cache-miss: true
34+
fail-on-cache-miss: true
3535

3636
- name: "Build SDK"
3737
run: |
@@ -48,9 +48,16 @@ jobs:
4848
env:
4949
NVD_API_KEY: ${{ secrets.NVD_API_KEY }}
5050
run: |
51-
mvn -T1 --no-transfer-progress dependency-check:check
51+
mvn -T1 --no-transfer-progress --batch-mode org.owasp:dependency-check-maven:check org.owasp:dependency-check-maven:aggregate
5252
53-
- name: Delete Old CVE Cache
53+
- name: "Archive CVE Report"
54+
uses: actions/upload-artifact@v4
55+
with:
56+
name: cve-report
57+
path: target/dependency-check-report.html
58+
retention-days: 7
59+
60+
- name: "Delete Old CVE Cache"
5461
run: |
5562
CACHE_IDS=$(gh cache list --key "${{ env.CVE_CACHE_KEY }}" --ref "${{ env.CVE_CACHE_REF }}" --json id | jq -r '.[] | .id')
5663
for CACHE_ID in $CACHE_IDS; do
@@ -60,7 +67,7 @@ jobs:
6067
env:
6168
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6269

63-
- name: Create Updated CVE Cache
70+
- name: "Create Updated CVE Cache"
6471
uses: actions/cache/save@v4
6572
with:
6673
path: ${{ env.CVE_CACHE_DIR }}
@@ -70,10 +77,9 @@ jobs:
7077
if: failure()
7178
uses: slackapi/[email protected]
7279
with:
80+
webhook: ${{ secrets.SLACK_WEBHOOK }}
81+
webhook-type: incoming-webhook
7382
payload: |
7483
{
7584
"text": "⚠️ OWASP Dependency check failed! 😬 Please inspect & fix by clicking <https://github.com/SAP/ai-sdk-java/actions/runs/${{ github.run_id }}|here>"
7685
}
77-
env:
78-
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
79-
SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK

core/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@
8686
<groupId>com.fasterxml.jackson.datatype</groupId>
8787
<artifactId>jackson-datatype-jsr310</artifactId>
8888
</dependency>
89+
<dependency>
90+
<groupId>com.fasterxml.jackson.module</groupId>
91+
<artifactId>jackson-module-parameter-names</artifactId>
92+
</dependency>
8993
<dependency>
9094
<groupId>com.google.guava</groupId>
9195
<artifactId>guava</artifactId>

core/src/main/java/com/sap/ai/sdk/core/AiCoreDeployment.java

Lines changed: 0 additions & 45 deletions
This file was deleted.

core/src/main/java/com/sap/ai/sdk/core/AiCoreDestination.java

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)