diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9d18e5b348b9a..63dfd5f2a9562 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -61,7 +61,7 @@ jobs: timeout-minutes: 60 strategy: matrix: - java-version: [ 8, 19 ] + java-version: [ 11, 19 ] steps: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 @@ -78,6 +78,13 @@ jobs: run: ./mvnw -T1C -B -ntp clean install - name: Build examples with Maven run: ./mvnw -T1C -B -f examples/pom.xml clean package -DskipTests + - name: Setup JDK 8 for Test + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: 8 + - name: Run tests with JDK 8 + run: ./mvnw -T1C -B -ntp -fae test test-coverage: if: github.repository == 'apache/shardingsphere' @@ -93,10 +100,17 @@ jobs: restore-keys: | ${{ env.REPOSITORY_NAME }}-maven-third-party- - uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: 11 + - name: Build with Maven + run: ./mvnw -T1C -B -ntp clean install -DskipTests + - name: Setup JDK 8 for Test + uses: actions/setup-java@v3 with: distribution: 'temurin' java-version: 8 - name: Test with Maven - run: ./mvnw -T1C -B -ntp clean install cobertura:cobertura -Djacoco.skip=false + run: ./mvnw -T1C -B -ntp test cobertura:cobertura -Djacoco.skip=false - name: Upload to Codecov run: bash <(curl -s https://codecov.io/bash) diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml index 624b1a8583326..dc8b6424e9d75 100644 --- a/.github/workflows/docker-release.yml +++ b/.github/workflows/docker-release.yml @@ -48,7 +48,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: 8 + java-version: 11 - name: Set environment run: export MAVEN_OPTS=' -Dmaven.javadoc.skip=true -Djacoco.skip=true $MAVEN_OPTS' - name: Build docker image diff --git a/.github/workflows/e2e-agent.yml b/.github/workflows/e2e-agent.yml index 47fa3533c318a..6d327979e0bbb 100644 --- a/.github/workflows/e2e-agent.yml +++ b/.github/workflows/e2e-agent.yml @@ -70,7 +70,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: '8' + java-version: '11' - uses: actions/cache@v3 with: path: ~/.m2/repository @@ -80,6 +80,11 @@ jobs: - name: Build Project run: | ./mvnw -B clean install -DskipITs -DskipTests -Prelease + - name: Setup JDK 8 for Test + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: 8 - name: Run E2E Test run: | ./mvnw -B clean install -f test/e2e/agent/plugins/tracing/${{ matrix.plugin }}/pom.xml -Dspotless.apply.skip=true -Pit.env.${{ matrix.plugin }} @@ -105,6 +110,11 @@ jobs: - name: Build Project run: | ./mvnw -B clean install -DskipITs -DskipTests -Prelease + - name: Setup JDK 8 for Test + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: 8 - name: Run E2E Test run: | ./mvnw -B clean install -f test/e2e/agent/plugins/metrics/${{ matrix.plugin }}/pom.xml -Dspotless.apply.skip=true -Pit.env.${{ matrix.plugin }} diff --git a/.github/workflows/e2e-discovery.yml b/.github/workflows/e2e-discovery.yml index f1178b2ae445c..7c13dfb2123ff 100644 --- a/.github/workflows/e2e-discovery.yml +++ b/.github/workflows/e2e-discovery.yml @@ -78,12 +78,17 @@ jobs: restore-keys: | ${{ env.REPOSITORY_NAME }}-maven-third-party-it-cache ${{ env.REPOSITORY_NAME }}-maven-third-party- - - name: Set up JDK 8 + - name: Set up JDK 11 uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: 8 + java-version: 11 - name: Build Discovery IT image run: ./mvnw -B clean install -am -pl test/e2e/discovery -Pit.env.docker -DskipTests + - name: Setup JDK 8 for Test + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: 8 - name: Run MySQL Discovery E2E Test run: ./mvnw -nsu -B install -f test/e2e/discovery/pom.xml -Dit.env.type=docker -Dit.docker.mysql.version=mysql:5.7 diff --git a/.github/workflows/e2e-pipeline.yml b/.github/workflows/e2e-pipeline.yml index f1b59e37001b8..b9cc75a033405 100644 --- a/.github/workflows/e2e-pipeline.yml +++ b/.github/workflows/e2e-pipeline.yml @@ -90,13 +90,18 @@ jobs: restore-keys: | ${{ env.REPOSITORY_NAME }}-maven-third-party-it-cache- ${{ env.REPOSITORY_NAME }}-maven-third-party- - - name: Set up JDK 8 + - name: Set up JDK 11 uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: 8 + java-version: 11 - name: Build Pipeline IT image run: ./mvnw -B clean install -am -pl test/e2e/pipeline -Pit.env.docker -DskipTests + - name: Setup JDK 8 for Test + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: 8 - name: Run Pipeline MySQL E2E Test run: ./mvnw -nsu -B install -f test/e2e/pipeline/pom.xml -Dpipeline.it.env.type=docker -Dpipeline.it.docker.mysql.version=${{ env.mysql_version }} - name: Run Pipeline PostgreSQL E2E Test @@ -123,13 +128,18 @@ jobs: restore-keys: | ${{ env.REPOSITORY_NAME }}-maven-third-party-it-cache- ${{ env.REPOSITORY_NAME }}-maven-third-party- - - name: Set up JDK 8 + - name: Set up JDK 11 uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: 8 + java-version: 11 - name: Build Pipeline IT image run: ./mvnw -B clean install -am -pl test/e2e/pipeline -Pit.env.docker -DskipTests + - name: Setup JDK 8 for Test + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: 8 - name: Run Pipeline Daily MySQL E2E Test run: ./mvnw -nsu -B install -f test/e2e/pipeline/pom.xml -Dpipeline.it.env.type=docker -Dpipeline.it.docker.mysql.version=${{ env.mysql_version }} - name: Run Pipeline Daily PostgreSQL E2E Test diff --git a/.github/workflows/e2e-showprocesslist.yml b/.github/workflows/e2e-showprocesslist.yml index 3947003fdfed9..6f46e196c401c 100644 --- a/.github/workflows/e2e-showprocesslist.yml +++ b/.github/workflows/e2e-showprocesslist.yml @@ -76,12 +76,17 @@ jobs: restore-keys: | ${{ env.REPOSITORY_NAME }}-maven-third-party-it-cache ${{ env.REPOSITORY_NAME }}-maven-third-party- - - name: Set up JDK 8 + - name: Set up JDK 11 uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: 8 + java-version: 11 - name: Build ShowProcesslist IT image run: ./mvnw -B clean install -am -pl test/e2e/showprocesslist -Pit.env.docker -DskipTests + - name: Setup JDK 8 for Test + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: 8 - name: Run MySQL ShowProcesslist E2E Test run: ./mvnw -nsu -B install -f test/e2e/showprocesslist/pom.xml -Dit.env.type=docker -Dit.scenarios=cluster_jdbc_proxy -Dit.run.modes=${{ matrix.mode }} diff --git a/.github/workflows/e2e-transaction.yml b/.github/workflows/e2e-transaction.yml index e4385c67994f5..362757d8eefbb 100644 --- a/.github/workflows/e2e-transaction.yml +++ b/.github/workflows/e2e-transaction.yml @@ -79,13 +79,18 @@ jobs: restore-keys: | ${{ env.REPOSITORY_NAME }}-maven-third-party-it-cache ${{ env.REPOSITORY_NAME }}-maven-third-party- - - name: Set up JDK 8 + - name: Set up JDK 11 uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: 8 + java-version: 11 - name: Build Transaction IT image run: ./mvnw -B clean install -am -pl test/e2e/transaction -Pit.env.docker -DskipTests + - name: Setup JDK 8 for Test + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: 8 - name: Run MySQL Transaction E2E Test run: ./mvnw -nsu -B install -f test/e2e/transaction/pom.xml -Dtransaction.it.env.type=docker -Dtransaction.it.env.transtypes=LOCAL,XA -Dtransaction.it.env.xa.providers=Atomikos,Narayana -Dtransaction.it.docker.mysql.version=${{ env.mysql_version }} - name: Run PostgreSQL Transaction E2E Test diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index ecb0a5c0d1ce2..2adf29bd72364 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -68,7 +68,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: '8' + java-version: '11' - uses: actions/cache@v3 with: path: ~/.m2/repository diff --git a/.github/workflows/nightly-build-artifact.yml b/.github/workflows/nightly-build-artifact.yml index 8b8b14aaea72c..d09166afca5f2 100644 --- a/.github/workflows/nightly-build-artifact.yml +++ b/.github/workflows/nightly-build-artifact.yml @@ -51,7 +51,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: 8 + java-version: 11 - name: Build project run: | ./mvnw -B clean install -Prelease @@ -80,7 +80,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: 8 + java-version: 11 - name: Cache Maven Repos uses: actions/cache@v3 with: diff --git a/.github/workflows/nightly-build-example.yml b/.github/workflows/nightly-build-example.yml index ee7811dee53e0..ac1edc1fdd0e6 100644 --- a/.github/workflows/nightly-build-example.yml +++ b/.github/workflows/nightly-build-example.yml @@ -37,7 +37,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: '8' + java-version: '11' - uses: actions/cache@v3 with: path: ~/.m2/repository @@ -96,7 +96,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: '8' + java-version: '11' - uses: actions/cache@v3 with: path: ~/.m2/repository diff --git a/.github/workflows/nightly-ci.yml b/.github/workflows/nightly-ci.yml index 2d26046d6b43d..4e5251416db1f 100644 --- a/.github/workflows/nightly-ci.yml +++ b/.github/workflows/nightly-ci.yml @@ -37,7 +37,7 @@ jobs: fail-fast: false matrix: os: [ ubuntu-latest, macos-latest, windows-latest ] - java-version: [ 8, 17, 19 ] + java-version: [ 11, 17, 19 ] steps: - name: Support long paths in Windows if: matrix.os == 'windows-latest' diff --git a/.github/workflows/nightly-e2e.yml b/.github/workflows/nightly-e2e.yml index 5fd0fcd46fc1e..e8399ee06a1e2 100644 --- a/.github/workflows/nightly-e2e.yml +++ b/.github/workflows/nightly-e2e.yml @@ -41,7 +41,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: '8' + java-version: '11' - uses: actions/cache@v3 with: path: ~/.m2/repository @@ -85,7 +85,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: 8 + java-version: 11 - name: Download IT image if: matrix.adapter == 'proxy' uses: actions/download-artifact@v3 @@ -123,7 +123,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: 8 + java-version: 11 - name: Download IT image if: matrix.adapter == 'proxy' uses: actions/download-artifact@v3 @@ -161,7 +161,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: 8 + java-version: 11 - name: Download IT image if: matrix.adapter == 'proxy' uses: actions/download-artifact@v3 diff --git a/.github/workflows/nightly-sql-parser.yml b/.github/workflows/nightly-sql-parser.yml index 49cb5a3d266b8..816438176d863 100644 --- a/.github/workflows/nightly-sql-parser.yml +++ b/.github/workflows/nightly-sql-parser.yml @@ -37,7 +37,7 @@ jobs: strategy: fail-fast: false matrix: - java-version: [ 8 ] + java-version: [ 11 ] database: [ mysql, postgresql ] steps: - uses: actions/checkout@v3 diff --git a/pom.xml b/pom.xml index 4927eca3bf9b8..e42629cc047e6 100644 --- a/pom.xml +++ b/pom.xml @@ -1193,6 +1193,9 @@ [11,) + + 8 +