Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update on poi libs version #25

Merged
merged 5 commits into from
Dec 21, 2023
Merged

Update on poi libs version #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fc192fe
fix: removing unused method wish was causing compilation error becaus…
Dec 18, 2023
941f7b1
feat: upgrading poi libs version to 5.2.3
Dec 18, 2023
6bbce01
fix: fixing default Row.getCell MissingCellPolicy to avoid NullPointe…
Dec 19, 2023
81deb5d
fix: removing jdk8 adding jd17 test execution
Dec 20, 2023
942f4b4
feat: upgrading gradle version to 8.5
Dec 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [ '8', '11', '15' ]
java: [ '11', '15', '17' ]
name: Java ${{ matrix.Java }}

steps:
Expand Down
11 changes: 9 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion src/main/java/org/concordion/ext/excel/conversion/cell/CachedValueFormulaEvaluator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ public CellType evaluateFormulaCell(Cell cell) {
return cell.getCachedFormulaResultType();
}

@Override
public CellType evaluateFormulaCellEnum(Cell cell) {
return cell.getCachedFormulaResultType();
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/concordion/ext/excel/conversion/cellcontent/DefaultStyleConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/org/concordion/ext/excel/conversion/row/BasicTableStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
}

Expand Down
Loading