Merge pull request #2683 from hazendaz/develop

Sort imports and cleanup pom for parent 36

Author: hazendaz

pom.xml

@@ -316,17 +316,6 @@
 
   <build>
     <plugins>
-     <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <configuration>
-          <rules>
-            <enforceBytecodeVersion>
-              <ignoredScopes>test</ignoredScopes>
-            </enforceBytecodeVersion>
-          </rules>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>

src/main/java/org/apache/ibatis/io/DefaultVFS.java

@@ -22,10 +22,10 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
-import java.nio.charset.StandardCharsets;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.InvalidPathException;
 import java.util.ArrayList;
 import java.util.Arrays;

src/test/java/org/apache/ibatis/cache/SerializedCacheTest.java

@@ -15,15 +15,15 @@
  */
 package org.apache.ibatis.cache;
 
-import org.apache.ibatis.cache.decorators.SerializedCache;
-import org.apache.ibatis.cache.impl.PerpetualCache;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.io.Serializable;
 import java.util.Objects;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.apache.ibatis.cache.decorators.SerializedCache;
+import org.apache.ibatis.cache.impl.PerpetualCache;
+import org.junit.jupiter.api.Test;
 
 class SerializedCacheTest {
 

src/test/java/org/apache/ibatis/submitted/repeatable/RepeatableDeleteTest.java

@@ -15,6 +15,10 @@
  */
 package org.apache.ibatis.submitted.repeatable;
 
+import java.io.IOException;
+import java.io.Reader;
+import java.sql.SQLException;
+
 import org.apache.ibatis.BaseDataTest;
 import org.apache.ibatis.io.Resources;
 import org.apache.ibatis.session.SqlSession;
@@ -23,10 +27,6 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import java.io.IOException;
-import java.io.Reader;
-import java.sql.SQLException;
-
 class RepeatableDeleteTest {
 
   @Test

src/test/java/org/apache/ibatis/submitted/repeatable/RepeatableErrorTest.java

@@ -15,16 +15,16 @@
  */
 package org.apache.ibatis.submitted.repeatable;
 
+import java.io.IOException;
+import java.io.Reader;
+
 import org.apache.ibatis.builder.BuilderException;
 import org.apache.ibatis.io.Resources;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.ibatis.session.SqlSessionFactoryBuilder;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import java.io.IOException;
-import java.io.Reader;
-
 class RepeatableErrorTest {
 
   @Test

src/test/java/org/apache/ibatis/submitted/repeatable/RepeatableInsertTest.java

@@ -15,6 +15,10 @@
  */
 package org.apache.ibatis.submitted.repeatable;
 
+import java.io.IOException;
+import java.io.Reader;
+import java.sql.SQLException;
+
 import org.apache.ibatis.BaseDataTest;
 import org.apache.ibatis.io.Resources;
 import org.apache.ibatis.session.SqlSession;
@@ -23,10 +27,6 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import java.io.IOException;
-import java.io.Reader;
-import java.sql.SQLException;
-
 class RepeatableInsertTest {
 
   @Test

src/test/java/org/apache/ibatis/submitted/repeatable/RepeatableSelectTest.java

@@ -15,6 +15,10 @@
  */
 package org.apache.ibatis.submitted.repeatable;
 
+import java.io.IOException;
+import java.io.Reader;
+import java.sql.SQLException;
+
 import org.apache.ibatis.BaseDataTest;
 import org.apache.ibatis.io.Resources;
 import org.apache.ibatis.session.SqlSession;
@@ -23,10 +27,6 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import java.io.IOException;
-import java.io.Reader;
-import java.sql.SQLException;
-
 class RepeatableSelectTest {
 
   @Test

src/test/java/org/apache/ibatis/submitted/repeatable/RepeatableUpdateTest.java

@@ -15,6 +15,10 @@
  */
 package org.apache.ibatis.submitted.repeatable;
 
+import java.io.IOException;
+import java.io.Reader;
+import java.sql.SQLException;
+
 import org.apache.ibatis.BaseDataTest;
 import org.apache.ibatis.io.Resources;
 import org.apache.ibatis.session.SqlSession;
@@ -23,10 +27,6 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import java.io.IOException;
-import java.io.Reader;
-import java.sql.SQLException;
-
 class RepeatableUpdateTest {
 
   @Test

src/test/java/org/apache/ibatis/submitted/sqlprovider/SqlProviderTest.java

@@ -30,8 +30,8 @@
 import java.util.Map;
 
 import org.apache.ibatis.BaseDataTest;
-import org.apache.ibatis.annotations.InsertProvider;
 import org.apache.ibatis.annotations.DeleteProvider;
+import org.apache.ibatis.annotations.InsertProvider;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.SelectProvider;
 import org.apache.ibatis.annotations.UpdateProvider;