Merge pull request mybatis#1928 from hazendaz/copyright

[ci] Disable jdk 15 due to bundle plugin support outstanding / sort imports / remove unused import
mnisummer · May 16, 2020 · c67c2db · c67c2db
2 parents 45846b0 + c43e29c
commit c67c2db
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,8 @@
 language: java
 
 jdk:
-  - openjdk15
+  # JDK15 is blocked due to maven-bundle-plugin and underlying bnd (see https://issues.apache.org/jira/browse/FELIX-6259)
+  #- openjdk15
   - openjdk14
   - openjdk13
   - openjdk11

diff --git a/src/main/java/org/apache/ibatis/session/defaults/DefaultSqlSession.java b/src/main/java/org/apache/ibatis/session/defaults/DefaultSqlSession.java
@@ -19,7 +19,6 @@
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

diff --git a/src/test/java/org/apache/ibatis/submitted/param_name_resolve/ActualParamNameTest.java b/src/test/java/org/apache/ibatis/submitted/param_name_resolve/ActualParamNameTest.java
@@ -15,6 +15,13 @@
  */
 package org.apache.ibatis.submitted.param_name_resolve;
 
+import static org.junit.Assert.assertEquals;
+
+import java.io.Reader;
+import java.sql.Connection;
+import java.util.Arrays;
+import java.util.List;
+
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.io.Resources;
 import org.apache.ibatis.jdbc.ScriptRunner;
@@ -24,13 +31,6 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
-import java.io.Reader;
-import java.sql.Connection;
-import java.util.Arrays;
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
-
 class ActualParamNameTest {
 
   private static SqlSessionFactory sqlSessionFactory;

diff --git a/src/test/java/org/apache/ibatis/submitted/param_name_resolve/NoActualParamNameTest.java b/src/test/java/org/apache/ibatis/submitted/param_name_resolve/NoActualParamNameTest.java
@@ -15,6 +15,14 @@
  */
 package org.apache.ibatis.submitted.param_name_resolve;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import java.io.Reader;
+import java.sql.Connection;
+import java.util.Arrays;
+import java.util.List;
+
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.exceptions.PersistenceException;
 import org.apache.ibatis.io.Resources;
@@ -25,14 +33,6 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
-import java.io.Reader;
-import java.sql.Connection;
-import java.util.Arrays;
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
 class NoActualParamNameTest {
 
   private static SqlSessionFactory sqlSessionFactory;