Merge branch 'main' into fix#1857

Author: youngmoneee

.github/dco.yml

@@ -0,0 +1,2 @@
+require:
+  members: false

.github/workflows/artifactory-staging.yml

@@ -8,6 +8,13 @@ jobs:
   build:
     name: Build branch
     runs-on: ubuntu-latest
+    services:
+      ollama:
+        image: ollama/ollama:latest
+        ports:
+          - 11434:11434
+    env:
+      OLLAMA_WITH_REUSE: true
     steps:
       - name: Checkout source code
         uses: actions/checkout@v4
@@ -41,8 +48,9 @@ jobs:
           ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
           ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
           OLLAMA_AUTOCONF_TESTS_ENABLED: "true"
+          OLLAMA_WITH_REUSE: true
         run: |
-          mvn -s settings.xml -Pintegration-tests -Pjavadoc -Dfailsafe.rerunFailingTestsCount=3 \
+          mvn -s settings.xml -Pci-fast-integration-tests -Pjavadoc -Dfailsafe.rerunFailingTestsCount=3 \
           --batch-mode --update-snapshots deploy
 
       - name: Generate Java docs
@@ -76,37 +84,3 @@ jobs:
           ssh -i $HOME/.ssh/key $DOCS_USERNAME@$DOCS_HOST "cd $DOCS_PATH && mkdir -p $PROJECT_VERSION"
           scp -i $HOME/.ssh/key -r api $DOCS_USERNAME@$DOCS_HOST:$DOCS_PATH/$PROJECT_VERSION
   
-
-  # The docker-compose and testcontainers modules will be compiled and run in a parallel job
-  container-tests:
-    name: docker-compose and testcontainers modules
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout source code
-        uses: actions/checkout@v4
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-          cache: 'maven'
-
-      - name: Configure Testcontainers
-        run: |
-          echo "testcontainers.reuse.enable=true" > $HOME/.testcontainers.properties
-
-      - name: Build Dependencies
-        run: |
-          mvn -s settings.xml clean install \
-          -DskipTests \
-          -pl spring-ai-spring-boot-docker-compose,spring-ai-spring-boot-testcontainers \
-          -am --batch-mode
-
-      - name: Run docker-compost and testcontainers Integration Tests
-        run: |
-          mvn -s settings.xml -Pintegration-tests verify \
-          -Dskip.docker-compose=false \
-          -Dskip.testcontainers=false \
-          -pl spring-ai-spring-boot-docker-compose,spring-ai-spring-boot-testcontainers \
-          --batch-mode

.github/workflows/continuous-integration.yml

@@ -0,0 +1,35 @@
+name: Release to Maven Central
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Release project
+    runs-on: ubuntu-latest
+
+    steps:
+
+      - name: Check out sources
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: 17
+          cache: 'maven'
+
+      - name: Install GPG key
+        run: |
+          echo "${{ secrets.GPG_PRIVATE_KEY }}" > gpg.asc
+          echo "${{ secrets.GPG_PASSPHRASE }}" | gpg --batch --yes --passphrase-fd 0 --import gpg.asc
+
+      - name: Release to Sonatype OSSRH
+        env:
+          SONATYPE_USER: ${{ secrets.OSSRH_S01_TOKEN_USERNAME }}
+          SONATYPE_PASSWORD: ${{ secrets.OSSRH_S01_TOKEN_PASSWORD }}
+          MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+        run: |
+          ./mvnw -B clean install -DskipTests
+          ./mvnw -B clean deploy -Psonatype -s settings.xml

.github/workflows/maven-central-release.yml

@@ -1,4 +1,4 @@
-name: Source Code Format
+name: PR Check
 
 on:
   pull_request:
@@ -20,6 +20,6 @@ jobs:
           distribution: 'temurin'
           cache: 'maven'
 
-      - name: Source code formatting check
+      - name: Run tests
         run: |
-          ./mvnw spring-javaformat:validate
+          ./mvnw test