Merge branch 'v2.x.x'

Author: millij

README.md

@@ -30,7 +30,7 @@ To install manually, please check the [releases](https://github.com/millij/poi-o
 
 #### Dependencies
 
-The current implementation uses **POI version 3.17**.
+The current implementation uses **POI version 4.0.1**.
 
 
 ## Usage

build.gradle

@@ -11,7 +11,7 @@ repositories {
 }
 
 group = 'io.github.millij'
-version = '1.0.0'
+version = '2.0.0-SNAPSHOT'
 
 
 dependencies {
@@ -27,7 +27,8 @@ dependencies {
     compile group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.3'
 
     // Apache POI
-    compile group: 'org.apache.poi', name: 'poi-ooxml', version: '3.17'
+    compile group: 'org.apache.poi', name: 'poi', version: '4.0.1'
+    compile group: 'org.apache.poi', name: 'poi-ooxml', version: '4.0.1'
 
 
     // Test compile
@@ -51,8 +52,8 @@ test {
 // ----------------------------------------------------------------------------
 
 tasks.withType(JavaCompile) {
-    sourceCompatibility = 1.7
-    targetCompatibility = 1.7
+    sourceCompatibility = 1.8
+    targetCompatibility = 1.8
 }
 
 task javadocJar(type: Jar) {

src/main/java/io/github/millij/poi/ss/reader/XlsxReader.java

@@ -1,15 +1,12 @@
 package io.github.millij.poi.ss.reader;
 
 import static io.github.millij.poi.util.Beans.isInstantiableType;
-import io.github.millij.poi.SpreadsheetReadException;
-import io.github.millij.poi.ss.handler.RowContentsHandler;
-import io.github.millij.poi.ss.handler.RowListener;
 
 import java.io.InputStream;
 
+import org.apache.poi.ooxml.util.SAXHelper;
 import org.apache.poi.openxml4j.opc.OPCPackage;
 import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.util.SAXHelper;
 import org.apache.poi.xssf.eventusermodel.ReadOnlySharedStringsTable;
 import org.apache.poi.xssf.eventusermodel.XSSFReader;
 import org.apache.poi.xssf.eventusermodel.XSSFSheetXMLHandler;
@@ -21,6 +18,10 @@
 import org.xml.sax.InputSource;
 import org.xml.sax.XMLReader;
 
+import io.github.millij.poi.SpreadsheetReadException;
+import io.github.millij.poi.ss.handler.RowContentsHandler;
+import io.github.millij.poi.ss.handler.RowListener;
+
 
 /**
  * Reader impletementation of {@link Workbook} for an OOXML .xlsx file. This implementation is