From 9d15b8cd168ab9ae272f1d011bbcdcb0d9f2d051 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Tue, 7 Nov 2023 21:19:57 -0500 Subject: [PATCH 1/7] [pom] Prepare for new site distribution --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index a275ead3..985d090e 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ http://github.com/mybatis/migrations - scm:git:ssh://github.com/mybatis/migrations.git + scm:git:ssh://git@github.com/mybatis/migrations.git scm:git:ssh://git@github.com/mybatis/migrations.git HEAD @@ -55,9 +55,9 @@ - gh-pages + gh-pages-scm Mybatis GitHub Pages - git:ssh://git@github.com/mybatis/migrations.git?gh-pages# + scm:git:ssh://git@github.com/mybatis/migrations.git From 4c28b01c136951fa79fa49d2d4fa052f89804ac6 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Tue, 7 Nov 2023 21:20:18 -0500 Subject: [PATCH 2/7] [mvn] Update maven wrapper --- .mvn/extensions.xml | 17 ----------------- .mvn/settings.xml | 17 ----------------- 2 files changed, 34 deletions(-) diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index c4093fbc..6463f95c 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -1,21 +1,4 @@ - fr.jcgay.maven diff --git a/.mvn/settings.xml b/.mvn/settings.xml index 26fda808..ace67a1c 100644 --- a/.mvn/settings.xml +++ b/.mvn/settings.xml @@ -1,21 +1,4 @@ - From 4f6aadc3171fcdcee6b940c6a9bdc38e11f3c321 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Tue, 7 Nov 2023 21:28:08 -0500 Subject: [PATCH 3/7] [license] Update license plugin --- .mvn/extensions.xml | 17 +++++++++++++++++ .mvn/settings.xml | 17 +++++++++++++++++ pom.xml | 12 ++++++++---- 3 files changed, 42 insertions(+), 4 deletions(-) diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 6463f95c..c4093fbc 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -1,4 +1,21 @@ + fr.jcgay.maven diff --git a/.mvn/settings.xml b/.mvn/settings.xml index ace67a1c..26fda808 100644 --- a/.mvn/settings.xml +++ b/.mvn/settings.xml @@ -1,4 +1,21 @@ + diff --git a/pom.xml b/pom.xml index 985d090e..04ca73fb 100644 --- a/pom.xml +++ b/pom.xml @@ -173,10 +173,14 @@ com.mycila license-maven-plugin - - **/template_* - **/README - + + + + **/template_* + **/README + + + From 2dcc9530e51174463facdec0c660ef70dfba3c75 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Tue, 7 Nov 2023 21:30:02 -0500 Subject: [PATCH 4/7] [pom] Templates are ok with license so let that be - previously uncaught at parent 38 --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 04ca73fb..aee1433e 100644 --- a/pom.xml +++ b/pom.xml @@ -176,7 +176,6 @@ - **/template_* **/README From 7c0d3a97d6bef9ede114ac1fde9420ebe50cd0e7 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Tue, 7 Nov 2023 21:32:36 -0500 Subject: [PATCH 5/7] [pom] Ignore other readme --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index aee1433e..ca4705fc 100644 --- a/pom.xml +++ b/pom.xml @@ -176,6 +176,7 @@ + **/template_README **/README From 8deec155cf562112ac73c96aac87d5a8f3e9bdc8 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Tue, 7 Nov 2023 21:33:29 -0500 Subject: [PATCH 6/7] [GHA] Update actions --- .github/workflows/ci.yaml | 26 +++++--------------------- .github/workflows/coveralls.yaml | 20 ++------------------ .github/workflows/sonar.yaml | 16 ---------------- .github/workflows/sonatype.yaml | 16 ---------------- 4 files changed, 7 insertions(+), 71 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3970cf22..b14431cd 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,38 +1,22 @@ -# -# Copyright 2010-2020 the original author or authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - name: Java CI -on: [push, pull_request] +on: [workflow_dispatch, push, pull_request] jobs: test: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, macOS-latest, windows-latest] - java: [11, 17, 21] - distribution: ['zulu'] + os: [ubuntu-latest, macos-latest, windows-latest] + java: [11, 17, 21, 22-ea] + distribution: ['temurin'] fail-fast: false max-parallel: 4 name: Test JDK ${{ matrix.java }}, ${{ matrix.os }} steps: - uses: actions/checkout@v4 - - name: Set up JDK + - name: Set up JDK ${{ matrix.java }} ${{ matrix.distribution }} uses: actions/setup-java@v3 with: java-version: ${{ matrix.java }} diff --git a/.github/workflows/coveralls.yaml b/.github/workflows/coveralls.yaml index 54a74235..03df1ede 100644 --- a/.github/workflows/coveralls.yaml +++ b/.github/workflows/coveralls.yaml @@ -1,19 +1,3 @@ -# -# Copyright 2016-2020 the original author or authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - name: Coveralls on: [push, pull_request] @@ -31,12 +15,12 @@ jobs: distribution: zulu - name: Report Coverage to Coveralls for Pull Requests if: github.event_name == 'pull_request' - run: ./mvnw -B -V test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER + run: ./mvnw -B -V test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER --no-transfer-progress env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} PR_NUMBER: ${{ github.event.number }} - name: Report Coverage to Coveralls for General Push if: github.event_name == 'push' - run: ./mvnw -B -V test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github + run: ./mvnw -B -V test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github --no-transfer-progress env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml index 62217691..7452197d 100644 --- a/.github/workflows/sonar.yaml +++ b/.github/workflows/sonar.yaml @@ -1,19 +1,3 @@ -# -# Copyright 2010-2020 the original author or authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - name: SonarCloud on: diff --git a/.github/workflows/sonatype.yaml b/.github/workflows/sonatype.yaml index d7b30fd4..46800b48 100644 --- a/.github/workflows/sonatype.yaml +++ b/.github/workflows/sonatype.yaml @@ -1,19 +1,3 @@ -# -# Copyright 2010-2020 the original author or authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - name: Sonatype on: From 387dc7ac2cf6975bd84a69f4684150883f084b6c Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Tue, 7 Nov 2023 21:39:04 -0500 Subject: [PATCH 7/7] [pom] Sort order of excludes --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ca4705fc..95ba0a5d 100644 --- a/pom.xml +++ b/pom.xml @@ -176,8 +176,8 @@ - **/template_README **/README + **/template_README