Skip to content

Commit 353ca7b

Browse files
authored
Merge pull request #711 from hazendaz/master
Support mybatis parent 36
2 parents 6ad3b39 + b87ce84 commit 353ca7b

File tree

187 files changed

+614
-430
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

187 files changed

+614
-430
lines changed

.editorconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#
2-
# Copyright 2010-2019 the original author or authors.
2+
# Copyright 2010-2022 the original author or authors.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
66
# You may obtain a copy of the License at
77
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
8+
# https://www.apache.org/licenses/LICENSE-2.0
99
#
1010
# Unless required by applicable law or agreed to in writing, software
1111
# distributed under the License is distributed on an "AS IS" BASIS,

.github/dependabot.yml

Lines changed: 0 additions & 40 deletions
This file was deleted.

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
strategy:
2929
matrix:
3030
os: [ubuntu-latest, macOS-latest, windows-latest]
31-
java: [8, 11, 17, 18, 19-ea]
31+
java: [11, 17, 18, 19-ea]
3232
distribution: ['zulu']
3333
fail-fast: false
3434
max-parallel: 5

.github/workflows/coveralls.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: Set up JDK
3232
uses: actions/setup-java@v3
3333
with:
34-
java-version: 8
34+
java-version: 11
3535
distribution: zulu
3636
- name: Report Coverage to Coveralls for Pull Requests
3737
if: github.event_name == 'pull_request'

.github/workflows/sonar.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: Set up JDK
3434
uses: actions/setup-java@v3
3535
with:
36-
java-version: 11
36+
java-version: 17
3737
distribution: zulu
3838
- name: Analyze with SonarCloud
3939
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

.github/workflows/sonatype.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Set up JDK
3131
uses: actions/setup-java@v3
3232
with:
33-
java-version: 11
33+
java-version: 17
3434
distribution: zulu
3535
- name: Deploy to Sonatype
3636
run: ./mvnw deploy -DskipTests -B --settings ./.mvn/settings.xml -Dlicense.skip=true

.github/workflows/support.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
strategy:
2929
matrix:
3030
os: [ubuntu-latest, macOS-latest]
31-
java: [8]
31+
java: [11]
3232
distribution: ['zulu']
3333
fail-fast: false
3434
max-parallel: 2

.mvn/extensions.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
you may not use this file except in compliance with the License.
88
You may obtain a copy of the License at
99
10-
http://www.apache.org/licenses/LICENSE-2.0
10+
https://www.apache.org/licenses/LICENSE-2.0
1111
1212
Unless required by applicable law or agreed to in writing, software
1313
distributed under the License is distributed on an "AS IS" BASIS,

.mvn/maven.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
-Daether.checksums.algorithms=SHA-512,SHA-256,SHA-1,MD5

.mvn/settings.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright 2010-2020 the original author or authors.
4+
Copyright 2010-2022 the original author or authors.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
88
You may obtain a copy of the License at
99
10-
http://www.apache.org/licenses/LICENSE-2.0
10+
https://www.apache.org/licenses/LICENSE-2.0
1111
1212
Unless required by applicable law or agreed to in writing, software
1313
distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,8 +16,8 @@
1616
limitations under the License.
1717
1818
-->
19-
<settings xmlns="http://maven.apache.org/SETTINGS/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20-
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd">
19+
<settings xmlns="http://maven.apache.org/SETTINGS/1.2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20+
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.2.0 https://maven.apache.org/xsd/settings-1.2.0.xsd">
2121
<servers>
2222
<server>
2323
<id>ossrh</id>

0 commit comments

Comments
 (0)