Merge pull request #604 from hazendaz/master

Build updates including adding sonar override so we use correct plugin on GHA

.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 }}

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,

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.1</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>

renovate.json

@@ -1,6 +1,6 @@
 {
  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
  "extends": [
- "config:base"
+ "config:recommended"
  ]
 }