From f679b96edf18419c01d6ce56ae95576ff807d349 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 1 Aug 2022 21:02:34 -0400 Subject: [PATCH 01/12] [license] Rename from 'license.txt' to 'LICENSE_HEADER' --- license.txt => LICENSE_HEADER | 0 mybatis-spring-boot-autoconfigure/{license.txt => LICENSE_HEADER} | 0 mybatis-spring-boot-samples/{license.txt => LICENSE_HEADER} | 0 .../{license.txt => LICENSE_HEADER} | 0 .../{license.txt => LICENSE_HEADER} | 0 .../{license.txt => LICENSE_HEADER} | 0 .../{license.txt => LICENSE_HEADER} | 0 .../{license.txt => LICENSE_HEADER} | 0 .../{license.txt => LICENSE_HEADER} | 0 .../{license.txt => LICENSE_HEADER} | 0 .../{license.txt => LICENSE_HEADER} | 0 .../{license.txt => LICENSE_HEADER} | 0 .../{license.txt => LICENSE_HEADER} | 0 .../{license.txt => LICENSE_HEADER} | 0 mybatis-spring-boot-starter-test/{license.txt => LICENSE_HEADER} | 0 mybatis-spring-boot-starter/{license.txt => LICENSE_HEADER} | 0 .../{license.txt => LICENSE_HEADER} | 0 17 files changed, 0 insertions(+), 0 deletions(-) rename license.txt => LICENSE_HEADER (100%) rename mybatis-spring-boot-autoconfigure/{license.txt => LICENSE_HEADER} (100%) rename mybatis-spring-boot-samples/{license.txt => LICENSE_HEADER} (100%) rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/{license.txt => LICENSE_HEADER} (100%) rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/{license.txt => LICENSE_HEADER} (100%) rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/{license.txt => LICENSE_HEADER} (100%) rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/{license.txt => LICENSE_HEADER} (100%) rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/{license.txt => LICENSE_HEADER} (100%) rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/{license.txt => LICENSE_HEADER} (100%) rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/{license.txt => LICENSE_HEADER} (100%) rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/{license.txt => LICENSE_HEADER} (100%) rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/{license.txt => LICENSE_HEADER} (100%) rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/{license.txt => LICENSE_HEADER} (100%) rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/{license.txt => LICENSE_HEADER} (100%) rename mybatis-spring-boot-starter-test/{license.txt => LICENSE_HEADER} (100%) rename mybatis-spring-boot-starter/{license.txt => LICENSE_HEADER} (100%) rename mybatis-spring-boot-test-autoconfigure/{license.txt => LICENSE_HEADER} (100%) diff --git a/license.txt b/LICENSE_HEADER similarity index 100% rename from license.txt rename to LICENSE_HEADER diff --git a/mybatis-spring-boot-autoconfigure/license.txt b/mybatis-spring-boot-autoconfigure/LICENSE_HEADER similarity index 100% rename from mybatis-spring-boot-autoconfigure/license.txt rename to mybatis-spring-boot-autoconfigure/LICENSE_HEADER diff --git a/mybatis-spring-boot-samples/license.txt b/mybatis-spring-boot-samples/LICENSE_HEADER similarity index 100% rename from mybatis-spring-boot-samples/license.txt rename to mybatis-spring-boot-samples/LICENSE_HEADER diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/license.txt b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/LICENSE_HEADER similarity index 100% rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/license.txt rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/LICENSE_HEADER diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/license.txt b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/LICENSE_HEADER similarity index 100% rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/license.txt rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/LICENSE_HEADER diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/license.txt b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/LICENSE_HEADER similarity index 100% rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/license.txt rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/LICENSE_HEADER diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/license.txt b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/LICENSE_HEADER similarity index 100% rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/license.txt rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/LICENSE_HEADER diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/license.txt b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/LICENSE_HEADER similarity index 100% rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/license.txt rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/LICENSE_HEADER diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/license.txt b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/LICENSE_HEADER similarity index 100% rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/license.txt rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/LICENSE_HEADER diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/license.txt b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/LICENSE_HEADER similarity index 100% rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/license.txt rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/LICENSE_HEADER diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/license.txt b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/LICENSE_HEADER similarity index 100% rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/license.txt rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/LICENSE_HEADER diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/license.txt b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/LICENSE_HEADER similarity index 100% rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/license.txt rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/LICENSE_HEADER diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/license.txt b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/LICENSE_HEADER similarity index 100% rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/license.txt rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/LICENSE_HEADER diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/license.txt b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/LICENSE_HEADER similarity index 100% rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/license.txt rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/LICENSE_HEADER diff --git a/mybatis-spring-boot-starter-test/license.txt b/mybatis-spring-boot-starter-test/LICENSE_HEADER similarity index 100% rename from mybatis-spring-boot-starter-test/license.txt rename to mybatis-spring-boot-starter-test/LICENSE_HEADER diff --git a/mybatis-spring-boot-starter/license.txt b/mybatis-spring-boot-starter/LICENSE_HEADER similarity index 100% rename from mybatis-spring-boot-starter/license.txt rename to mybatis-spring-boot-starter/LICENSE_HEADER diff --git a/mybatis-spring-boot-test-autoconfigure/license.txt b/mybatis-spring-boot-test-autoconfigure/LICENSE_HEADER similarity index 100% rename from mybatis-spring-boot-test-autoconfigure/license.txt rename to mybatis-spring-boot-test-autoconfigure/LICENSE_HEADER From a42bbbdf60e610f2d043c9baf4cff7e64a578e0d Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sat, 13 Aug 2022 15:36:31 -0400 Subject: [PATCH 02/12] [github] Goodbye dependabot, you served us well --- .github/dependabot.yml | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index 779a1888..00000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,33 +0,0 @@ -# -# 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. -# - -version: 2 -updates: -- package-ecosystem: github-actions - directory: "/" - schedule: - interval: daily -- package-ecosystem: maven - directory: "/" - schedule: - interval: daily - open-pull-requests-limit: 10 - labels: - - dependencies - ignore: - - dependency-name: org.apache.tomcat:tomcat - versions: - - "> 9.1.0" From 979d0fba4935f8eb1de7fff0242023cca9a1f4e5 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Fri, 26 Aug 2022 21:34:16 -0400 Subject: [PATCH 03/12] [github] Update builder nodes --- .github/workflows/ci.yaml | 2 +- .github/workflows/sonar.yaml | 2 +- .github/workflows/sonatype.yaml | 2 +- .github/workflows/support.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 16f3c218..79cfcfdd 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -24,7 +24,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macOS-latest, windows-latest] - java: [8, 11, 17, 18, 19-ea] + java: [11, 17, 18, 19-ea] distribution: ['zulu'] fail-fast: false max-parallel: 5 diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml index 2fd8ce60..b0dab7eb 100644 --- a/.github/workflows/sonar.yaml +++ b/.github/workflows/sonar.yaml @@ -33,7 +33,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: 11 + java-version: 17 distribution: zulu - name: Analyze with SonarCloud run: ./mvnw verify jacoco:report sonar:sonar -B -Dsonar.projectKey=mybatis_spring-boot-starter -Dsonar.organization=mybatis -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN -Dlicense.skip=true diff --git a/.github/workflows/sonatype.yaml b/.github/workflows/sonatype.yaml index 4418c177..fa4a4a7f 100644 --- a/.github/workflows/sonatype.yaml +++ b/.github/workflows/sonatype.yaml @@ -30,7 +30,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: 11 + java-version: 17 distribution: zulu - name: Deploy to Sonatype run: ./mvnw deploy -DskipTests -B --settings ./.mvn/settings.xml -Dlicense.skip=true diff --git a/.github/workflows/support.yaml b/.github/workflows/support.yaml index 0836cd9f..5eea8208 100644 --- a/.github/workflows/support.yaml +++ b/.github/workflows/support.yaml @@ -24,7 +24,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macOS-latest] - java: [8, 11, 17, 18, 19-ea] + java: [11, 17, 18, 19-ea] distribution: ['zulu'] fail-fast: false max-parallel: 5 From 539d9378bca0c147b6c6bbc1ae3385498f89012a Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Fri, 26 Aug 2022 21:34:28 -0400 Subject: [PATCH 04/12] [pom] Bump mybatis parent to 35 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 854cac84..0071c5cf 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.mybatis mybatis-parent - 34 + 35 From 7a69b2bf354330c01fa051f23309231cefd36f78 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Fri, 26 Aug 2022 21:34:41 -0400 Subject: [PATCH 05/12] [pom] Change travis ci to github actions in ci management --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 0071c5cf..dbef975e 100644 --- a/pom.xml +++ b/pom.xml @@ -55,8 +55,8 @@ https://github.com/mybatis/spring-boot-starter/issues - Travis CI - https://travis-ci.org/mybatis/spring-boot-starter + GitHub Actions + https://github.com/mybatis/spring-boot-starter/actions From c614e300be7bc26141e3746eedab22f5a94f5b0f Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Fri, 26 Aug 2022 21:34:53 -0400 Subject: [PATCH 06/12] [secure] Use secure img shields --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bf7550b0..a70b12a6 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![Coverage Status](https://coveralls.io/repos/github/mybatis/spring-boot-starter/badge.svg?branch=master)](https://coveralls.io/github/mybatis/spring-boot-starter?branch=master) [![Maven central](https://maven-badges.herokuapp.com/maven-central/org.mybatis.spring.boot/mybatis-spring-boot/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.mybatis.spring.boot/mybatis-spring-boot) [![Sonatype Nexus (Snapshots)](https://img.shields.io/nexus/s/https/oss.sonatype.org/org.mybatis.spring.boot/mybatis-spring-boot.svg)](https://oss.sonatype.org/content/repositories/snapshots/org/mybatis/spring/boot/mybatis-spring-boot/) -[![License](http://img.shields.io/:license-apache-brightgreen.svg)](http://www.apache.org/licenses/LICENSE-2.0.html) +[![License](https://img.shields.io/:license-apache-brightgreen.svg)](https://www.apache.org/licenses/LICENSE-2.0.html) ![mybatis-spring](http://mybatis.github.io/images/mybatis-logo.png) From c7f9ab928c6d5399a0050414d63a5bfbcbc3948e Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Fri, 26 Aug 2022 21:36:57 -0400 Subject: [PATCH 07/12] [pom] Use secure maven xsd --- mybatis-spring-boot-autoconfigure/pom.xml | 2 +- .../mybatis-spring-boot-sample-annotation/pom.xml | 2 +- .../mybatis-spring-boot-sample-freemarker-legacy/pom.xml | 2 +- .../mybatis-spring-boot-sample-freemarker/pom.xml | 2 +- .../mybatis-spring-boot-sample-groovy/pom.xml | 2 +- .../mybatis-spring-boot-sample-kotlin/pom.xml | 2 +- .../mybatis-spring-boot-sample-thymeleaf/pom.xml | 2 +- .../mybatis-spring-boot-sample-velocity-legacy/pom.xml | 2 +- .../mybatis-spring-boot-sample-velocity/pom.xml | 2 +- .../mybatis-spring-boot-sample-war/pom.xml | 2 +- .../mybatis-spring-boot-sample-web/pom.xml | 2 +- .../mybatis-spring-boot-sample-xml/pom.xml | 2 +- mybatis-spring-boot-samples/pom.xml | 2 +- mybatis-spring-boot-starter-test/pom.xml | 2 +- mybatis-spring-boot-starter/pom.xml | 2 +- mybatis-spring-boot-test-autoconfigure/pom.xml | 2 +- pom.xml | 4 ++-- 17 files changed, 18 insertions(+), 18 deletions(-) diff --git a/mybatis-spring-boot-autoconfigure/pom.xml b/mybatis-spring-boot-autoconfigure/pom.xml index 15a037cf..46043caf 100644 --- a/mybatis-spring-boot-autoconfigure/pom.xml +++ b/mybatis-spring-boot-autoconfigure/pom.xml @@ -16,7 +16,7 @@ limitations under the License. --> - + 4.0.0 org.mybatis.spring.boot diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/pom.xml b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/pom.xml index 892d2fc0..e29b7098 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/pom.xml +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/pom.xml @@ -16,7 +16,7 @@ limitations under the License. --> - + 4.0.0 org.mybatis.spring.boot diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/pom.xml b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/pom.xml index f31390ca..7a46ca1a 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/pom.xml +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/pom.xml @@ -16,7 +16,7 @@ limitations under the License. --> - + 4.0.0 org.mybatis.spring.boot diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/pom.xml b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/pom.xml index 445e8998..6c33ee20 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/pom.xml +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/pom.xml @@ -16,7 +16,7 @@ limitations under the License. --> - + 4.0.0 org.mybatis.spring.boot diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/pom.xml b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/pom.xml index 1dab85e1..a78a23a5 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/pom.xml +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/pom.xml @@ -16,7 +16,7 @@ limitations under the License. --> - + 4.0.0 org.mybatis.spring.boot diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/pom.xml b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/pom.xml index 22517e13..4adccbb4 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/pom.xml +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/pom.xml @@ -16,7 +16,7 @@ limitations under the License. --> - + 4.0.0 org.mybatis.spring.boot diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/pom.xml b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/pom.xml index d43a1916..43086842 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/pom.xml +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/pom.xml @@ -16,7 +16,7 @@ limitations under the License. --> - + 4.0.0 org.mybatis.spring.boot diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/pom.xml b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/pom.xml index a216d208..246f0a99 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/pom.xml +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/pom.xml @@ -16,7 +16,7 @@ limitations under the License. --> - + 4.0.0 org.mybatis.spring.boot diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/pom.xml b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/pom.xml index 89bceb68..5184097e 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/pom.xml +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/pom.xml @@ -16,7 +16,7 @@ limitations under the License. --> - + 4.0.0 org.mybatis.spring.boot diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/pom.xml b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/pom.xml index ea26e81b..ec1b2d7e 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/pom.xml +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/pom.xml @@ -16,7 +16,7 @@ limitations under the License. --> - + 4.0.0 org.mybatis.spring.boot diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/pom.xml b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/pom.xml index 42913bd3..486928b1 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/pom.xml +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/pom.xml @@ -16,7 +16,7 @@ limitations under the License. --> - + 4.0.0 org.mybatis.spring.boot diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/pom.xml b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/pom.xml index 25cd6a54..488efb7c 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/pom.xml +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/pom.xml @@ -16,7 +16,7 @@ limitations under the License. --> - + 4.0.0 org.mybatis.spring.boot diff --git a/mybatis-spring-boot-samples/pom.xml b/mybatis-spring-boot-samples/pom.xml index 71b47160..fea2725c 100644 --- a/mybatis-spring-boot-samples/pom.xml +++ b/mybatis-spring-boot-samples/pom.xml @@ -16,7 +16,7 @@ limitations under the License. --> - + 4.0.0 org.mybatis.spring.boot diff --git a/mybatis-spring-boot-starter-test/pom.xml b/mybatis-spring-boot-starter-test/pom.xml index c3be0aa8..84bb7d70 100644 --- a/mybatis-spring-boot-starter-test/pom.xml +++ b/mybatis-spring-boot-starter-test/pom.xml @@ -16,7 +16,7 @@ limitations under the License. --> - + 4.0.0 mybatis-spring-boot diff --git a/mybatis-spring-boot-starter/pom.xml b/mybatis-spring-boot-starter/pom.xml index f56bd36e..d7fe51a9 100644 --- a/mybatis-spring-boot-starter/pom.xml +++ b/mybatis-spring-boot-starter/pom.xml @@ -16,7 +16,7 @@ limitations under the License. --> - + 4.0.0 org.mybatis.spring.boot diff --git a/mybatis-spring-boot-test-autoconfigure/pom.xml b/mybatis-spring-boot-test-autoconfigure/pom.xml index 57726ad1..59009929 100644 --- a/mybatis-spring-boot-test-autoconfigure/pom.xml +++ b/mybatis-spring-boot-test-autoconfigure/pom.xml @@ -16,7 +16,7 @@ limitations under the License. --> - + 4.0.0 mybatis-spring-boot diff --git a/pom.xml b/pom.xml index dbef975e..f2717e04 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 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 + 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, @@ -16,7 +16,7 @@ limitations under the License. --> - + 4.0.0 From 9353b060362f308dbc8c7a7cfffee5c2bdd82db8 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Fri, 26 Aug 2022 21:54:41 -0400 Subject: [PATCH 08/12] [secure] Use secure site --- .mvn/extensions.xml | 2 +- .mvn/settings.xml | 4 ++-- LICENSE_HEADER | 2 +- format.xml | 4 ++-- mybatis-spring-boot-autoconfigure/LICENSE_HEADER | 2 +- mybatis-spring-boot-autoconfigure/format.xml | 2 +- mybatis-spring-boot-autoconfigure/pom.xml | 2 +- .../autoconfigure/ConfigurationCustomizer.java | 5 +++-- .../autoconfigure/MybatisAutoConfiguration.java | 10 ++++------ ...sDependsOnDatabaseInitializationDetector.java | 3 ++- .../MybatisLanguageDriverAutoConfiguration.java | 5 +++-- .../boot/autoconfigure/MybatisProperties.java | 2 +- .../spring/boot/autoconfigure/SpringBootVFS.java | 3 ++- .../SqlSessionFactoryBeanCustomizer.java | 3 ++- .../spring/boot/autoconfigure/package-info.java | 2 +- .../src/main/resources/META-INF/spring.factories | 16 ++++++++++++++++ .../src/site/resources/css/site.css | 2 +- .../src/site/resources/es/css/site.css | 2 +- .../src/site/resources/ja/css/site.css | 2 +- .../src/site/resources/ko/css/site.css | 2 +- .../src/site/resources/zh/css/site.css | 2 +- .../src/site/site.xml | 2 +- .../src/site/site_zh.xml | 2 +- .../java/com/example/mapper/DateTimeMapper.java | 2 +- .../AdditionalConfigurationMetadataTest.java | 3 ++- .../MybatisAutoConfigurationTest.java | 2 +- ...batisLanguageDriverAutoConfigurationTest.java | 2 +- .../autoconfigure/MybatisPropertiesTest.java | 2 +- .../TestAutoConfigurationPackage.java | 4 ++-- .../TestAutoConfigurationPackageRegistrar.java | 2 +- .../spring/boot/autoconfigure/domain/City.java | 2 +- .../spring/boot/autoconfigure/domain/Domain.java | 2 +- .../spring/boot/autoconfigure/domain/Name.java | 2 +- .../handler/AtomicNumberTypeHandler.java | 2 +- .../autoconfigure/handler/DummyTypeHandler.java | 2 +- .../boot/autoconfigure/mapper/CityMapper.java | 2 +- .../autoconfigure/repository/CityMapperImpl.java | 2 +- ...267\343\203\206\343\202\243\343\203\274.java" | 2 +- .../db/changelog/db.changelog-city.yaml | 2 +- .../db/changelog/db.changelog-master.yaml | 2 +- .../db/changelog/db.changelog-override.sql | 2 +- .../db/changelog/db.changelog-override.xml | 2 +- .../src/test/resources/db/migration/V1__init.sql | 2 +- .../src/test/resources/logback-test.xml | 2 +- .../resources/mybatis-config-settings-only.xml | 2 +- .../src/test/resources/mybatis-config.xml | 2 +- .../src/test/resources/mybatis-config2.xml | 2 +- .../boot/autoconfigure/repository/CityMapper.xml | 2 +- mybatis-spring-boot-samples/LICENSE_HEADER | 2 +- mybatis-spring-boot-samples/format.xml | 2 +- .../LICENSE_HEADER | 2 +- .../format.xml | 2 +- .../pom.xml | 2 +- .../annotation/SampleAnnotationApplication.java | 2 +- .../sample/mybatis/annotation/domain/City.java | 2 +- .../mybatis/annotation/mapper/CityMapper.java | 2 +- .../src/main/resources/application.properties | 2 +- .../src/main/resources/data.sql | 2 +- .../src/main/resources/schema.sql | 2 +- .../annotation/CaptureSystemOutput.java | 12 ++---------- .../SampleMybatisApplicationMainTest.java | 2 +- .../annotation/SampleMybatisApplicationTest.java | 2 +- .../annotation/mapper/CityMapperTest.java | 5 +++-- .../annotation/mapper/MapperTestApplication.java | 5 +++-- .../LICENSE_HEADER | 2 +- .../format.xml | 2 +- .../pom.xml | 2 +- .../legacy/SampleFreeMarkerApplication.java | 2 +- .../mybatis/freemarker/legacy/domain/City.java | 2 +- .../freemarker/legacy/mapper/CityMapper.java | 2 +- .../src/main/resources/application.properties | 2 +- .../src/main/resources/data.sql | 2 +- .../resources/mappers/CityMapper-findByState.ftl | 2 +- .../src/main/resources/mappers/CityMapper.xml | 2 +- .../src/main/resources/schema.sql | 2 +- .../freemarker/legacy/CaptureSystemOutput.java | 12 ++---------- .../legacy/SampleMybatisApplicationMainTest.java | 2 +- .../legacy/SampleMybatisApplicationTest.java | 2 +- .../freemarker/legacy/mapper/CityMapperTest.java | 2 +- .../legacy/mapper/MapperTestApplication.java | 2 +- .../LICENSE_HEADER | 2 +- .../format.xml | 2 +- .../pom.xml | 2 +- .../freemarker/SampleFreeMarkerApplication.java | 2 +- .../sample/mybatis/freemarker/domain/City.java | 2 +- .../mybatis/freemarker/mapper/CityMapper.java | 2 +- .../src/main/resources/application.properties | 2 +- .../src/main/resources/data.sql | 2 +- .../mappers/CityMapper-findByCountry.ftl | 2 +- .../resources/mappers/CityMapper-findByState.ftl | 2 +- .../src/main/resources/mappers/CityMapper.xml | 2 +- .../src/main/resources/schema.sql | 2 +- .../freemarker/CaptureSystemOutput.java | 12 ++---------- .../SampleMybatisApplicationMainTest.java | 2 +- .../freemarker/SampleMybatisApplicationTest.java | 2 +- .../freemarker/mapper/CityMapperTest.java | 2 +- .../freemarker/mapper/MapperTestApplication.java | 2 +- .../LICENSE_HEADER | 2 +- .../mybatis-spring-boot-sample-groovy/format.xml | 2 +- .../mybatis-spring-boot-sample-groovy/pom.xml | 2 +- .../groovy/SampleGroovyApplication.groovy | 2 +- .../sample/mybatis/groovy/domain/City.groovy | 2 +- .../mybatis/groovy/mapper/CityMapper.groovy | 2 +- .../src/main/resources/application.properties | 2 +- .../src/main/resources/data.sql | 2 +- .../src/main/resources/schema.sql | 2 +- .../extensions/groovy/CaptureSystemOutput.groovy | 2 +- .../SampleMybatisApplicationMainTest.groovy | 2 +- .../groovy/SampleMybatisApplicationTest.groovy | 2 +- .../mybatis/groovy/mapper/CityMapperTest.groovy | 2 +- .../groovy/mapper/MapperTestApplication.groovy | 2 +- .../LICENSE_HEADER | 2 +- .../mybatis-spring-boot-sample-kotlin/format.xml | 2 +- .../mybatis-spring-boot-sample-kotlin/pom.xml | 2 +- .../mybatis/kotlin/SampleKotlinApplication.kt | 2 +- .../kotlin/sample/mybatis/kotlin/domain/City.kt | 2 +- .../sample/mybatis/kotlin/mapper/CityMapper.kt | 2 +- .../src/main/resources/application.properties | 2 +- .../src/main/resources/data.sql | 2 +- .../src/main/resources/schema.sql | 2 +- .../extensions/kotlin/CaptureSystemOutput.java | 12 ++---------- .../kotlin/SampleMybatisApplicationMainTest.kt | 2 +- .../kotlin/SampleMybatisApplicationTest.kt | 2 +- .../mybatis/kotlin/mapper/CityMapperTest.kt | 2 +- .../kotlin/mapper/MapperTestApplication.kt | 2 +- .../LICENSE_HEADER | 2 +- .../format.xml | 2 +- .../mybatis-spring-boot-sample-thymeleaf/pom.xml | 2 +- .../thymeleaf/SampleThymeleafApplication.java | 2 +- .../sample/mybatis/thymeleaf/domain/City.java | 2 +- .../mybatis/thymeleaf/mapper/CityMapper.java | 2 +- .../src/main/resources/application.properties | 2 +- .../src/main/resources/data.sql | 2 +- .../mappers/CityMapper-findByCountry.sql | 2 +- .../resources/mappers/CityMapper-findByState.sql | 2 +- .../src/main/resources/mappers/CityMapper.xml | 2 +- .../src/main/resources/schema.sql | 2 +- .../thymeleaf/CaptureSystemOutput.java | 12 ++---------- .../SampleMybatisApplicationMainTest.java | 2 +- .../thymeleaf/SampleMybatisApplicationTest.java | 2 +- .../mybatis/thymeleaf/mapper/CityMapperTest.java | 2 +- .../thymeleaf/mapper/MapperTestApplication.java | 2 +- .../LICENSE_HEADER | 2 +- .../format.xml | 2 +- .../pom.xml | 2 +- .../legacy/SampleVelocityApplication.java | 2 +- .../mybatis/velocity/legacy/domain/City.java | 2 +- .../velocity/legacy/mapper/CityMapper.java | 2 +- .../src/main/resources/application.properties | 2 +- .../src/main/resources/data.sql | 2 +- .../resources/mappers/CityMapper-findByState.vm | 2 +- .../src/main/resources/mappers/CityMapper.xml | 2 +- .../src/main/resources/schema.sql | 2 +- .../velocity/legacy/CaptureSystemOutput.java | 12 ++---------- .../legacy/SampleMybatisApplicationMainTest.java | 2 +- .../legacy/SampleMybatisApplicationTest.java | 2 +- .../velocity/legacy/mapper/CityMapperTest.java | 2 +- .../legacy/mapper/MapperTestApplication.java | 2 +- .../LICENSE_HEADER | 2 +- .../format.xml | 2 +- .../mybatis-spring-boot-sample-velocity/pom.xml | 2 +- .../velocity/SampleVelocityApplication.java | 2 +- .../sample/mybatis/velocity/domain/City.java | 2 +- .../mybatis/velocity/mapper/CityMapper.java | 2 +- .../src/main/resources/application.properties | 2 +- .../src/main/resources/data.sql | 2 +- .../resources/mappers/CityMapper-findByState.vm | 2 +- .../src/main/resources/mappers/CityMapper.xml | 2 +- .../src/main/resources/schema.sql | 2 +- .../extensions/velocity/CaptureSystemOutput.java | 12 ++---------- .../SampleMybatisApplicationMainTest.java | 2 +- .../velocity/SampleMybatisApplicationTest.java | 2 +- .../mybatis/velocity/mapper/CityMapperTest.java | 2 +- .../velocity/mapper/MapperTestApplication.java | 2 +- .../LICENSE_HEADER | 2 +- .../mybatis-spring-boot-sample-war/format.xml | 2 +- .../mybatis-spring-boot-sample-war/pom.xml | 2 +- .../sample/mybatis/war/SampleWebApplication.java | 2 +- .../war/controller/CityRestController.java | 2 +- .../java/sample/mybatis/war/domain/City.java | 2 +- .../sample/mybatis/war/mapper/CityMapper.java | 2 +- .../src/main/resources/application.properties | 2 +- .../src/main/resources/data.sql | 2 +- .../src/main/resources/schema.sql | 2 +- .../mybatis/war/SampleMybatisApplicationIT.java | 2 +- .../war/SampleMybatisApplicationTest.java | 2 +- .../mybatis/war/mapper/CityMapperTest.java | 5 +++-- .../war/mapper/MapperTestApplication.java | 5 +++-- .../LICENSE_HEADER | 2 +- .../mybatis-spring-boot-sample-web/format.xml | 2 +- .../mybatis-spring-boot-sample-web/pom.xml | 2 +- .../sample/mybatis/web/SampleWebApplication.java | 2 +- .../web/controller/CityRestController.java | 2 +- .../java/sample/mybatis/web/domain/City.java | 2 +- .../sample/mybatis/web/mapper/CityMapper.java | 2 +- .../src/main/resources/application.properties | 2 +- .../src/main/resources/data.sql | 2 +- .../src/main/resources/schema.sql | 2 +- .../web/SampleMybatisApplicationTest.java | 2 +- .../mybatis/web/mapper/CityMapperTest.java | 5 +++-- .../web/mapper/MapperTestApplication.java | 5 +++-- .../LICENSE_HEADER | 2 +- .../mybatis-spring-boot-sample-xml/format.xml | 2 +- .../mybatis-spring-boot-sample-xml/pom.xml | 2 +- .../sample/mybatis/xml/SampleXmlApplication.java | 2 +- .../java/sample/mybatis/xml/dao/CityDao.java | 2 +- .../java/sample/mybatis/xml/domain/City.java | 2 +- .../java/sample/mybatis/xml/domain/Hotel.java | 2 +- .../sample/mybatis/xml/mapper/CityMapper.java | 2 +- .../sample/mybatis/xml/mapper/HotelMapper.java | 2 +- .../src/main/resources/application.properties | 2 +- .../src/main/resources/data.sql | 2 +- .../src/main/resources/mybatis-config.xml | 2 +- .../sample/mybatis/xml/mapper/CityMapper.xml | 2 +- .../sample/mybatis/xml/mapper/HotelMapper.xml | 2 +- .../src/main/resources/schema.sql | 2 +- .../java/extensions/xml/CaptureSystemOutput.java | 12 ++---------- .../xml/SampleMybatisApplicationMainTest.java | 2 +- .../xml/SampleMybatisApplicationTest.java | 2 +- .../java/sample/mybatis/xml/dao/CityDaoTest.java | 5 +++-- .../mybatis/xml/dao/DaoTestApplication.java | 5 +++-- .../mybatis/xml/mapper/HotelMapperTest.java | 5 +++-- .../xml/mapper/MapperTestApplication.java | 5 +++-- mybatis-spring-boot-samples/pom.xml | 2 +- mybatis-spring-boot-samples/run_fatjars.sh | 2 +- mybatis-spring-boot-starter-test/LICENSE_HEADER | 2 +- mybatis-spring-boot-starter-test/format.xml | 2 +- mybatis-spring-boot-starter-test/pom.xml | 2 +- mybatis-spring-boot-starter/LICENSE_HEADER | 2 +- mybatis-spring-boot-starter/format.xml | 2 +- mybatis-spring-boot-starter/pom.xml | 2 +- .../LICENSE_HEADER | 2 +- .../format.xml | 2 +- mybatis-spring-boot-test-autoconfigure/pom.xml | 2 +- .../test/autoconfigure/AutoConfigureMybatis.java | 5 +++-- .../boot/test/autoconfigure/MybatisTest.java | 8 ++++++-- .../MybatisTestContextBootstrapper.java | 5 +++-- .../autoconfigure/MybatisTypeExcludeFilter.java | 5 +++-- .../src/main/resources/META-INF/spring.factories | 16 ++++++++++++++++ .../src/site/resources/css/site.css | 2 +- .../src/site/resources/es/css/site.css | 2 +- .../src/site/resources/ja/css/site.css | 2 +- .../src/site/resources/ko/css/site.css | 2 +- .../src/site/resources/zh/css/site.css | 2 +- .../src/site/site.xml | 2 +- .../src/site/site_zh.xml | 2 +- .../test/autoconfigure/ExampleComponent.java | 5 +++-- .../autoconfigure/ExampleMybatisApplication.java | 5 +++-- .../boot/test/autoconfigure/ExampleService.java | 5 +++-- .../MybatisTestCustomFilterIntegrationTest.java | 5 +++-- .../MybatisTestIntegrationTest.java | 3 ++- .../spring/boot/test/autoconfigure/Sample.java | 5 +++-- .../boot/test/autoconfigure/SampleMapper.java | 5 +++-- .../boot/test/autoconfigure/SampleMapper.xml | 2 +- .../spring/boot/test/autoconfigure/schema.sql | 2 +- scripts/get_latest_version.sh | 4 ++-- 256 files changed, 353 insertions(+), 357 deletions(-) diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index dcadaccd..2b1cf2cf 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -7,7 +7,7 @@ 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 + 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, diff --git a/.mvn/settings.xml b/.mvn/settings.xml index 5aefc1dd..d124e9c4 100644 --- a/.mvn/settings.xml +++ b/.mvn/settings.xml @@ -1,13 +1,13 @@ From c08e51836a003d7673967e76149999578dea1895 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Fri, 26 Aug 2022 22:06:37 -0400 Subject: [PATCH 11/12] [pom] Add opens for java.lang wanted this for jdk 17 only but also not sure why it was not showing up before and in general something off with argline as I cannot set it elsewhere. Will look at that more for parent 36 changes as an outstanding issue to address. Its probably related to osgi stuff since I've not run into it elsewhere... --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index f2717e04..9c2934c7 100644 --- a/pom.xml +++ b/pom.xml @@ -73,6 +73,8 @@ 2.1.1 1.0.3 2.7.3 + + -Djdk.attach.allowAttachSelf --add-opens java.base/java.lang=ALL-UNNAMED From 6c2d84088efc1831ecde06026e4adbc48d5efd8c Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Fri, 26 Aug 2022 22:16:32 -0400 Subject: [PATCH 12/12] [pom] Adjustment for argline not wanting to work in old way, move to properties only until more research. --- pom.xml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 9c2934c7..8907a881 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ 1.0.3 2.7.3 - -Djdk.attach.allowAttachSelf --add-opens java.base/java.lang=ALL-UNNAMED + -Djdk.attach.allowAttachSelf --add-opens java.base/java.lang=ALL-UNNAMED -Dfile.encoding=UTF-8 @@ -103,10 +103,6 @@ org.apache.maven.plugins maven-surefire-plugin - - - ${argLine} -Djdk.attach.allowAttachSelf -Dfile.encoding=UTF-8 -