From f6cbd6d209943e8a7f49514a62a0c0bb22ac5a12 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 4 Feb 2024 13:57:43 -0500
Subject: [PATCH 1/5] [renovate] Update config file

---
 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 952a52ebb53b6177f01c0183e419bd1f5fecdddd Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 4 Feb 2024 14:16:28 -0500
Subject: [PATCH 2/5] [ci] Use https in license

---
 LICENSE | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/LICENSE b/LICENSE
index 57bc88a15..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
 
@@ -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 348c8fb7c2fd037c36b28cd09ad80b72e3c1334c Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 11 Feb 2024 14:26:27 -0500
Subject: [PATCH 3/5] [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 6417752e4..200203dbe 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 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
+        run: ./mvnw verify sonar:sonar -B -Dsonar.projectKey=mybatis_parent -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 13e2ff7948d1592d67d58a7ef477fbb6ec989852 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 11 Feb 2024 14:26:45 -0500
Subject: [PATCH 4/5] [pom] Override sonar plugin to proper group id at version
 3.10.0.2594

---
 pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pom.xml b/pom.xml
index 4a20f5ffc..b09a15769 100644
--- a/pom.xml
+++ b/pom.xml
@@ -349,6 +349,7 @@
     <scm-publish.plugin>3.2.1</scm-publish.plugin>
     <shade.plugin>3.5.1</shade.plugin>
     <site.plugin>4.0.0-M13</site.plugin>
+    <sonar.plugin>3.10.0.2594</sonar.plugin>
     <sortpom.plugin>3.3.0</sortpom.plugin>
     <source.plugin>3.3.0</source.plugin>
     <spotbugs.plugin>4.8.3.0</spotbugs.plugin>
@@ -737,6 +738,12 @@
           </configuration>
         </plugin>
 
+        <plugin>
+          <groupId>org.sonarsource.scanner.maven<groupId>
+          <artifactId>sonar-maven-plugin<artifactId>
+          <version>${sonar.plugin}</version>
+        </plugin>
+
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-project-info-reports-plugin</artifactId>

From 1f32ec087bcc9a0844218ad5fdd789183605665c Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 11 Feb 2024 17:20:06 -0500
Subject: [PATCH 5/5] [pom] Fix tags

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index b09a15769..13859410d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -739,8 +739,8 @@
         </plugin>
 
         <plugin>
-          <groupId>org.sonarsource.scanner.maven<groupId>
-          <artifactId>sonar-maven-plugin<artifactId>
+          <groupId>org.sonarsource.scanner.maven</groupId>
+          <artifactId>sonar-maven-plugin</artifactId>
           <version>${sonar.plugin}</version>
         </plugin>