Skip to content

Commit 2dc94f1

Browse files
jeffgbutlerjeffgbutler
committed
Merge branch 'master' into multi-insert
2 parents b81925c + 4588acd commit 2dc94f1

File tree

114 files changed

+3867
-1182
lines changed

Some content is hidden

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

114 files changed

+3867
-1182
lines changed

‎.mvn/wrapper/MavenWrapperDownloader.java

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,3 @@
1-
/**
2-
* Copyright 2016-2018 the original author or authors.
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
15-
*/
161
/*
172
Licensed to the Apache Software Foundation (ASF) under one
183
or more contributor license agreements. See the NOTICE file
@@ -43,7 +28,7 @@ public class MavenWrapperDownloader {
4328
* Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
4429
*/
4530
private static final String DEFAULT_DOWNLOAD_URL =
46-
"https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.0/maven-wrapper-0.4.0.jar";
31+
"https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar";
4732

4833
/**
4934
* Path to the maven-wrapper.properties file, which might contain a downloadUrl property to

‎.mvn/wrapper/maven-wrapper.properties

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.5.3/apache-maven-3.5.3-bin.zip
2-
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.0/maven-wrapper-0.4.0.jar
1+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.zip
2+
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar
3+

‎.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
language: java
2-
sudo: false
32

43
jdk:
5-
- oraclejdk9
4+
- oraclejdk11
65
- oraclejdk8
76

87
after_success:

‎CHANGELOG.md

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Change Log
2+
3+
This log will detail notable changes to MyBatis Dynamic SQL. Full details are available on the GitHub milestone pages.
4+
5+
## Release 1.1.1
6+
7+
GitHub milestone: [https://github.com/mybatis/mybatis-dynamic-sql/issues?q=milestone%3A1.1.1+](https://github.com/mybatis/mybatis-dynamic-sql/issues?q=milestone%3A1.1.1+)
8+
9+
### Added
10+
11+
- Limit and offset support in the select statement
12+
- Utilities for Spring Batch
13+
- All conditions now support conditional rendering with lambdas
14+
- Select * support
15+
- Union all support
16+
17+
### Bugs Fixed
18+
19+
- Fixed self joins
20+
21+
22+
## Release 1.1.0
23+
24+
GitHub milestone: [https://github.com/mybatis/mybatis-dynamic-sql/issues?q=milestone%3A1.1.0+](https://github.com/mybatis/mybatis-dynamic-sql/issues?q=milestone%3A1.1.0+)
25+
26+
### Added
27+
28+
- Support for optional conditions
29+
- Support for column comparison conditions
30+
- Support for sub-queries in the update statement
31+
- Support for expressions and constants in the select statement
32+
- Support for function in the update statement
33+
34+
### Bugs Fixed
35+
36+
- Support group by after where
37+
38+
## Initial Release - December 17, 2017

‎mvnw

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ else
212212
if [ "$MVNW_VERBOSE" = true ]; then
213213
echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
214214
fi
215-
jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.0/maven-wrapper-0.4.0.jar"
215+
jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
216216
while IFS="=" read key value; do
217217
case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
218218
esac

‎mvnw.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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.4.0/maven-wrapper-0.4.0.jar"
123+
set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
124124
FOR /F "tokens=1,2 delims==" %%A IN (%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties) DO (
125125
IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
126126
)

‎pom.xml

Lines changed: 95 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
22
3-
Copyright 2016-2018 the original author or authors.
3+
Copyright 2016-2019 the original author or authors.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.
@@ -15,16 +15,23 @@
1515
limitations under the License.
1616
1717
-->
18+
<!-- Copyright 2016-2019 the original author or authors. Licensed under the
19+
Apache License, Version 2.0 (the "License"); you may not use this file except
20+
in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
21+
Unless required by applicable law or agreed to in writing, software distributed
22+
under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
23+
OR CONDITIONS OF ANY KIND, either express or implied. See the License for
24+
the specific language governing permissions and limitations under the License. -->
1825
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1926
<modelVersion>4.0.0</modelVersion>
2027
<parent>
2128
<groupId>org.mybatis</groupId>
2229
<artifactId>mybatis-parent</artifactId>
23-
<version>30</version>
30+
<version>31</version>
2431
</parent>
2532
<groupId>org.mybatis.dynamic-sql</groupId>
2633
<artifactId>mybatis-dynamic-sql</artifactId>
27-
<version>1.1.1-SNAPSHOT</version>
34+
<version>1.1.2-SNAPSHOT</version>
2835
<name>MyBatis Dynamic SQL</name>
2936
<description>MyBatis framework for generating dynamic SQL</description>
3037
<inceptionYear>2016</inceptionYear>
@@ -33,102 +40,63 @@
3340
<java.version>1.8</java.version>
3441
<maven.compiler.source>${java.version}</maven.compiler.source>
3542
<maven.compiler.target>${java.version}</maven.compiler.target>
36-
<maven.compiler.testTarget>${java.version}</maven.compiler.testTarget>
37-
<maven.compiler.testSource>${java.version}</maven.compiler.testSource>
38-
<junit.jupiter.version>5.2.0</junit.jupiter.version>
39-
<junit.platform.version>1.2.0</junit.platform.version>
43+
<junit.jupiter.version>5.4.1</junit.jupiter.version>
44+
<junit.platform.version>1.4.1</junit.platform.version>
45+
<spring.batch.version>4.1.2.RELEASE</spring.batch.version>
4046
<clirr.comparisonVersion>1.1.0</clirr.comparisonVersion>
47+
<module.name>org.mybatis.dynamic.sql</module.name>
4148
</properties>
42-
43-
<reporting>
44-
<plugins>
45-
<plugin>
46-
<groupId>org.jacoco</groupId>
47-
<artifactId>jacoco-maven-plugin</artifactId>
48-
<version>0.8.1</version>
49-
<reportSets>
50-
<reportSet>
51-
<reports>
52-
<report>report</report>
53-
</reports>
54-
<configuration>
55-
<title>${project.name} - Unit Test Report</title>
56-
</configuration>
57-
</reportSet>
58-
</reportSets>
59-
</plugin>
60-
<plugin> <!-- JDK 10 -->
61-
<groupId>org.apache.maven.plugins</groupId>
62-
<artifactId>maven-javadoc-plugin</artifactId>
63-
<version>3.0.1</version>
64-
</plugin>
65-
<plugin>
66-
<groupId>org.apache.maven.plugins</groupId>
67-
<artifactId>maven-checkstyle-plugin</artifactId>
68-
<configuration>
69-
<configLocation>checkstyle-override.xml</configLocation>
70-
</configuration>
71-
</plugin>
72-
<!-- Added for JDK 10 -->
73-
<plugin>
74-
<groupId>com.github.spotbugs</groupId>
75-
<artifactId>spotbugs-maven-plugin</artifactId>
76-
<version>3.1.5</version>
77-
</plugin>
78-
</plugins>
79-
</reporting>
80-
49+
8150
<build>
8251
<pluginManagement>
83-
<!-- Added for JDK 10 -->
8452
<plugins>
8553
<plugin>
8654
<groupId>org.apache.maven.plugins</groupId>
8755
<artifactId>maven-javadoc-plugin</artifactId>
88-
<version>3.0.1</version>
89-
</plugin>
90-
<plugin>
91-
<groupId>org.apache.maven.plugins</groupId>
92-
<artifactId>maven-surefire-plugin</artifactId>
93-
<version>2.22.0</version>
94-
</plugin>
95-
<plugin>
96-
<groupId>org.apache.maven.plugins</groupId>
97-
<artifactId>maven-site-plugin</artifactId>
98-
<version>3.7.1</version>
99-
</plugin>
100-
<plugin>
101-
<groupId>org.jacoco</groupId>
102-
<artifactId>jacoco-maven-plugin</artifactId>
103-
<version>0.8.1</version>
56+
<configuration>
57+
<quiet>true</quiet>
58+
</configuration>
10459
</plugin>
10560
</plugins>
10661
</pluginManagement>
107-
10862
<plugins>
63+
<!-- Copy the changelog into the generated site -->
10964
<plugin>
110-
<groupId>org.codehaus.mojo</groupId>
111-
<artifactId>animal-sniffer-maven-plugin</artifactId>
112-
<configuration>
113-
<signature>
114-
<groupId>org.codehaus.mojo.signature</groupId>
115-
<artifactId>java18</artifactId>
116-
<version>1.0</version>
117-
</signature>
118-
</configuration>
65+
<artifactId>maven-resources-plugin</artifactId>
11966
<executions>
12067
<execution>
121-
<id>check-java-1.8-compat</id>
122-
<phase>process-classes</phase>
68+
<id>copy-changelog</id>
69+
<phase>pre-site</phase>
12370
<goals>
124-
<goal>check</goal>
71+
<goal>copy-resources</goal>
12572
</goals>
73+
<configuration>
74+
<outputDirectory>${project.build.directory}/generated-site/markdown/docs</outputDirectory>
75+
<resources>
76+
<resource>
77+
<directory>${basedir}</directory>
78+
<include>CHANGELOG.md</include>
79+
</resource>
80+
</resources>
81+
</configuration>
12682
</execution>
12783
</executions>
12884
</plugin>
12985
</plugins>
13086
</build>
131-
87+
88+
<reporting>
89+
<plugins>
90+
<plugin>
91+
<groupId>org.apache.maven.plugins</groupId>
92+
<artifactId>maven-checkstyle-plugin</artifactId>
93+
<configuration>
94+
<configLocation>checkstyle-override.xml</configLocation>
95+
</configuration>
96+
</plugin>
97+
</plugins>
98+
</reporting>
99+
132100
<dependencies>
133101
<dependency>
134102
<groupId>org.junit.jupiter</groupId>
@@ -148,17 +116,23 @@
148116
<version>${junit.platform.version}</version>
149117
<scope>test</scope>
150118
</dependency>
151-
119+
152120
<dependency>
153121
<groupId>org.assertj</groupId>
154122
<artifactId>assertj-core</artifactId>
155-
<version>3.10.0</version>
123+
<version>3.12.2</version>
156124
<scope>test</scope>
157125
</dependency>
158126
<dependency>
159127
<groupId>org.mybatis</groupId>
160128
<artifactId>mybatis</artifactId>
161-
<version>3.4.6</version>
129+
<version>3.5.1</version>
130+
<scope>test</scope>
131+
</dependency>
132+
<dependency>
133+
<groupId>org.mybatis</groupId>
134+
<artifactId>mybatis-spring</artifactId>
135+
<version>2.0.1</version>
162136
<scope>test</scope>
163137
</dependency>
164138
<dependency>
@@ -170,9 +144,27 @@
170144
<dependency>
171145
<groupId>org.springframework</groupId>
172146
<artifactId>spring-jdbc</artifactId>
173-
<version>5.0.7.RELEASE</version>
147+
<version>5.1.6.RELEASE</version>
174148
<scope>test</scope>
175149
</dependency>
150+
<dependency>
151+
<groupId>org.springframework.batch</groupId>
152+
<artifactId>spring-batch-core</artifactId>
153+
<version>${spring.batch.version}</version>
154+
<scope>test</scope>
155+
</dependency>
156+
<dependency>
157+
<groupId>org.springframework.batch</groupId>
158+
<artifactId>spring-batch-test</artifactId>
159+
<version>${spring.batch.version}</version>
160+
<scope>test</scope>
161+
<exclusions>
162+
<exclusion>
163+
<groupId>junit</groupId>
164+
<artifactId>junit</artifactId>
165+
</exclusion>
166+
</exclusions>
167+
</dependency>
176168
<dependency>
177169
<groupId>ch.qos.logback</groupId>
178170
<artifactId>logback-classic</artifactId>
@@ -202,4 +194,26 @@
202194
<url>git:ssh://[email protected]/mybatis/mybatis-dynamic-sql.git?gh-pages#</url>
203195
</site>
204196
</distributionManagement>
197+
198+
<profiles>
199+
<profile>
200+
<id>javadocVersion</id>
201+
<activation>
202+
<jdk>[9,)</jdk>
203+
</activation>
204+
<build>
205+
<pluginManagement>
206+
<plugins>
207+
<plugin>
208+
<groupId>org.apache.maven.plugins</groupId>
209+
<artifactId>maven-javadoc-plugin</artifactId>
210+
<configuration>
211+
<additionalOptions>-html5</additionalOptions>
212+
</configuration>
213+
</plugin>
214+
</plugins>
215+
</pluginManagement>
216+
</build>
217+
</profile>
218+
</profiles>
205219
</project>

0 commit comments

Comments
 (0)