From a9b2545ef35f87de6de65efb85271b5ece7e74ad Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Thu, 2 Nov 2023 19:59:36 -0400 Subject: [PATCH 01/11] [site] Use secure mybatis logo and use the blog --- src/site/site.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/site/site.xml b/src/site/site.xml index 0ab3c0f19..cb4001cd6 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -1,7 +1,7 @@ - 3.5.0 + 3.9.5 UTF-8 @@ -1128,8 +1128,7 @@ format - - ${basedir}/format.xml + ${project.basedir}/format.xml @@ -1302,8 +1301,7 @@ license - - ${basedir}/LICENSE_HEADER + ${project.basedir}/LICENSE_HEADER From 832fd637b981d71e31df2310c36c34406dad5698 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sat, 4 Nov 2023 10:57:21 -0400 Subject: [PATCH 03/11] [pom] Name additionalOption in javadoc appropriately maven doesn't really care but its about consistency. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 82ed58195..c5a81a14d 100644 --- a/pom.xml +++ b/pom.xml @@ -686,7 +686,7 @@ ${javadoc.plugin} - + ${html.javadocType} From 3e3f31e5af76eb03620abfafed6443fe741ea27a Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sat, 4 Nov 2023 10:57:33 -0400 Subject: [PATCH 04/11] [pom] Run javadocs in legacy mode (ie no modular) --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index c5a81a14d..22ad9446f 100644 --- a/pom.xml +++ b/pom.xml @@ -703,6 +703,7 @@ ${maven.compiler.release} + true true true From ead3cdc152334fb808a371d3bdcb67adf66e429d Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sat, 4 Nov 2023 10:57:49 -0400 Subject: [PATCH 05/11] [pom] Drop java 20 in ogsi and add java 22 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 22ad9446f..a717caabb 100644 --- a/pom.xml +++ b/pom.xml @@ -534,7 +534,7 @@ <_nouses>true - <_removeheaders>JAVA_1_8_HOME,JAVA_8_HOME,JAVA_11_HOME,JAVA_17_HOME,JAVA_20_HOME,JAVA_21_HOME + <_removeheaders>JAVA_1_8_HOME,JAVA_8_HOME,JAVA_11_HOME,JAVA_17_HOME,JAVA_21_HOME,JAVA_22_HOME ${osgi.symbolicName} ${osgi.export} ${osgi.private} From 2b1da36adc8e992a991fc8c44d8067fcb2f2b639 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sat, 4 Nov 2023 10:58:02 -0400 Subject: [PATCH 06/11] [pom] Prohibit legacy license usage --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index a717caabb..cc5a802ec 100644 --- a/pom.xml +++ b/pom.xml @@ -462,6 +462,7 @@ + true XML_STYLE From 1e1a028b6c94d6ea39e29efffee25dd91876e736 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sat, 4 Nov 2023 11:00:10 -0400 Subject: [PATCH 07/11] [pom] Remove license plugin from m2e configuration as now part of plugin --- pom.xml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/pom.xml b/pom.xml index cc5a802ec..f786cb6cd 100644 --- a/pom.xml +++ b/pom.xml @@ -1348,20 +1348,6 @@ - - - - com.mycila - license-maven-plugin - [${license.version},) - - format - - - - - - From bd702f19044400f92cecee02601eb589d8bdeb55 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sat, 4 Nov 2023 11:08:25 -0400 Subject: [PATCH 08/11] [pom] Adjust m2e usage flags --- pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f786cb6cd..2c3a541ab 100644 --- a/pom.xml +++ b/pom.xml @@ -1333,8 +1333,9 @@ - ${java.test.version} - ${java.test.release.version} + ${java.test.version} + ${java.test.release.version} + ${java.test.release.version} From dec2c510f13097b13c9f5b3da0177fd4af79665b Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sat, 4 Nov 2023 11:12:51 -0400 Subject: [PATCH 09/11] [pom] Fill out taglist fully --- pom.xml | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2c3a541ab..a2fe1e5af 100644 --- a/pom.xml +++ b/pom.xml @@ -1078,15 +1078,37 @@ + + FIXME Work + + + fixme + ignoreCase + + + @fixme + ignoreCase + + + Todo Work - TODO + todo + ignoreCase + + + @todo ignoreCase + + + + Deprecated Work + - FIXME + @deprecated ignoreCase From 99673910e22ca2955a9068366c9d5c674b0ac891 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sat, 4 Nov 2023 11:18:16 -0400 Subject: [PATCH 10/11] [pom] Sort prohibit legacy use flag --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a2fe1e5af..dcedd2a2f 100644 --- a/pom.xml +++ b/pom.xml @@ -462,11 +462,11 @@ - true XML_STYLE + true From a6598fbe480bb7f53b9826449420604db57cbc70 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sat, 4 Nov 2023 11:22:10 -0400 Subject: [PATCH 11/11] [GHA] Update actions --- .github/workflows/ci.yaml | 26 +++++--------------------- .github/workflows/sonar.yaml | 18 +----------------- .github/workflows/sonatype.yaml | 18 +----------------- 3 files changed, 7 insertions(+), 55 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8c51ff2cd..b14431cd5 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.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 -# -# https://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: [workflow_dispatch, push, pull_request] @@ -23,19 +7,19 @@ jobs: 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 }} distribution: ${{ matrix.distribution }} - name: Test with Maven - run: ./mvnw test -B -D"license.skip=true" + run: ./mvnw test -B -V --no-transfer-progress -D"license.skip=true" diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml index 5f65d608d..445d77231 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 -# -# https://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: @@ -36,7 +20,7 @@ jobs: java-version: 21 distribution: zulu - name: Analyze with SonarCloud - run: ./mvnw verify sonar:sonar -B -Dsonar.projectKey=mybatis_parent -Dsonar.organization=mybatis -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN -Dlicense.skip=true + run: ./mvnw verify sonar:sonar -B -Dsonar.projectKey=mybatis_parent -Dsonar.organization=mybatis -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN -Dlicense.skip=true --no-transfer-progress env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} diff --git a/.github/workflows/sonatype.yaml b/.github/workflows/sonatype.yaml index 7ca992c14..46800b489 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 -# -# https://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: @@ -33,7 +17,7 @@ jobs: java-version: 21 distribution: zulu - name: Deploy to Sonatype - run: ./mvnw deploy -DskipTests -B --settings ./.mvn/settings.xml -Dlicense.skip=true + run: ./mvnw deploy -DskipTests -B -V --no-transfer-progress --settings ./.mvn/settings.xml -Dlicense.skip=true env: CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }} CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}