Merge pull request #25 from tiagotcsilva/master

Update on poi libs version
concordion · Dec 21, 2023 · d550f0a · d550f0a
2 parents e035dd9 + 942f4b4
commit d550f0a
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '8', '11', '15' ]
+        java: [ '11', '15', '17' ]
     name: Java ${{ matrix.Java }}
 
     steps:

diff --git a/build.gradle b/build.gradle
@@ -4,13 +4,19 @@ apply plugin: 'eclipse'
 description = 'An extension to Concordion to use Excel spreadsheets rather than HTML as specifications'
 
 ext {
-    poiVersion = '4.1.0'
+    poiVersion = '5.2.3'
     developers = {
         developer {
             id 'robmoffat'
             name 'Rob Moffat'
             roles { role 'Extension Contributor' }
             url 'http://kite9.com'
+        },
+        developer {
+            id 'tiagotcsilva'
+            name 'Tiago da Costa Silva'
+            roles { role 'Extension Contributor' }
+            url 'http://kite9.com'
         }
     }
     inceptionYear = '2014'
@@ -19,9 +25,10 @@ ext {
 dependencies {
     implementation "org.apache.poi:poi:$poiVersion"
     implementation "org.apache.poi:poi-ooxml:$poiVersion"
-    implementation "org.apache.poi:poi-ooxml-schemas:$poiVersion"
+    implementation "org.apache.poi:poi-ooxml-lite:$poiVersion"
     implementation 'org.apache.commons:commons-lang3:3.3.2'
 	testImplementation 'org.xmlunit:xmlunit-core:2.1.0'
+    testImplementation "org.junit.vintage:junit-vintage-engine:5.9.3"
 }
 
 test {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/org/concordion/ext/excel/conversion/cell/CachedValueFormulaEvaluator.java b/src/main/java/org/concordion/ext/excel/conversion/cell/CachedValueFormulaEvaluator.java
@@ -45,7 +45,6 @@ public CellType evaluateFormulaCell(Cell cell) {
 		return cell.getCachedFormulaResultType();
 	}
 
-	@Override
 	public CellType evaluateFormulaCellEnum(Cell cell) {
 		return cell.getCachedFormulaResultType();
 	}

diff --git a/src/main/java/org/concordion/ext/excel/conversion/cellcontent/DefaultStyleConverter.java b/src/main/java/org/concordion/ext/excel/conversion/cellcontent/DefaultStyleConverter.java
@@ -133,7 +133,7 @@ protected void extractFontStyle(Cell c, StringBuilder out) {
 
 	protected Font getFont(Cell c) {
 		CellStyle style = c.getCellStyle();
-		short fontIndex = style.getFontIndex();
+		int fontIndex = style.getFontIndex();
 		Sheet s = c.getSheet();
 		Font f = s.getWorkbook().getFontAt(fontIndex);
 		return f;

diff --git a/src/main/java/org/concordion/ext/excel/conversion/row/BasicTableStrategy.java b/src/main/java/org/concordion/ext/excel/conversion/row/BasicTableStrategy.java
@@ -2,6 +2,7 @@
 
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Row.MissingCellPolicy;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFTable;
 import org.concordion.ext.excel.ExcelCellConversionException;
@@ -46,9 +47,9 @@ public void process(XSSFTable table, HTMLBuilder result) {
 				result.startTag("tr");
 				for (int i = columnFrom; i <= columnTo; i++) {
 					if (header) {
-						headerCell.process(r.getCell(i), result);
+						headerCell.process(r.getCell(i, MissingCellPolicy.CREATE_NULL_AS_BLANK), result);
 					} else {
-						bodyCell.process(r.getCell(i), result);
+						bodyCell.process(r.getCell(i, MissingCellPolicy.CREATE_NULL_AS_BLANK), result);
 					}
 				}