Merge pull request #877 from hazendaz/master

Update GHA, update maven, sortpom
mybatis · Nov 9, 2023 · 8741b17 · 8741b17
2 parents e6f7d50 + 2454d55
commit 8741b17
Show file tree

Hide file tree

Showing 10 changed files with 88 additions and 155 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -1,43 +1,25 @@
-#
-# Copyright 2010-2022 the original author or authors.
-#
-# 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
-#
-# 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.
-#
-
 name: Java CI
 
-on:
- push:
- pull_request:
+on: [workflow_dispatch, push, pull_request]
 
 jobs:
  test:
  runs-on: ${{ matrix.os }}
  strategy:
  matrix:
- os: [ubuntu-latest, macOS-latest, windows-latest]
+ os: [ubuntu-latest, macos-latest, windows-latest]
  java: [17, 21, 22-ea]
  distribution: ['temurin']
  fail-fast: false
- max-parallel: 5
+ max-parallel: 4
  name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
 
  steps:
  - uses: actions/checkout@v4
- - name: Set up JDK
+ - name: Set up JDK ${{ matrix.java }} ${{ matrix.distribution }}
  uses: actions/setup-java@v3
  with:
  java-version: ${{ matrix.java }}
  distribution: ${{ matrix.distribution }}
  - name: Test with Maven
- run: ./mvnw test -B -D"license.skip=true"
+ run: ./mvnw test -B -V --no-transfer-progress -D"license.skip=true"
diff --git a/.github/workflows/coveralls.yaml b/.github/workflows/coveralls.yaml
@@ -1,24 +1,6 @@
-#
-# Copyright 2010-2022 the original author or authors.
-#
-# 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
-#
-# 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.
-#
-
 name: Coveralls
 
-on:
- push:
- pull_request:
+on: [push, pull_request]
 
 jobs:
  build:
@@ -33,12 +15,12 @@ jobs:
  distribution: zulu
  - name: Report Coverage to Coveralls for Pull Requests
  if: github.event_name == 'pull_request'
- run: ./mvnw test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER
+ run: ./mvnw -B -V test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER --no-transfer-progress
  env:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
  PR_NUMBER: ${{ github.event.number }}
  - name: Report Coverage to Coveralls for General Push
  if: github.event_name == 'push'
- run: ./mvnw test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github
+ run: ./mvnw -B -V test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github --no-transfer-progress
  env:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml
@@ -1,19 +1,3 @@
-#
-# Copyright 2010-2022 the original author or authors.
-#
-# 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
-#
-# 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.
-#
-
 name: SonarCloud
 
 on:
@@ -36,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
+ 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
  env:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
  SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
diff --git a/.github/workflows/sonatype.yaml b/.github/workflows/sonatype.yaml
@@ -1,19 +1,3 @@
-#
-# Copyright 2010-2022 the original author or authors.
-#
-# 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
-#
-# 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.
-#
-
 name: Sonatype
 
 on:
@@ -33,7 +17,7 @@ jobs:
  java-version: 21
  distribution: zulu
  - name: Deploy to Sonatype
- run: ./mvnw deploy -DskipTests -B --settings ./.mvn/settings.xml -Dlicense.skip=true
+ run: ./mvnw deploy -DskipTests -B -V --no-transfer-progress --settings ./.mvn/settings.xml -Dlicense.skip=true
  env:
  CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
  CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
diff --git a/.mvn/maven.config b/.mvn/maven.config
@@ -1 +1,2 @@
 -Daether.checksums.algorithms=SHA-512,SHA-256,SHA-1,MD5
+-Daether.connector.smartChecksums=false
diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java
@@ -7,7 +7,7 @@
  * "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

diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -6,7 +6,7 @@
 # "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

diff --git a/mvnw b/mvnw
@@ -8,7 +8,7 @@
 # "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

diff --git a/mvnw.cmd b/mvnw.cmd
@@ -7,7 +7,7 @@
 @REM "License"); you may not use this file except in compliance
 @REM with the License. You may obtain a copy of the License at
 @REM
-@REM http://www.apache.org/licenses/LICENSE-2.0
+@REM https://www.apache.org/licenses/LICENSE-2.0
 @REM
 @REM Unless required by applicable law or agreed to in writing,
 @REM software distributed under the License is distributed on an

diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
  <groupId>org.mybatis</groupId>
  <artifactId>mybatis-parent</artifactId>
  <version>40</version>
- <relativePath />
+ <relativePath/>
  </parent>
 
  <artifactId>mybatis-spring</artifactId>
@@ -77,10 +77,10 @@
  </contributors>
 
  <scm>
- <url>http://github.com/mybatis/spring</url>
  <connection>scm:git:ssh://git@github.com/mybatis/spring.git</connection>
  <developerConnection>scm:git:ssh://git@github.com/mybatis/spring.git</developerConnection>
  <tag>HEAD</tag>
+ <url>http://github.com/mybatis/spring</url>
  </scm>
  <issueManagement>
  <system>GitHub Issue Management</system>
@@ -212,10 +212,10 @@
  <version>${spring-batch.version}</version>
  <scope>test</scope>
  <exclusions>
-  <exclusion>
-  <groupId>junit</groupId>
-  <artifactId>junit</artifactId>
-  </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
  </exclusions>
  </dependency>
 
@@ -331,7 +331,72 @@
  </dependency>
  </dependencies>
 
+ <repositories>
+ <repository>
+ <id>sonatype-oss-snapshots</id>
+ <name>Sonatype OSS Snapshots Repository</name>
+ <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+ </repository>
+ <repository>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <id>spring-snapshot</id>
+ <name>Spring Snapshots</name>
+ <url>https://repo.spring.io/snapshot</url>
+ </repository>
+ <repository>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <id>spring-milestone</id>
+ <name>Spring Milestone</name>
+ <url>https://repo.spring.io/milestone</url>
+ </repository>
+ </repositories>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <id>spring-snapshot</id>
+ <name>Spring Snapshots</name>
+ <url>https://repo.spring.io/snapshot</url>
+ </pluginRepository>
+ <pluginRepository>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <id>spring-milestone</id>
+ <name>Spring Milestone</name>
+ <url>https://repo.spring.io/milestone</url>
+ </pluginRepository>
+ </pluginRepositories>
+
  <build>
+
+ <resources>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${project.basedir}</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${project.basedir}/src/main/resources</directory>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>${project.build.testSourceDirectory}</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </testResource>
+ </testResources>
  <plugins>
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
@@ -356,10 +421,10 @@
  <!-- prepare site content by filtering ${project.*} values-->
  <execution>
  <id>filter-site</id>
- <phase>pre-site</phase>
  <goals>
  <goal>copy-resources</goal>
  </goals>
+ <phase>pre-site</phase>
  <configuration>
  <outputDirectory>${project.build.directory}/site-src</outputDirectory>
  <resources>
@@ -378,7 +443,7 @@
  <configuration>
  <locales>en,es,zh_CN,ja,ko</locales>
  <siteDirectory>${project.build.directory}/site-src</siteDirectory>
- </configuration>
+  </configuration>
  </plugin>
  <!-- We are not modular yet but use automatic module names, javadoc plugin has well known incorrect determination of modular, patch it -->
  <plugin>
@@ -394,70 +459,5 @@
  </configuration>
  </plugin>
  </plugins>
-
- <resources>
- <resource>
- <directory>${project.basedir}</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>LICENSE</include>
- <include>NOTICE</include>
- </includes>
- </resource>
- <resource>
- <directory>${project.basedir}/src/main/resources</directory>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>${project.build.testSourceDirectory}</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </testResource>
- </testResources>
  </build>
-
- <repositories>
- <repository>
- <id>sonatype-oss-snapshots</id>
- <name>Sonatype OSS Snapshots Repository</name>
- <url>https://oss.sonatype.org/content/repositories/snapshots</url>
- </repository>
- <repository>
- <id>spring-snapshot</id>
- <name>Spring Snapshots</name>
- <url>https://repo.spring.io/snapshot</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- <repository>
- <id>spring-milestone</id>
- <name>Spring Milestone</name>
- <url>https://repo.spring.io/milestone</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>spring-snapshot</id>
- <name>Spring Snapshots</name>
- <url>https://repo.spring.io/snapshot</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
- <pluginRepository>
- <id>spring-milestone</id>
- <name>Spring Milestone</name>
- <url>https://repo.spring.io/milestone</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
 </project>