Skip to content

Commit 0868f14

Browse files
jeffgbutlerjeffgbutler
committed
Merge branch 'refs/heads/master' into java-11-update
# Conflicts: # pom.xml
2 parents d5215bf + 545e4be commit 0868f14

File tree

14 files changed

+53
-50
lines changed

14 files changed

+53
-50
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

‎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 '=' )

‎mvnw.cmd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
@REM ----------------------------------------------------------------------------
1919

2020
@REM ----------------------------------------------------------------------------
21-
@REM Apache Maven Wrapper startup batch script, version 3.3.1
21+
@REM Apache Maven Wrapper startup batch script, version 3.3.2
2222
@REM
2323
@REM Required ENV vars:
2424
@REM JAVA_HOME - location of a JDK home dir
@@ -119,7 +119,7 @@ SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
119119
set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
120120
set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
121121

122-
set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.1/maven-wrapper-3.3.1.jar"
122+
set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar"
123123

124124
FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
125125
IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B
@@ -133,7 +133,7 @@ if exist %WRAPPER_JAR% (
133133
)
134134
) else (
135135
if not "%MVNW_REPOURL%" == "" (
136-
SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.3.1/maven-wrapper-3.3.1.jar"
136+
SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar"
137137
)
138138
if "%MVNW_VERBOSE%" == "true" (
139139
echo Couldn't find %WRAPPER_JAR%, downloading it ...

‎pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.mybatis</groupId>
2323
<artifactId>mybatis-parent</artifactId>
24-
<version>44</version>
24+
<version>45</version>
2525
</parent>
2626

2727
<groupId>org.mybatis.dynamic-sql</groupId>
@@ -68,13 +68,13 @@
6868
<module.name>org.mybatis.dynamic.sql</module.name>
6969

7070
<kotlin.version>2.0.0</kotlin.version>
71-
<kotlin.compiler.apiVersion>1.7</kotlin.compiler.apiVersion>
71+
<kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
7272

7373
<sonar.sources>pom.xml,src/main/java,src/main/kotlin</sonar.sources>
7474
<sonar.tests>src/test/java,src/test/kotlin</sonar.tests>
7575

7676
<kotlin.code.style>official</kotlin.code.style>
77-
<test.containers.version>1.19.8</test.containers.version>
77+
<test.containers.version>1.20.1</test.containers.version>
7878
<osgi.export>org.mybatis.dynamic.sql.*;version=${project.version};-noimport:=true</osgi.export>
7979

8080
<!-- Reproducible Builds -->
@@ -84,15 +84,15 @@
8484
<dependencies>
8585
<dependency>
8686
<groupId>org.jetbrains.kotlin</groupId>
87-
<artifactId>kotlin-stdlib</artifactId>
87+
<artifactId>kotlin-stdlib-jdk8</artifactId>
8888
<version>${kotlin.version}</version>
8989
<scope>provided</scope>
9090
<optional>true</optional>
9191
</dependency>
9292
<dependency>
9393
<groupId>org.springframework</groupId>
9494
<artifactId>spring-jdbc</artifactId>
95-
<version>6.1.9</version>
95+
<version>6.1.11</version>
9696
<scope>provided</scope>
9797
<optional>true</optional>
9898
</dependency>
@@ -125,7 +125,7 @@
125125
<dependency>
126126
<groupId>org.assertj</groupId>
127127
<artifactId>assertj-core</artifactId>
128-
<version>3.26.0</version>
128+
<version>3.26.3</version>
129129
<scope>test</scope>
130130
</dependency>
131131
<dependency>
@@ -168,7 +168,7 @@
168168
<dependency>
169169
<groupId>org.hamcrest</groupId>
170170
<artifactId>hamcrest</artifactId>
171-
<version>2.2</version>
171+
<version>3.0</version>
172172
<scope>test</scope>
173173
</dependency>
174174

@@ -199,7 +199,7 @@
199199
<dependency>
200200
<groupId>org.mariadb.jdbc</groupId>
201201
<artifactId>mariadb-java-client</artifactId>
202-
<version>3.4.0</version>
202+
<version>3.4.1</version>
203203
<scope>test</scope>
204204
</dependency>
205205
</dependencies>

‎src/test/kotlin/nullability/test/ComparisonTest.kt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class ComparisonTest {
3838
val compilerMessageCollector = compile(source)
3939
assertThat(compilerMessageCollector.errorLocations())
4040
.hasSize(1)
41-
// TODO .contains(ErrorLocation(9, 30))
41+
.contains(ErrorLocation(9, 20))
4242
}
4343

4444
@Test
@@ -81,7 +81,7 @@ class ComparisonTest {
8181
val compilerMessageCollector = compile(source)
8282
assertThat(compilerMessageCollector.errorLocations())
8383
.hasSize(1)
84-
// TODO .contains(ErrorLocation(10, 31))
84+
.contains(ErrorLocation(10, 21))
8585
}
8686

8787
@Test
@@ -124,7 +124,7 @@ class ComparisonTest {
124124
val compilerMessageCollector = compile(source)
125125
assertThat(compilerMessageCollector.errorLocations())
126126
.hasSize(1)
127-
// TODO .contains(ErrorLocation(9, 33))
127+
.contains(ErrorLocation(9, 20))
128128
}
129129

130130
@Test
@@ -167,7 +167,7 @@ class ComparisonTest {
167167
val compilerMessageCollector = compile(source)
168168
assertThat(compilerMessageCollector.errorLocations())
169169
.hasSize(1)
170-
// TODO .contains(ErrorLocation(10, 34))
170+
.contains(ErrorLocation(10, 21))
171171
}
172172

173173
@Test
@@ -210,7 +210,7 @@ class ComparisonTest {
210210
val compilerMessageCollector = compile(source)
211211
assertThat(compilerMessageCollector.errorLocations())
212212
.hasSize(1)
213-
// TODO .contains(ErrorLocation(9, 34))
213+
.contains(ErrorLocation(9, 20))
214214
}
215215

216216
@Test
@@ -253,7 +253,7 @@ class ComparisonTest {
253253
val compilerMessageCollector = compile(source)
254254
assertThat(compilerMessageCollector.errorLocations())
255255
.hasSize(1)
256-
// TODO .contains(ErrorLocation(10, 35))
256+
.contains(ErrorLocation(10, 21))
257257
}
258258

259259
@Test
@@ -296,7 +296,7 @@ class ComparisonTest {
296296
val compilerMessageCollector = compile(source)
297297
assertThat(compilerMessageCollector.errorLocations())
298298
.hasSize(1)
299-
// TODO .contains(ErrorLocation(9, 43))
299+
.contains(ErrorLocation(9, 20))
300300
}
301301

302302
@Test
@@ -339,7 +339,7 @@ class ComparisonTest {
339339
val compilerMessageCollector = compile(source)
340340
assertThat(compilerMessageCollector.errorLocations())
341341
.hasSize(1)
342-
// TODO .contains(ErrorLocation(10, 44))
342+
.contains(ErrorLocation(10, 21))
343343
}
344344

345345
@Test
@@ -382,7 +382,7 @@ class ComparisonTest {
382382
val compilerMessageCollector = compile(source)
383383
assertThat(compilerMessageCollector.errorLocations())
384384
.hasSize(1)
385-
// TODO .contains(ErrorLocation(9, 31))
385+
.contains(ErrorLocation(9, 20))
386386
}
387387

388388
@Test
@@ -425,7 +425,7 @@ class ComparisonTest {
425425
val compilerMessageCollector = compile(source)
426426
assertThat(compilerMessageCollector.errorLocations())
427427
.hasSize(1)
428-
// TODO .contains(ErrorLocation(10, 32))
428+
.contains(ErrorLocation(10, 21))
429429
}
430430

431431
@Test
@@ -468,7 +468,7 @@ class ComparisonTest {
468468
val compilerMessageCollector = compile(source)
469469
assertThat(compilerMessageCollector.errorLocations())
470470
.hasSize(1)
471-
// TODO .contains(ErrorLocation(9, 40))
471+
.contains(ErrorLocation(9, 20))
472472
}
473473

474474
@Test
@@ -511,7 +511,7 @@ class ComparisonTest {
511511
val compilerMessageCollector = compile(source)
512512
assertThat(compilerMessageCollector.errorLocations())
513513
.hasSize(1)
514-
// TODO .contains(ErrorLocation(10, 41))
514+
.contains(ErrorLocation(10, 21))
515515
}
516516

517517
@Test

‎src/test/kotlin/nullability/test/EqualNotEqualTest.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class EqualNotEqualTest {
3838
val compilerMessageCollector = compile(source)
3939
assertThat(compilerMessageCollector.errorLocations())
4040
.hasSize(1)
41-
// TODO .contains(ErrorLocation(9, 37))
41+
.contains(ErrorLocation(9, 27))
4242
}
4343

4444
@Test
@@ -81,7 +81,7 @@ class EqualNotEqualTest {
8181
val compilerMessageCollector = compile(source)
8282
assertThat(compilerMessageCollector.errorLocations())
8383
.hasSize(1)
84-
// TODO .contains(ErrorLocation(10, 40))
84+
.contains(ErrorLocation(10, 27))
8585
}
8686

8787
@Test
@@ -124,7 +124,7 @@ class EqualNotEqualTest {
124124
val compilerMessageCollector = compile(source)
125125
assertThat(compilerMessageCollector.errorLocations())
126126
.hasSize(1)
127-
// TODO .contains(ErrorLocation(10, 38))
127+
.contains(ErrorLocation(10, 28))
128128
}
129129

130130
@Test
@@ -169,7 +169,7 @@ class EqualNotEqualTest {
169169
val compilerMessageCollector = compile(source)
170170
assertThat(compilerMessageCollector.errorLocations())
171171
.hasSize(1)
172-
// TODO .contains(ErrorLocation(11, 41))
172+
.contains(ErrorLocation(11, 28))
173173
}
174174

175175
@Test

‎src/test/kotlin/nullability/test/InTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,6 @@ class InTest {
108108
val compilerMessageCollector = compile(source)
109109
assertThat(compilerMessageCollector.errorLocations())
110110
.hasSize(1)
111-
// TODO .contains(ErrorLocation(11, 26))
111+
.contains(ErrorLocation(11, 21))
112112
}
113113
}

‎src/test/kotlin/nullability/test/NotInTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,6 @@ class NotInTest {
108108
val compilerMessageCollector = compile(source)
109109
assertThat(compilerMessageCollector.errorLocations())
110110
.hasSize(1)
111-
// TODO .contains(ErrorLocation(11, 29))
111+
.contains(ErrorLocation(11, 21))
112112
}
113113
}

0 commit comments

Comments
 (0)