Skip to content

Commit 1d9ae05

Browse files
jeffgbutlerjeffgbutler
committed
Merge branch 'refs/heads/master' into remove-deprecated-code
2 parents eb526a8 + bb60c74 commit 1d9ae05

27 files changed

+111
-141
lines changed

‎.github/workflows/ci.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ jobs:
77
runs-on: ${{ matrix.os }}
88
strategy:
99
matrix:
10+
cache: [maven]
11+
distribution: [temurin]
12+
java: [17, 21, 22, 23-ea]
1013
os: [ubuntu-latest]
11-
java: [17, 21, 22-ea]
12-
distribution: ['temurin']
1314
fail-fast: false
1415
max-parallel: 4
1516
name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
@@ -21,5 +22,6 @@ jobs:
2122
with:
2223
java-version: ${{ matrix.java }}
2324
distribution: ${{ matrix.distribution }}
25+
cache: ${{ matrix.cache }}
2426
- name: Test with Maven
2527
run: ./mvnw test -B -V --no-transfer-progress -D"license.skip=true"

‎.github/workflows/coveralls.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ jobs:
1111
- name: Set up JDK
1212
uses: actions/setup-java@v4
1313
with:
14+
cache: maven
15+
distribution: temurin
1416
java-version: 21
15-
distribution: zulu
1617
- name: Report Coverage to Coveralls for Pull Requests
1718
if: github.event_name == 'pull_request'
1819
run: ./mvnw -B -V test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER --no-transfer-progress

‎.github/workflows/site.yaml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,18 @@ jobs:
1414
- name: Set up JDK
1515
uses: actions/setup-java@v4
1616
with:
17+
cache: maven
18+
distribution: temurin
1719
java-version: 21
18-
distribution: zulu
19-
- uses: webfactory/ssh-agent@master
20-
with:
21-
ssh-private-key: ${{ secrets.DEPLOY_KEY }}
2220
- name: Build site
23-
run: ./mvnw site site:stage -DskipTests -B -V --no-transfer-progress -Dlicense.skip=true
21+
run: ./mvnw site site:stage -DskipTests -Dlicense.skip=true -B -V --no-transfer-progress --settings ./.mvn/settings.xml
2422
env:
2523
CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
2624
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
25+
NVD_API_KEY: ${{ secrets.NVD_API_KEY }}
2726
- name: Deploy Site to gh-pages
28-
uses: JamesIves/github-pages-deploy-action@v4.6.1
27+
uses: JamesIves/github-pages-deploy-action@v4
2928
with:
30-
ssh-key: true
3129
branch: gh-pages
3230
folder: target/staging
33-
env:
34-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
31+
ssh-key: ${{ secrets.DEPLOY_KEY }}

‎.github/workflows/sonar.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@ jobs:
1717
- name: Set up JDK
1818
uses: actions/setup-java@v4
1919
with:
20+
cache: maven
21+
distribution: temurin
2022
java-version: 21
21-
distribution: zulu
2223
- name: Analyze with SonarCloud
23-
run: ./mvnw verify jacoco:report sonar:sonar -B -Dsonar.projectKey=mybatis_mybatis-dynamic-sql -Dsonar.organization=mybatis -Dsonar.host.url=https://sonarcloud.io -Dsonar.token=$SONAR_TOKEN -Dlicense.skip=true --no-transfer-progress
24+
run: ./mvnw verify jacoco:report sonar:sonar -B -V -Dsonar.projectKey=mybatis_mybatis-dynamic-sql -Dsonar.organization=mybatis -Dsonar.host.url=https://sonarcloud.io -Dsonar.token=$SONAR_TOKEN -Dlicense.skip=true --no-transfer-progress
2425
env:
2526
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2627
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

‎.github/workflows/sonatype.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ jobs:
1414
- name: Set up JDK
1515
uses: actions/setup-java@v4
1616
with:
17+
cache: maven
18+
distribution: temurin
1719
java-version: 21
18-
distribution: zulu
1920
- name: Deploy to Sonatype
2021
run: ./mvnw deploy -DskipTests -B -V --no-transfer-progress --settings ./.mvn/settings.xml -Dlicense.skip=true
2122
env:

‎.mvn/wrapper/MavenWrapperDownloader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import java.util.concurrent.ThreadLocalRandom;
3131

3232
public final class MavenWrapperDownloader {
33-
private static final String WRAPPER_VERSION = "3.3.1";
33+
private static final String WRAPPER_VERSION = "3.3.2";
3434

3535
private static final boolean VERBOSE = Boolean.parseBoolean(System.getenv("MVNW_VERBOSE"));
3636

‎.mvn/wrapper/maven-wrapper.properties

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
# KIND, either express or implied. See the License for the
1515
# specific language governing permissions and limitations
1616
# under the License.
17-
wrapperVersion=3.3.1
17+
wrapperVersion=3.3.2
18+
distributionType=source
1819
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip
19-
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.1/maven-wrapper-3.3.1.jar
20+
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
This log will detail notable changes to MyBatis Dynamic SQL. Full details are available on the GitHub milestone pages.
44

5+
## Release 2.0.0 - Unreleased
6+
7+
The library now requires Java 17.
8+
59
## Release 1.5.2 - June 3, 2024
610

711
This is a small maintenance release with the following changes:

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,4 @@ The library test cases provide several complete examples of using the library in
8080

8181
## Requirements
8282

83-
The library has no dependencies. Java 8 or higher is required.
83+
The library has no dependencies. Version 2.x requires Java 17. Version 1.8 requires Java 8.

‎mvnw

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
# ----------------------------------------------------------------------------
2020

2121
# ----------------------------------------------------------------------------
22-
# Apache Maven Wrapper startup batch script, version 3.3.1
22+
# Apache Maven Wrapper startup batch script, version 3.3.2
2323
#
2424
# Required ENV vars:
2525
# ------------------
@@ -212,9 +212,9 @@ else
212212
log "Couldn't find $wrapperJarPath, downloading it ..."
213213

214214
if [ -n "$MVNW_REPOURL" ]; then
215-
wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.3.1/maven-wrapper-3.3.1.jar"
215+
wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar"
216216
else
217-
wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.1/maven-wrapper-3.3.1.jar"
217+
wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar"
218218
fi
219219
while IFS="=" read -r key value; do
220220
# Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' )

0 commit comments

Comments
 (0)