From 064083888d08cc8a0a6651bbe2ec2b1b361d64ed Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 4 Feb 2024 14:14:46 -0500 Subject: [PATCH 1/4] [license] Cleanup license --- LICENSE | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/LICENSE b/LICENSE index 8f71f43fe..7e835b2fa 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ Apache License Version 2.0, January 2004 - http://www.apache.org/licenses/ + https://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION @@ -178,7 +178,7 @@ APPENDIX: How to apply the Apache License to your work. To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" + boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a @@ -186,13 +186,13 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright {yyyy} {name of copyright owner} + Copyright [yyyy] [name of copyright owner] 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 + 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, From d06cea438cacf42f47995a2082ecd8fe8927e5a0 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 4 Feb 2024 14:14:55 -0500 Subject: [PATCH 2/4] [renovate] Update config --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index 39a2b6e9a..5db72dd6a 100644 --- a/renovate.json +++ b/renovate.json @@ -1,6 +1,6 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ - "config:base" + "config:recommended" ] } From cf754c9ca5531ae72233211819326dd0c80f0ec9 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 11 Feb 2024 14:26:18 -0500 Subject: [PATCH 3/4] [GHA] Update sonar.login to sonar.token --- .github/workflows/sonar.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml index a02aee037..c994c9151 100644 --- a/.github/workflows/sonar.yaml +++ b/.github/workflows/sonar.yaml @@ -20,7 +20,7 @@ jobs: java-version: 21 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 --no-transfer-progress + run: ./mvnw verify jacoco:report sonar:sonar -B -Dsonar.projectKey=mybatis_spring-boot-starter -Dsonar.organization=mybatis -Dsonar.host.url=https://sonarcloud.io -Dsonar.token=$SONAR_TOKEN -Dlicense.skip=true --no-transfer-progress env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} From 2f0ccc4e50780d44f69e3e4a091ec7be80425d93 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 11 Feb 2024 17:02:03 -0500 Subject: [PATCH 4/4] [pom] Fix top url back to mybatis org --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cd9061cb1..62ae3de1b 100644 --- a/pom.xml +++ b/pom.xml @@ -17,6 +17,7 @@ --> + 4.0.0 @@ -33,7 +34,7 @@ mybatis-spring-boot Spring Boot Support for MyBatis - https://github.com/mybatis/spring-boot-starter/ + https://www.mybatis.org/spring-boot-starter/ 2015