diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 531c9ae997..06b1c2163e 100644
--- 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
index 0413b2c8d0..03df1ede11 100644
--- 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
index 7188289209..2c986b2f84 100644
--- 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
index d579dae246..46800b489e 100644
--- 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
index 956533e67c..afdcfab795 100644
--- 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
index 84d1e60d8d..f57fd86fbf 100644
--- 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
index eacdc9ed17..39a584eb21 100644
--- 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
index 8d937f4c14..66df285428 100755
--- 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
index c4586b564e..95ba6f54ac 100644
--- 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
index ccd0b2b761..2cd823925f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
org.mybatis
mybatis-parent
40
-
+
mybatis-spring
@@ -77,10 +77,10 @@
- http://github.com/mybatis/spring
scm:git:ssh://git@github.com/mybatis/spring.git
scm:git:ssh://git@github.com/mybatis/spring.git
HEAD
+ http://github.com/mybatis/spring
GitHub Issue Management
@@ -212,10 +212,10 @@
${spring-batch.version}
test
-
- junit
- junit
-
+
+ junit
+ junit
+
@@ -331,7 +331,72 @@
+
+
+ sonatype-oss-snapshots
+ Sonatype OSS Snapshots Repository
+ https://oss.sonatype.org/content/repositories/snapshots
+
+
+
+ false
+
+ spring-snapshot
+ Spring Snapshots
+ https://repo.spring.io/snapshot
+
+
+
+ false
+
+ spring-milestone
+ Spring Milestone
+ https://repo.spring.io/milestone
+
+
+
+
+
+
+ false
+
+ spring-snapshot
+ Spring Snapshots
+ https://repo.spring.io/snapshot
+
+
+
+ false
+
+ spring-milestone
+ Spring Milestone
+ https://repo.spring.io/milestone
+
+
+
+
+
+
+ META-INF
+ ${project.basedir}
+
+ LICENSE
+ NOTICE
+
+
+
+ ${project.basedir}/src/main/resources
+
+
+
+
+ ${project.build.testSourceDirectory}
+
+ **/*.java
+
+
+
org.apache.maven.plugins
@@ -356,10 +421,10 @@
filter-site
- pre-site
copy-resources
+ pre-site
${project.build.directory}/site-src
@@ -378,7 +443,7 @@
en,es,zh_CN,ja,ko
${project.build.directory}/site-src
-
+
@@ -394,70 +459,5 @@
-
-
-
- ${project.basedir}
- META-INF
-
- LICENSE
- NOTICE
-
-
-
- ${project.basedir}/src/main/resources
-
-
-
-
- ${project.build.testSourceDirectory}
-
- **/*.java
-
-
-
-
-
-
- sonatype-oss-snapshots
- Sonatype OSS Snapshots Repository
- https://oss.sonatype.org/content/repositories/snapshots
-
-
- spring-snapshot
- Spring Snapshots
- https://repo.spring.io/snapshot
-
- false
-
-
-
- spring-milestone
- Spring Milestone
- https://repo.spring.io/milestone
-
- false
-
-
-
-
-
-
- spring-snapshot
- Spring Snapshots
- https://repo.spring.io/snapshot
-
- false
-
-
-
- spring-milestone
- Spring Milestone
- https://repo.spring.io/milestone
-
- false
-
-
-