diff --git a/.github/workflows/test-druid.yml b/.github/workflows/test-druid.yml new file mode 100644 index 00000000000..edd145a062b --- /dev/null +++ b/.github/workflows/test-druid.yml @@ -0,0 +1,64 @@ +name: "test-druid" + +on: + push: + branches: [ test*, "*.*.*" ] + +jobs: + test-druid: + name: "test-druid" + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + java: [ 8, 11, 17, 21 ] + druid: [ + 1.2.19, + #1.2.18, # Unit test triggered a bug in Druid, see the commit https://github.com/alibaba/druid/commit/6c493f852852fb287ed5fd31ee16c27ead0ea5cf + #1.2.17, # Unit test triggered a bug in Druid, see the commit https://github.com/alibaba/druid/commit/6c493f852852fb287ed5fd31ee16c27ead0ea5cf + 1.2.16, + 1.2.15, + 1.2.14, + 1.2.13, + 1.2.12, + 1.2.11, + 1.2.10, + 1.2.9, + 1.2.8, + 1.2.7, + 1.2.6, + 1.2.5, + 1.2.4, + 1.2.3, + 1.2.2, + 1.2.1, + 1.2.0, + + # not support druid:1.1.x + #1.1.24, + #1.1.23, + #1.1.22, + #1.1.21, + #1.1.20, + ] + steps: + # step 1 + - name: "Checkout" + uses: actions/checkout@v3 + # step 2 + - name: "Set up Java JDK" + uses: actions/setup-java@v3.12.0 + with: + distribution: 'zulu' + java-version: ${{ matrix.java }} + # step 3 + - name: "Print maven version" + run: ./mvnw -version + # step 4 + - name: "Test with Maven" + run: | + if [ "${{ matrix.java }}" == "8" ]; then + ./mvnw -T 4C clean test -Ddruid.version=${{ matrix.druid }} -Dcheckstyle.skip=false -Dlicense.skip=false -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn; + else + ./mvnw -T 4C clean test -Ddruid.version=${{ matrix.druid }} -Dcheckstyle.skip=true -Dlicense.skip=true -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn; + fi diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7d9a4ea3dc7..dd52728af8b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,11 +12,11 @@ jobs: strategy: fail-fast: false matrix: - java: [ 8, 11, 17 ] + java: [ 8, 11, 17, 21 ] springboot: [ - 2.7.9 -Dspring-framework.version=5.3.25, - 2.6.14 -Dspring-framework.version=5.3.24, - 2.5.14 -Dspring-framework.version=5.3.20, + 2.7.16 -Dspring-framework.version=5.3.30, + 2.6.15 -Dspring-framework.version=5.3.27, + 2.5.15 -Dspring-framework.version=5.3.27, 2.4.13 -Dspring-framework.version=5.3.13, 2.3.12.RELEASE -Dspring-framework.version=5.2.15.RELEASE, 2.2.13.RELEASE -Dspring-framework.version=5.2.12.RELEASE, @@ -59,9 +59,10 @@ jobs: strategy: fail-fast: false matrix: - java: [ 17 ] + java: [ 17, 21 ] springboot: [ - 3.0.4 -Dspring-framework.version=6.0.6 -Dspring-boot-for-server.version=2.5.14 -Dspring-framework-for-server.version=5.3.20 -Dkotlin-maven-plugin.version=1.7.22 + 3.1.4 -Dspring-framework.version=6.0.12 -Pdependencies-for-springboot3-1-or-above, + 3.0.11 -Dspring-framework.version=6.0.12, ] steps: # step 1 @@ -79,7 +80,7 @@ jobs: # step 4 - name: "Test with Maven" run: | - ./mvnw -T 4C clean test -Dspring-boot.version=${{ matrix.springboot }} -Dcheckstyle.skip=false -Dlicense.skip=false -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn; + ./mvnw -T 4C clean test -Dspring-boot.version=${{ matrix.springboot }} -Dspring-boot-for-server.version=2.5.14 -Dspring-framework-for-server.version=5.3.20 -Dkotlin-maven-plugin.version=1.7.22 -Dcheckstyle.skip=false -Dlicense.skip=false -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn; # job 3 arm64-test: @@ -88,9 +89,9 @@ jobs: fail-fast: false matrix: springboot: [ - 2.7.9 -Dspring-framework.version=5.3.25, - 2.6.14 -Dspring-framework.version=5.3.24, - 2.5.14 -Dspring-framework.version=5.3.20, + 2.7.16 -Dspring-framework.version=5.3.30, + 2.6.15 -Dspring-framework.version=5.3.27, + 2.5.15 -Dspring-framework.version=5.3.27, 2.4.13 -Dspring-framework.version=5.3.13, 2.3.12.RELEASE -Dspring-framework.version=5.2.15.RELEASE, 2.2.13.RELEASE -Dspring-framework.version=5.2.12.RELEASE, diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 7883c14e440..541a52c9d6c 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -98,7 +98,7 @@