Merge branch 'develop'

cfsimplicity · Jul 9, 2024 · ad26130 · ad26130
2 parents bf8f54d + ff77a06
commit ad26130
Show file tree

Hide file tree

Showing 24 changed files with 22 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 4.1.1 - 9 July 2024
+
+- Maintenance
+	-\#372 Upgrade POI to 5.3.0, commons-csv to 1.11.0 and excel-streaming-reader to 4.4.0
+
 ## 4.1.0 - 22 June 2024
 
 - Enhancements

diff --git a/ModuleConfig.cfc b/ModuleConfig.cfc
@@ -4,7 +4,7 @@ component{
     this.author = "Julian Halliwell";
     this.webURL = "https://github.com/cfsimplicity/spreadsheet-cfml";
     this.description = "CFML Spreadsheet Library";
-    this.version = "4.1.0";
+    this.version = "4.1.1";
     this.autoMapModels = false;
 
     function configure(){

diff --git a/Spreadsheet.cfc b/Spreadsheet.cfc
@@ -1,8 +1,8 @@
 component accessors="true"{
 
 	//"static"
-	property name="version" default="4.1.0" setter="false";
-	property name="osgiLibBundleVersion" default="5.2.5.3" setter="false"; //first 3 octets = POI version; increment 4th with other jar updates
+	property name="version" default="4.1.1" setter="false";
+	property name="osgiLibBundleVersion" default="5.3.0.0" setter="false"; //first 3 octets = POI version; increment 4th with other jar updates
 	property name="osgiLibBundleSymbolicName" default="spreadsheet-cfml" setter="false";
 	property name="exceptionType" default="cfsimplicity.spreadsheet" setter="false";
 	//configurable
@@ -1088,7 +1088,6 @@ component accessors="true"{
 		var workbook = getWorkbookHelper().createWorkBook( argumentCollection=createArgs );
 		getSheetHelper().validateSheetName( arguments.sheetName );
 		createSheet( workbook, arguments.sheetName, arguments.xmlFormat );
-		setActiveSheet( workbook, arguments.sheetName );
 		return workbook;
 	}
 

diff --git a/box.json b/box.json
@@ -1,7 +1,7 @@
 {
     "name" : "Spreadsheet CFML",
     "slug" : "spreadsheet-cfml",
-    "version" : "4.1.0",
+    "version" : "4.1.1",
     "shortDescription" : "CFML spreadsheet library",
     "author" : "Julian Halliwell",
     "location" : "forgeboxStorage",

diff --git a/build/lib-osgi.mf b/build/lib-osgi.mf
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Spreadsheet CFML
 Bundle-SymbolicName: spreadsheet-cfml
-Bundle-Version: 5.2.5.3
-Bundle-ClassPath: commons-codec-1.16.0.jar,
+Bundle-Version: 5.3.0.0
+Bundle-ClassPath: commons-codec-1.17.0.jar,
  commons-collections4-4.4.jar,
- commons-compress-1.25.0.jar,
- commons-csv-1.10.0.jar,
- commons-io-2.15.0.jar,
+ commons-compress-1.26.2.jar,
+ commons-csv-1.11.0.jar,
+ commons-io-2.16.1.jar,
  commons-math3-3.6.1.jar,
- excel-streaming-reader-4.3.1.jar,
- log4j-api-2.22.0.jar,
- poi-5.2.5.jar,
- poi-ooxml-5.2.5.jar,
- poi-ooxml-full-5.2.5.jar,
+ excel-streaming-reader-4.4.0.jar,
+ log4j-api-2.23.1.jar,
+ poi-5.3.0.jar,
+ poi-ooxml-5.3.0.jar,
+ poi-ooxml-full-5.3.0.jar,
  slf4j-api-2.0.13.jar,
  SparseBitSet-1.3.jar,
  spreadsheet-cfml.jar,
- xmlbeans-5.2.0.jar
+ xmlbeans-5.2.1.jar
diff --git a/build/task.cfc b/build/task.cfc
@@ -5,11 +5,11 @@ component{
 	property name="classpathDirectories";
 	property name="libPath";
 	property name="minimumSupportedJvmVersion" default="8";//update this as necessary
-	property name="ooxmlVersion" default="5.2.5";
+	property name="ooxmlVersion" default="5.3.0";
 	property name="rootPath";
 	property name="srcPath";
 	property name="tempDirectoryPath";
-	property name="xmlBeansVersion" default="5.2.0";
+	property name="xmlBeansVersion" default="5.2.1";
 
 	void function run(){
 		variables.tempDirectoryPath = getCWD() & "temp/";

diff --git a/lib-osgi.jar b/lib-osgi.jar
diff --git a/lib/commons-codec-1.16.0.jar b/lib/commons-codec-1.16.0.jar
diff --git a/lib/commons-codec-1.17.0.jar b/lib/commons-codec-1.17.0.jar
diff --git a/lib/commons-compress-1.25.0.jar b/lib/commons-compress-1.25.0.jar
diff --git a/lib/commons-compress-1.26.2.jar b/lib/commons-compress-1.26.2.jar
diff --git a/lib/commons-csv-1.10.0.jar b/lib/commons-csv-1.10.0.jar
diff --git a/lib/commons-csv-1.11.0.jar b/lib/commons-csv-1.11.0.jar
diff --git a/lib/commons-io-2.15.0.jar b/lib/commons-io-2.15.0.jar
diff --git a/lib/commons-io-2.16.1.jar b/lib/commons-io-2.16.1.jar
diff --git a/lib/excel-streaming-reader-4.3.1.jar → lib/excel-streaming-reader-4.4.0.jar b/lib/excel-streaming-reader-4.3.1.jar → lib/excel-streaming-reader-4.4.0.jar
diff --git a/lib/log4j-api-2.22.0.jar b/lib/log4j-api-2.22.0.jar
diff --git a/lib/log4j-api-2.23.1.jar b/lib/log4j-api-2.23.1.jar
diff --git a/lib/poi-5.2.5.jar → lib/poi-5.3.0.jar b/lib/poi-5.2.5.jar → lib/poi-5.3.0.jar
diff --git a/lib/poi-ooxml-5.2.5.jar → lib/poi-ooxml-5.3.0.jar b/lib/poi-ooxml-5.2.5.jar → lib/poi-ooxml-5.3.0.jar
diff --git a/lib/poi-ooxml-full-5.2.5.jar → lib/poi-ooxml-full-5.3.0.jar b/lib/poi-ooxml-full-5.2.5.jar → lib/poi-ooxml-full-5.3.0.jar
diff --git a/lib/spreadsheet-cfml.jar b/lib/spreadsheet-cfml.jar
diff --git a/lib/xmlbeans-5.2.0.jar → lib/xmlbeans-5.2.1.jar b/lib/xmlbeans-5.2.0.jar → lib/xmlbeans-5.2.1.jar
diff --git a/test/.gitignore b/test/.gitignore