Merge pull request #51 from hazendaz/master

Update dependencies (keeping mybatis at 3.4.4 as instructed ;))
mybatis · Dec 28, 2017 · 9cf9acf · 9cf9acf
2 parents 8214bb0 + 60e8978
commit 9cf9acf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.mybatis</groupId>
     <artifactId>mybatis-parent</artifactId>
-    <version>29</version>
+    <version>30</version>
     <relativePath />
   </parent>
 
@@ -82,16 +82,16 @@
     </dependency>
 
     <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>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>2.10.0</version>
+      <version>2.11.0</version>
       <scope>test</scope>
     </dependency>
 

diff --git a/travis/after_success.sh b/travis/after_success.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-#    Copyright 2016 the original author or authors.
+#    Copyright 2016-2017 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.