Skip to content

Commit e440bfa

Browse files
authored
Merge pull request #1169 from hazendaz/jdk9
Support java 9 builds, update to maven wrapper, and use junit vintage engine
2 parents 097239a + a8197e1 commit e440bfa

File tree

5 files changed

+16
-5
lines changed

5 files changed

+16
-5
lines changed

.mvn/wrapper/maven-wrapper.jar

164 Bytes
Binary file not shown.

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ addons:
77
- openjdk-6-jdk
88

99
jdk:
10+
- oraclejdk9
1011
- oraclejdk8
1112
- openjdk8
1213
- openjdk7

mvnw

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ if $cygwin ; then
108108
CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
109109
fi
110110

111-
# For Migwn, ensure paths are in UNIX format before anything is touched
111+
# For Mingw, ensure paths are in UNIX format before anything is touched
112112
if $mingw ; then
113113
[ -n "$M2_HOME" ] &&
114114
M2_HOME="`(cd "$M2_HOME"; pwd)`"
@@ -201,7 +201,9 @@ if [ -z "$BASE_DIR" ]; then
201201
fi
202202

203203
export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
204-
echo $MAVEN_PROJECTBASEDIR
204+
if [ "$MVNW_VERBOSE" = true ]; then
205+
echo $MAVEN_PROJECTBASEDIR
206+
fi
205207
MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
206208

207209
# For Cygwin, switch paths to Windows format before running java

mvnw.cmd

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535

3636
@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
3737
@echo off
38+
@REM set title of command window
39+
title %0
3840
@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
3941
@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
4042

pom.xml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,9 @@
197197

198198
<!-- Test dependencies -->
199199
<dependency>
200-
<groupId>junit</groupId>
201-
<artifactId>junit</artifactId>
202-
<version>4.12</version>
200+
<groupId>org.junit.vintage</groupId>
201+
<artifactId>junit-vintage-engine</artifactId>
202+
<version>4.12.2</version>
203203
<scope>test</scope>
204204
</dependency>
205205
<dependency>
@@ -346,6 +346,12 @@
346346
</excludes>
347347
</configuration>
348348
</plugin>
349+
<!-- Patch until mybatis-parent 30 (jdk9 build support) -->
350+
<plugin>
351+
<groupId>org.codehaus.mojo</groupId>
352+
<artifactId>animal-sniffer-maven-plugin</artifactId>
353+
<version>1.16</version>
354+
</plugin>
349355
</plugins>
350356

351357
<resources>

0 commit comments

Comments
 (0)