Various Build Updates

- Add JDK9
- Always publish the coveralls report
- Upgrade to new MyBatis parent
- Change checkstyle config so we always use our local config

Author: jeffgbutler

.travis.yml

@@ -5,9 +5,11 @@ before_install:
   - chmod +x mvnw
 
 jdk:
+  - oraclejdk9
   - oraclejdk8
 
 after_success:
+  - mvn clean test jacoco:report coveralls:report
   - chmod -R 777 ./travis/after_success.sh
   - ./travis/after_success.sh
 

checkstyle.xml renamed to checkstyle-dsql.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-       Copyright 2016-2017 the original author or authors.
+       Copyright 2016-2018 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -68,9 +68,7 @@
             <property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
         </module>
         <module name="NeedBraces"/>
-        <module name="LeftCurly">
-            <property name="maxLineLength" value="100"/>
-        </module>
+        <module name="LeftCurly"/>
         <module name="RightCurly">
             <property name="id" value="RightCurlySame"/>
             <property name="tokens" value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_DO"/>

pom.xml

@@ -1,6 +1,6 @@
 <!--
 
-       Copyright 2016-2017 the original author or authors.
+       Copyright 2016-2018 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.mybatis</groupId>
     <artifactId>mybatis-parent</artifactId>
-    <version>29</version>
+    <version>30</version>
   </parent>
   <groupId>org.mybatis.dynamic-sql</groupId>
   <artifactId>mybatis-dynamic-sql</artifactId>
@@ -58,7 +58,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
         <configuration>
-          <configLocation>checkstyle.xml</configLocation>
+          <configLocation>checkstyle-dsql.xml</configLocation>
         </configuration>
       </plugin>
     </plugins>
@@ -86,22 +86,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <dependencies>
-          <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-surefire-provider</artifactId>
-            <version>${junit.platform.version}</version>          
-          </dependency>
-          <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <version>${junit.jupiter.version}</version>
-          </dependency>
-        </dependencies>
-      </plugin>
     </plugins>
   </build>
 
@@ -114,9 +98,9 @@
     </dependency>
     <!-- added to support running JUnit5 tests with JUnit4.  Remove when eclipse/infinitest catch up. -->
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <version>4.12.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -135,7 +119,7 @@
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
-      <version>3.8.0</version>
+      <version>3.9.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

travis/after_success.sh

@@ -41,14 +41,6 @@ if [ $TRAVIS_REPO_SLUG == "mybatis/mybatis-dynamic-sql" ] && [ "$TRAVIS_PULL_REQ
     ./mvnw clean deploy -q --settings ./travis/settings.xml
     echo -e "Successfully deployed SNAPSHOT artifacts to Sonatype under Travis job ${TRAVIS_JOB_NUMBER}"
 
-	# Deploy to Coveralls
-    ./mvnw clean test jacoco:report coveralls:report -q --settings ./travis/settings.xml
-    echo -e "Successfully ran coveralls under Travis job ${TRAVIS_JOB_NUMBER}"
-
-	# Deploy to site
-	# various issues exist currently in building this so comment for now
-	# ./mvnw site site:deploy -q --settings ./travis/settings.xml
-	# echo -e "Successfully deploy site under Travis job ${TRAVIS_JOB_NUMBER}"
   else
     echo "Java Version does not support additional activity for travis CI"
   fi