Skip to content

Commit 65158e8

Browse files
harawataharawata
committed
Merge branch 'master' into gh/1800
2 parents c65d8a1 + cad947f commit 65158e8

File tree

348 files changed

+4820
-4736
lines changed

Some content is hidden

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

348 files changed

+4820
-4736
lines changed

‎.mvn/wrapper/MavenWrapperDownloader.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
public class MavenWrapperDownloader {
2222

23-
private static final String WRAPPER_VERSION = "0.5.5";
23+
private static final String WRAPPER_VERSION = "0.5.6";
2424
/**
2525
* Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
2626
*/

‎.mvn/wrapper/maven-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.1/apache-maven-3.6.1-bin.zip
2-
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar
1+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
2+
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

‎.travis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
language: java
22

33
jdk:
4-
- openjdk-ea
4+
- openjdk15
5+
- openjdk14
56
- openjdk13
6-
- openjdk12
77
- openjdk11
88
- openjdk8
99

‎mvnw‎

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

2121
# ----------------------------------------------------------------------------
22-
# Maven2 Start Up Batch script
22+
# Maven Start Up Batch script
2323
#
2424
# Required ENV vars:
2525
# ------------------
@@ -212,9 +212,9 @@ else
212212
echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
213213
fi
214214
if [ -n "$MVNW_REPOURL" ]; then
215-
jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
215+
jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
216216
else
217-
jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
217+
jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
218218
fi
219219
while IFS="=" read key value; do
220220
case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
@@ -246,7 +246,7 @@ else
246246
else
247247
curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
248248
fi
249-
249+
250250
else
251251
if [ "$MVNW_VERBOSE" = true ]; then
252252
echo "Falling back to using Java to download"

‎mvnw.cmd‎

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

2020
@REM ----------------------------------------------------------------------------
21-
@REM Maven2 Start Up Batch script
21+
@REM Maven Start Up Batch script
2222
@REM
2323
@REM Required ENV vars:
2424
@REM JAVA_HOME - location of a JDK home dir
2525
@REM
2626
@REM Optional ENV vars
2727
@REM M2_HOME - location of maven2's installed home dir
2828
@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
29-
@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
29+
@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
3030
@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
3131
@REM e.g. to debug Maven itself, use
3232
@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
@@ -120,7 +120,7 @@ SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
120120
set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
121121
set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
122122

123-
set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
123+
set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
124124

125125
FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
126126
IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
@@ -134,7 +134,7 @@ if exist %WRAPPER_JAR% (
134134
)
135135
) else (
136136
if not "%MVNW_REPOURL%" == "" (
137-
SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
137+
SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
138138
)
139139
if "%MVNW_VERBOSE%" == "true" (
140140
echo Couldn't find %WRAPPER_JAR%, downloading it ...

‎pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright 2009-2019 the original author or authors.
4+
Copyright 2009-2020 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.
@@ -140,7 +140,7 @@
140140
<osgi.dynamicImport>*</osgi.dynamicImport>
141141
<spotbugs.onlyAnalyze>org.apache.ibatis.*</spotbugs.onlyAnalyze>
142142

143-
<!-- Remove after parent 32 (support for jdk 13 and 14) -->
143+
<!-- Remove after parent 32 (support for jdk 13on) -->
144144
<jacoco.version>0.8.5</jacoco.version>
145145
</properties>
146146

@@ -200,7 +200,7 @@
200200
<dependency>
201201
<groupId>org.junit.jupiter</groupId>
202202
<artifactId>junit-jupiter-engine</artifactId>
203-
<version>5.5.2</version>
203+
<version>5.6.0</version>
204204
<scope>test</scope>
205205
</dependency>
206206
<dependency>
@@ -243,7 +243,7 @@
243243
<dependency>
244244
<groupId>mysql</groupId>
245245
<artifactId>mysql-connector-java</artifactId>
246-
<version>8.0.18</version>
246+
<version>8.0.19</version>
247247
<scope>test</scope>
248248
</dependency>
249249
<dependency>

‎src/main/java/org/apache/ibatis/binding/MapperProxy.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2009-2019 the original author or authors.
2+
* Copyright 2009-2020 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.
@@ -82,14 +82,14 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
8282
if (Object.class.equals(method.getDeclaringClass())) {
8383
return method.invoke(this, args);
8484
} else {
85-
return cachedInvoker(proxy, method, args).invoke(proxy, method, args, sqlSession);
85+
return cachedInvoker(method).invoke(proxy, method, args, sqlSession);
8686
}
8787
} catch (Throwable t) {
8888
throw ExceptionUtil.unwrapThrowable(t);
8989
}
9090
}
9191

92-
private MapperMethodInvoker cachedInvoker(Object proxy, Method method, Object[] args) throws Throwable {
92+
private MapperMethodInvoker cachedInvoker(Method method) throws Throwable {
9393
try {
9494
return methodCache.computeIfAbsent(method, m -> {
9595
if (m.isDefault()) {

‎src/main/java/org/apache/ibatis/builder/ResultMapResolver.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2009-2017 the original author or authors.
2+
* Copyright 2009-2020 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.
@@ -47,4 +47,4 @@ public ResultMap resolve() {
4747
return assistant.addResultMap(this.id, this.type, this.extend, this.discriminator, this.resultMappings, this.autoMapping);
4848
}
4949

50-
}
50+
}

‎src/main/java/org/apache/ibatis/builder/xml/XMLMapperBuilder.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,7 @@ private ResultMap resultMapElement(XNode resultMapNode, List<ResultMapping> addi
264264
typeClass = inheritEnclosingType(resultMapNode, enclosingType);
265265
}
266266
Discriminator discriminator = null;
267-
List<ResultMapping> resultMappings = new ArrayList<>();
268-
resultMappings.addAll(additionalResultMappings);
267+
List<ResultMapping> resultMappings = new ArrayList<>(additionalResultMappings);
269268
List<XNode> resultChildren = resultMapNode.getChildren();
270269
for (XNode resultChild : resultChildren) {
271270
if ("constructor".equals(resultChild.getName())) {

‎src/main/java/org/apache/ibatis/cache/decorators/ScheduledCache.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2009-2019 the original author or authors.
2+
* Copyright 2009-2020 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.
@@ -15,10 +15,10 @@
1515
*/
1616
package org.apache.ibatis.cache.decorators;
1717

18-
import org.apache.ibatis.cache.Cache;
19-
2018
import java.util.concurrent.TimeUnit;
2119

20+
import org.apache.ibatis.cache.Cache;
21+
2222
/**
2323
* @author Clinton Begin
2424
*/

0 commit comments

Comments
 (0)