From 797b61daeebf13c5c80916d5458e450e883018d5 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 4 Feb 2024 14:15:02 -0500 Subject: [PATCH 1/4] [ci] Use https in license --- LICENSE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index 57bc88a15a..7e835b2fa9 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 @@ -192,7 +192,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, From 5203a00e32a0ccf5dd3c60d4da7df9d717f659e4 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 4 Feb 2024 14:15:09 -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 39a2b6e9a5..5db72dd6a9 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 edb4648d4ad7e820a5f33cc548b2f1ff685701c2 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 11 Feb 2024 14:27:48 -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 4cab3d94a9..a803d9e302 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 -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 -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 7ac58f19f6011c2376eeab0a27fc8c5a16140fa1 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 11 Feb 2024 18:06:11 -0500 Subject: [PATCH 4/4] [pom] Cleanup pom and fix urls --- pom.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index dd6f1b5e6e..bec26b2911 100644 --- a/pom.xml +++ b/pom.xml @@ -17,6 +17,7 @@ --> + 4.0.0 @@ -26,13 +27,13 @@ + org.mybatis mybatis-spring 3.0.4-SNAPSHOT - jar mybatis-spring An easy-to-use Spring bridge for MyBatis sql mapping framework. - http://www.mybatis.org/spring/ + https://www.mybatis.org/spring/ @@ -80,7 +81,7 @@ scm:git:ssh://git@github.com/mybatis/spring.git scm:git:ssh://git@github.com/mybatis/spring.git HEAD - http://github.com/mybatis/spring + https://github.com/mybatis/spring/ GitHub Issue Management