Skip to content

Commit 7422708

Browse files
authored
Merge branch 'main' into spring-projectsgh-1413-pr-2-fix
Signed-off-by: Claudio Silva Junior <[email protected]>
2 parents 6253677 + c7f7b68 commit 7422708

File tree

1,480 files changed

+71985
-34405
lines changed

Some content is hidden

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

1,480 files changed

+71985
-34405
lines changed

.devcontainer/Dockerfile

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

.devcontainer/devcontainer.json

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

.devcontainer/scripts/onCreateCommand.sh

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

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
Thank you for taking time to contribute this pull request!
22
You might have already read the [contributor guide][1], but as a reminder, please make sure to:
33

4-
* Sign the [contributor license agreement](https://cla.pivotal.io/sign/spring)
4+
* Add a Signed-off-by line to each commit (`git commit -s`) per the [DCO](https://spring.io/blog/2025/01/06/hello-dco-goodbye-cla-simplifying-contributions-to-spring#how-to-use-developer-certificate-of-origin)
55
* Rebase your changes on the latest `main` branch and squash your commits
66
* Add/Update unit tests as needed
77
* Run a build and make sure all tests pass prior to submission
8+
9+
For more details, please check the [contributor guide][1].
10+
Thank you upfront!
11+
12+
[1]: https://github.com/spring-projects/spring-ai/blob/main/CONTRIBUTING.adoc
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: Auto Cherry-Pick
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- '*.x'
8+
9+
jobs:
10+
cherry-pick-commit:
11+
uses: spring-io/spring-github-workflows/.github/workflows/spring-cherry-pick.yml@v5
12+
secrets:
13+
GH_ACTIONS_REPO_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}

.github/workflows/backport-issue.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: Backport Issue
2+
3+
on:
4+
push:
5+
branches:
6+
- '*.x'
7+
8+
jobs:
9+
backport-issue:
10+
uses: spring-io/spring-github-workflows/.github/workflows/spring-backport-issue.yml@main
11+
secrets:
12+
GH_ACTIONS_REPO_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}

.github/workflows/continuous-inspection.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ jobs:
99
code-quality-analysis:
1010
name: code quality analysis report
1111
runs-on: ubuntu-latest
12+
if: ${{ github.repository_owner == 'spring-projects' }}
1213
steps:
1314
- name: Checkout source code
1415
uses: actions/checkout@v4
@@ -21,12 +22,12 @@ jobs:
2122
cache: 'maven'
2223

2324
- name: Analyse test coverage with Jacoco
24-
run: mvn -P test-coverage verify
25+
run: ./mvnw --batch-mode -P test-coverage verify
2526

2627
- name: Analyse code quality with Sonar
2728
if: github.repository == 'spring-projects/spring-ai'
2829
env:
2930
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
3031
SONAR_HOST_URL: ${{ secrets.SONAR_URL }}
31-
run: mvn sonar:sonar -Dsonar.host.url=$SONAR_HOST_URL -Dsonar.login=$SONAR_TOKEN
32+
run: ./mvnw --batch-mode sonar:sonar -Dsonar.host.url=$SONAR_HOST_URL -Dsonar.login=$SONAR_TOKEN
3233

.github/workflows/continuous-integration.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,16 @@ name: CI/CD build
22

33
on:
44
push:
5-
branches: [ "main" ]
5+
branches:
6+
- main
7+
- '*.*.x'
8+
workflow_dispatch:
69

710
jobs:
811
build:
912
name: Build branch
1013
runs-on: ubuntu-latest
14+
if: ${{ github.repository_owner == 'spring-projects' }}
1115
services:
1216
ollama:
1317
image: ollama/ollama:latest
@@ -50,15 +54,15 @@ jobs:
5054
OLLAMA_AUTOCONF_TESTS_ENABLED: "true"
5155
OLLAMA_WITH_REUSE: true
5256
run: |
53-
mvn -s settings.xml -Pci-fast-integration-tests -Pjavadoc -Dfailsafe.rerunFailingTestsCount=3 \
57+
./mvnw -s settings.xml -Pci-fast-integration-tests -Pjavadoc -Dfailsafe.rerunFailingTestsCount=3 \
5458
--batch-mode --update-snapshots deploy
5559
5660
- name: Generate Java docs
57-
run: mvn javadoc:aggregate
61+
run: ./mvnw --batch-mode javadoc:aggregate
5862

5963
- name: Generate assembly
6064
working-directory: spring-ai-docs
61-
run: mvn assembly:single
65+
run: ../mvnw --batch-mode assembly:single
6266

6367
- name: Capture project version
6468
run: echo PROJECT_VERSION=$(mvn help:evaluate -Dexpression=project.version --quiet -DforceStdout) >> $GITHUB_ENV
@@ -83,4 +87,3 @@ jobs:
8387
unzip spring-ai-$PROJECT_VERSION-docs.zip
8488
ssh -i $HOME/.ssh/key $DOCS_USERNAME@$DOCS_HOST "cd $DOCS_PATH && mkdir -p $PROJECT_VERSION"
8589
scp -i $HOME/.ssh/key -r api $DOCS_USERNAME@$DOCS_HOST:$DOCS_PATH/$PROJECT_VERSION
86-

.github/workflows/deploy-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ permissions:
99
jobs:
1010
build:
1111
runs-on: ubuntu-latest
12-
if: github.repository_owner == 'spring-projects'
12+
if: ${{ github.repository_owner == 'spring-projects' }}
1313
steps:
1414
- name: Checkout
1515
uses: actions/checkout@v4

.github/workflows/documentation-upload.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ jobs:
2626
cache: 'maven'
2727

2828
- name: Generate Java docs
29-
run: mvn clean install -DskipTests -Pjavadoc
29+
run: ./mvnw --batch-mode clean install -DskipTests -Pjavadoc
3030

3131
- name: Aggregate Java docs
32-
run: mvn javadoc:aggregate
32+
run: ./mvnw --batch-mode javadoc:aggregate
3333

3434
- name: Generate assembly
3535
working-directory: spring-ai-docs
36-
run: mvn assembly:single
36+
run: ./mvnw --batch-mode assembly:single
3737

3838
- name: Setup SSH key
3939
env:

0 commit comments

Comments
 (0)