Arx update poi to 4.1.2

build.xml

@@ -24,9 +24,9 @@
             <filename name="**/dom4j-1.6.1.jar" />
             <filename name="**/stax-api-1.0.1.jar" />
             <filename name="**/xmlbeans-2.3.0.jar" />
-            <filename name="**/poi-3.10-FINAL-20140208.jar" />
-            <filename name="**/poi-ooxml-3.10-FINAL-20140208.jar" />
-            <filename name="**/poi-ooxml-schemas-3.10-FINAL-20140208.jar" />
+            <filename name="**/poi-4.1.2.jar" />
+            <filename name="**/poi-ooxml-4.1.2.jar" />
+            <filename name="**/poi-ooxml-schemas-4.1.2.jar" /> 
             <filename name="**/hppc-0.6.0.jar" />
             <filename name="**/univocity-parsers-2.8.4.jar" />
             <filename name="**/newtonraphson-0.0.1.jar" />

lib/ant/poi/NOTICE

@@ -1,21 +1,24 @@
-Apache POI
-Copyright 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-This product contains the DOM4J library (http://www.dom4j.org).
-Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
-
-This product contains parts that were originally based on software from BEA.
-Copyright (c) 2000-2003, BEA Systems, <http://www.bea.com/>.
-
-This product contains W3C XML Schema documents. Copyright 2001-2003 (c)
-World Wide Web Consortium (Massachusetts Institute of Technology, European
-Research Consortium for Informatics and Mathematics, Keio University)
-
-This product contains the Piccolo XML Parser for Java
-(http://piccolo.sourceforge.net/). Copyright 2002 Yuval Oren.
-
-This product contains the chunks_parse_cmds.tbl file from the vsdump program.
-Copyright (C) 2006-2007 Valek Filippov ([email protected])
+Apache POI
+Copyright 2003-2020 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (https://www.apache.org/).
+
+This product contains parts that were originally based on software from BEA.
+Copyright (c) 2000-2003, BEA Systems, <http://www.bea.com/> (dead link),
+which was acquired by Oracle Corporation in 2008.
+<http://www.oracle.com/us/corporate/Acquisitions/bea/index.html>
+<https://en.wikipedia.org/wiki/BEA_Systems>
+
+This product contains W3C XML Schema documents. Copyright 2001-2003 (c)
+World Wide Web Consortium (Massachusetts Institute of Technology, European
+Research Consortium for Informatics and Mathematics, Keio University)
+
+This product contains the chunks_parse_cmds.tbl file from the vsdump program.
+Copyright (C) 2006-2007 Valek Filippov ([email protected])
+
+This product contains parts of the eID Applet project
+<http://eid-applet.googlecode.com> and <https://github.com/e-Contract/eid-applet>.
+Copyright (c) 2009-2014
+FedICT (federal ICT department of Belgium), e-Contract.be BVBA (https://www.e-contract.be),
+Bart Hanssens from FedICT

pom.xml

@@ -317,7 +317,7 @@
         <dependency>
             <groupId>com.github.ralfstuckert.pdfbox-layout</groupId>
             <artifactId>pdfbox2-layout</artifactId>
-            <version>1.0.0</version>
+            <version>1.0.1</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -328,17 +328,17 @@
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
-            <version>4.1.1</version>
+            <version>4.1.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
-            <version>3.10-FINAL</version>
+            <version>4.1.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml-schemas</artifactId>
-            <version>3.10-FINAL</version>
+            <version>4.1.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.xmlbeans</groupId>

readme.md

@@ -35,7 +35,7 @@ Currently, the main development of ARX is carried out using Eclipse as an IDE an
 
 The Ant build script features various targets that can be used to build different versions of ARX (e.g. including GUI code or not). To build only the core code using Maven, set the system property `core` to `true`. This will build a platform independent jar with the ARX main code module and no GUI components:
 
-```$ mvn compile -Dcore=true``` 
+```$ mvn compile -Dcore=true -DskipTests``` 
 
 Contributing and code of conduct
 ------

src/gui/org/deidentifier/arx/gui/view/impl/wizard/ImportWizardPageExcel.java

@@ -509,7 +509,7 @@ private void readSheets() throws IOException {
 
             stream = new FileInputStream(comboLocation.getText());
             workbook = WorkbookFactory.create(stream);
-        } catch (InvalidFormatException e) {
+        } catch (IOException e) {
             throw new IOException(Resources.getMessage("ImportWizardPageExcel.14")); //$NON-NLS-1$
         } catch (IllegalArgumentException e) {
             throw new IOException(Resources.getMessage("ImportWizardPageExcel.14")); //$NON-NLS-1$

src/main/org/deidentifier/arx/io/ImportAdapterExcel.java

@@ -25,6 +25,7 @@
 
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
@@ -109,7 +110,7 @@ protected ImportAdapterExcel(ImportConfigurationExcel config) throws IOException
             throw new IllegalArgumentException("File type not supported");
         }
 
-        workbook.setMissingCellPolicy(Row.CREATE_NULL_AS_BLANK);
+        workbook.setMissingCellPolicy(Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
         Sheet sheet = workbook.getSheetAt(config.getSheetIndex());
         iterator = sheet.iterator();
 
@@ -122,15 +123,18 @@ protected ImportAdapterExcel(ImportConfigurationExcel config) throws IOException
             row = iterator.next();
             if (config.getContainsHeader()) {
                 if (!iterator.hasNext()) {
+                    workbook.close();
                     throw new IOException("File contains nothing but header");
                 }
             }
         } else {
+            workbook.close();
             throw new IOException("File contains no data");
         }
 
         // Create header
         header = createHeader();
+        workbook.close();
     }
 
     /**
@@ -185,7 +189,7 @@ public String[] next() {
         String[] result = new String[indexes.length];
         for (int i = 0; i < indexes.length; i++) {
 
-            row.getCell(indexes[i]).setCellType(Cell.CELL_TYPE_STRING);
+            row.getCell(indexes[i]).setCellType(CellType.STRING);
             result[i] = IOUtil.trim(row.getCell(indexes[i]).getStringCellValue());
 
             if (!dataTypes[i].isValid(result[i])) {
@@ -252,7 +256,7 @@ private String[] createHeader() {
 
             ImportColumn column = columns.get(i);
 
-            row.getCell(((ImportColumnExcel) column).getIndex()).setCellType(Cell.CELL_TYPE_STRING);
+            row.getCell(((ImportColumnExcel) column).getIndex()).setCellType(CellType.STRING);
             String name = IOUtil.trim(row.getCell(((ImportColumnExcel) column).getIndex()).getStringCellValue());
 
             if (config.getContainsHeader() && !name.equals("")) {

src/main/org/deidentifier/arx/io/ImportConfigurationExcel.java

@@ -18,7 +18,7 @@
 package org.deidentifier.arx.io;
 
 import org.apache.commons.io.FilenameUtils;
-import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.ss.usermodel.Row;
 
 /**
@@ -225,7 +225,7 @@ protected void prepare(Row row) {
             if (!column.isIndexSpecified()) {
                 boolean found = false;
                 for (int i = 0; i < row.getPhysicalNumberOfCells(); i++) {
-                    row.getCell(i).setCellType(Cell.CELL_TYPE_STRING);
+                    row.getCell(i).setCellType(CellType.STRING);
                     if (row.getCell(i).getStringCellValue().equals(column.getName())) {
                         found = true;
                         column.setIndex(i);