Merge pull request #7 from jeffgbutler/master

Misc. Build Improvements

Author: jeffgbutler

checkstyle-dsql.xml renamed to checkstyle-override.xml

@@ -58,7 +58,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
         <configuration>
-          <configLocation>checkstyle-dsql.xml</configLocation>
+          <configLocation>checkstyle-override.xml</configLocation>
         </configuration>
       </plugin>
     </plugins>
@@ -96,11 +96,10 @@
       <version>${junit.jupiter.version}</version>
       <scope>test</scope>
     </dependency>
-    <!-- added to support running JUnit5 tests with JUnit4.  Remove when eclipse/infinitest catch up. -->
     <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <version>4.12.2</version>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <version>${junit.jupiter.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -115,6 +114,16 @@
       <version>${junit.jupiter.version}</version>
       <scope>test</scope>
     </dependency>
+    <!-- added to support running JUnit5 tests with JUnit4.  Remove when Infinitest catches up. -->
+    <!-- Note: DO NOT make this the org.junit.vintage support.  All the tests are written with JUnit5.
+         Once Infinitest is ready we can remove this dependency and the corresponding @RunWith annotations
+     -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
 
     <dependency>
       <groupId>org.assertj</groupId>

pom.xml

@@ -32,19 +32,20 @@ echo "Current commit detected: ${commit_message}"
 #    a. Use -q option to only display Maven errors and warnings.
 #    b. Use --settings to force the usage of our "settings.xml" file.
 
-if [ $TRAVIS_JDK_VERSION == "oraclejdk8" ]; then
+if [ $TRAVIS_JDK_VERSION == "oraclejdk8" ] && [ $TRAVIS_REPO_SLUG == "mybatis/mybatis-dynamic-sql" ]; then
 
-  ./mvnw clean test jacoco:report coveralls:report
+  ./mvnw clean test jacoco:report coveralls:report -q
+  echo -e "Successfully ran coveralls under Travis job ${TRAVIS_JOB_NUMBER}"
 
-  if [ $TRAVIS_REPO_SLUG == "mybatis/mybatis-dynamic-sql" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ] && [[ "$commit_message" != *"[maven-release-plugin]"* ]]; then
+  if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ] && [[ "$commit_message" != *"[maven-release-plugin]"* ]]; then
     # Deploy to Sonatype
     ./mvnw clean deploy -q --settings ./travis/settings.xml
     echo -e "Successfully deployed SNAPSHOT artifacts to Sonatype under Travis job ${TRAVIS_JOB_NUMBER}"
   else
-    echo "Java Version does not support additional activity for travis CI"
+    echo "Not a master branch commit so no deployment of the new snapshot needed"
   fi
 else
   echo "Travis Pull Request: $TRAVIS_PULL_REQUEST"
   echo "Travis Branch: $TRAVIS_BRANCH"
   echo "Travis build skipped"
-fi
+fi