From 5dd4b14f051e1deb5741acf7d04c2bffc7f5e55a Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 4 Feb 2024 14:14:19 -0500 Subject: [PATCH 1/4] [ci] Cleanup license --- LICENSE | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/LICENSE b/LICENSE index 8dada3eda..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,16 +186,17 @@ 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, 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. + From 00b52c38d12825ba22d5d2cf7c3c83d1bb0be037 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 4 Feb 2024 14:14:26 -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 39932d691dbbcc9f417110c4927e1144920346c1 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 11 Feb 2024 14:25:59 -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 8bf969265..e4bf41ac8 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_mybatis-dynamic-sql -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_mybatis-dynamic-sql -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 51c0a020c05f26302e539a2c3be10c390bf1f871 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 11 Feb 2024 16:56:08 -0500 Subject: [PATCH 4/4] [pom] Add missing URL and fix url on scm --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 58b9a5ffe..73ef9ddb7 100644 --- a/pom.xml +++ b/pom.xml @@ -31,12 +31,13 @@ MyBatis Dynamic SQL MyBatis framework for generating dynamic SQL 2016 + https://www.mybatis.org/mybatis-dynamic-sql/ scm:git:ssh://git@github.com/mybatis/mybatis-dynamic-sql.git scm:git:ssh://git@github.com/mybatis/mybatis-dynamic-sql.git HEAD - https://github.com/mybatis/mybatis-dynamic-sql + https://github.com/mybatis/mybatis-dynamic-sql/ GitHub Issue Management