From b2e45072edcf88076b5f0acd7dc24b203d78a801 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 17 Oct 2021 01:17:01 -0400 Subject: [PATCH 1/3] [config] Update build config --- .github/workflows/ci.yaml | 4 ++-- .github/workflows/coveralls.yaml | 2 +- .github/workflows/sonar.yaml | 2 +- .github/workflows/sonatype.yaml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f3ca450bcd..e13e2ce928 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -28,8 +28,8 @@ jobs: strategy: matrix: os: [ubuntu-latest, macOS-latest, windows-latest] - java: [8, 11, 16, 17-ea] - distribution: ['adopt'] + java: [8, 11, 17, 18-ea] + distribution: ['zulu'] fail-fast: false max-parallel: 4 name: Test JDK ${{ matrix.java }}, ${{ matrix.os }} diff --git a/.github/workflows/coveralls.yaml b/.github/workflows/coveralls.yaml index 72ea37a805..75b6bc9863 100644 --- a/.github/workflows/coveralls.yaml +++ b/.github/workflows/coveralls.yaml @@ -32,7 +32,7 @@ jobs: uses: actions/setup-java@v2 with: java-version: 8 - distribution: adopt + distribution: zulu - name: Report Coverage to Coveralls for Pull Requests if: github.event_name == 'pull_request' run: ./mvnw test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml index 3a5dbd4be4..0eeb04b434 100644 --- a/.github/workflows/sonar.yaml +++ b/.github/workflows/sonar.yaml @@ -38,7 +38,7 @@ jobs: uses: actions/setup-java@v2 with: java-version: 11 - distribution: adopt + distribution: zulu - name: Analyze with SonarCloud run: ../mvnw verify jacoco:report sonar:sonar -B -Dsonar.projectKey=mybatis_generator -Dsonar.organization=mybatis -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN -Dlicense.skip=true env: diff --git a/.github/workflows/sonatype.yaml b/.github/workflows/sonatype.yaml index 270a31246d..a9ea620a3a 100644 --- a/.github/workflows/sonatype.yaml +++ b/.github/workflows/sonatype.yaml @@ -35,7 +35,7 @@ jobs: uses: actions/setup-java@v2 with: java-version: 11 - distribution: adopt + distribution: zulu - name: Deploy to Sonatype run: ./mvnw deploy -DskipTests -B --settings ./.mvn/settings.xml -Dlicense.skip=true env: From 350fd579549fee711e4ae1a8068d210ec2ee2a25 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Tue, 23 Nov 2021 20:00:38 -0500 Subject: [PATCH 2/3] [maven] Bump maven to 3.8.4 --- core/.mvn/wrapper/maven-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/.mvn/wrapper/maven-wrapper.properties b/core/.mvn/wrapper/maven-wrapper.properties index ffdc10e59f..598fb34156 100644 --- a/core/.mvn/wrapper/maven-wrapper.properties +++ b/core/.mvn/wrapper/maven-wrapper.properties @@ -1,2 +1,2 @@ -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar From 9a25427ffc51fe5af61ab9e37335423d8533ca76 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Tue, 23 Nov 2021 20:29:16 -0500 Subject: [PATCH 3/3] [ci] Update copyright date --- core/.mvn/extensions.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/.mvn/extensions.xml b/core/.mvn/extensions.xml index 5502251915..a81648f479 100644 --- a/core/.mvn/extensions.xml +++ b/core/.mvn/extensions.xml @@ -1,7 +1,7 @@