jxlsteam#305: bump apache.poi & commons-compress

uek06 · Jul 16, 2024 · 584a7e4 · 584a7e4
1 parent db6ef04
commit 584a7e4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 16 deletions.
diff --git a/jxls-poi/pom.xml b/jxls-poi/pom.xml
@@ -11,7 +11,7 @@
 	<description>Apache POI based Transformer implementation for Jxls library</description>
 
 	<properties>
-		<poi.version>5.2.2</poi.version>
+		<poi.version>5.2.4</poi.version>
 	</properties>
 
 	<dependencies>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-compress</artifactId>
-            <version>1.25.0</version>
+            <version>1.26.0</version>
 			<scope>runtime</scope>
         </dependency>
         <dependency>

diff --git a/jxls-poi/src/main/java/org/jxls/transform/poi/PoiSheetCreator.java b/jxls-poi/src/main/java/org/jxls/transform/poi/PoiSheetCreator.java
@@ -1,9 +1,6 @@
 package org.jxls.transform.poi;
 
-import org.apache.poi.ss.usermodel.HeaderFooter;
-import org.apache.poi.ss.usermodel.PrintSetup;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFHeaderFooterProperties;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -65,12 +62,12 @@ protected void copySheetSetup(Sheet src, Sheet dest) {
         dest.setFitToPage(src.getFitToPage());
         dest.setForceFormulaRecalculation(src.getForceFormulaRecalculation());
         dest.setHorizontallyCenter(src.getHorizontallyCenter());
-        dest.setMargin(Sheet.LeftMargin, src.getMargin(Sheet.LeftMargin));
-        dest.setMargin(Sheet.RightMargin, src.getMargin(Sheet.RightMargin));
-        dest.setMargin(Sheet.TopMargin, src.getMargin(Sheet.TopMargin));
-        dest.setMargin(Sheet.BottomMargin, src.getMargin(Sheet.BottomMargin));
-        dest.setMargin(Sheet.HeaderMargin, src.getMargin(Sheet.HeaderMargin));
-        dest.setMargin(Sheet.FooterMargin, src.getMargin(Sheet.FooterMargin));
+        dest.setMargin(PageMargin.LEFT, src.getMargin(PageMargin.LEFT));
+        dest.setMargin(PageMargin.RIGHT, src.getMargin(PageMargin.RIGHT));
+        dest.setMargin(PageMargin.TOP, src.getMargin(PageMargin.TOP));
+        dest.setMargin(PageMargin.BOTTOM, src.getMargin(PageMargin.BOTTOM));
+        dest.setMargin(PageMargin.HEADER, src.getMargin(PageMargin.HEADER));
+        dest.setMargin(PageMargin.FOOTER, src.getMargin(PageMargin.FOOTER));
         dest.setPrintGridlines(src.isPrintGridlines());
         dest.setRowSumsBelow(src.getRowSumsBelow());
         dest.setRowSumsRight(src.getRowSumsRight());

diff --git a/jxls-poi/src/test/java/org/jxls3/MultiSheetTest.java b/jxls-poi/src/test/java/org/jxls3/MultiSheetTest.java
@@ -8,6 +8,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.apache.poi.ss.usermodel.PageMargin;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.junit.Assert;
@@ -122,10 +123,10 @@ private void verifySheet(TestWorkbook w, String name) {
         assertEquals("", sheet.getHeader().getRight());
         assertEquals("A", sheet.getFooter().getLeft());
         final double inch = 2.54d;
-        assertEquals(3d, sheet.getMargin(Sheet.LeftMargin) * inch, 0.05d); // 3 in the German Excel GUI
-        assertEquals(3d, sheet.getMargin(Sheet.RightMargin) * inch, 0.05d);
-        assertEquals(3d, sheet.getMargin(Sheet.TopMargin) * inch, 0.05d);
-        assertEquals(3d, sheet.getMargin(Sheet.BottomMargin) * inch, 0.05d);
+        assertEquals(3d, sheet.getMargin(PageMargin.LEFT) * inch, 0.05d); // 3 in the German Excel GUI
+        assertEquals(3d, sheet.getMargin(PageMargin.RIGHT) * inch, 0.05d);
+        assertEquals(3d, sheet.getMargin(PageMargin.TOP) * inch, 0.05d);
+        assertEquals(3d, sheet.getMargin(PageMargin.BOTTOM) * inch, 0.05d);
         assertTrue(sheet.getPrintSetup().getNoColor());
         assertEquals("1:1", sheet.getRepeatingRows().formatAsString()); // "$1:$1" in the Excel GUI
 	}