Merge branch 'develop'

cfsimplicity · Mar 7, 2022 · 46cbe90 · 46cbe90
2 parents 82d51af + 38d11ac
commit 46cbe90
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 3.4.1 - 7 March 2022
+
+- \#287 Upgrade POI to 5.2.1
+
 ## 3.4.0 - 4 March 2022
 
 - Enhancements
@@ -7,7 +11,7 @@
 	- \#283 Mismatched system/Lucee timezones causes read() to offset date values
 	- \#285 read() should use the first visible sheet in the workbook if no sheet is specified, ignoring hidden sheets
 
-## 3.3.0
+## 3.3.0 - 15 January 2022
 
 - \#282 Upgrade POI to 5.2.0
 

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 = "3.4.0";
+    this.version = "3.4.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="3.4.0" setter="false";
-	property name="osgiLibBundleVersion" default="5.2.0.0" setter="false"; //first 3 octets = POI version; increment 4th with other jar updates
+	property name="version" default="3.4.1" setter="false";
+	property name="osgiLibBundleVersion" default="5.2.1.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";
 	//commonly invoked POI class names

diff --git a/box.json b/box.json
@@ -1,10 +1,10 @@
 {
     "name" : "Spreadsheet CFML",
     "slug" : "spreadsheet-cfml",
-    "version" : "3.4.0",
+    "version" : "3.4.1",
     "shortDescription" : "CFML spreadsheet library",
     "author" : "Julian Halliwell",
-    "location" : "https://github.com/cfsimplicity/spreadsheet-cfml/archive/v3.4.0.zip",
+    "location" : "https://github.com/cfsimplicity/spreadsheet-cfml/archive/v3.4.1.zip",
     "homepage" : "https://github.com/cfsimplicity/spreadsheet-cfml",
     "projectURL" : "https://github.com/cfsimplicity/spreadsheet-cfml",
     "documentation" : "https://github.com/cfsimplicity/spreadsheet-cfml/blob/main/README.md",

diff --git a/build/lib-osgi.mf b/build/lib-osgi.mf
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Spreadsheet CFML
 Bundle-SymbolicName: spreadsheet-cfml
-Bundle-Version: 5.2.0.0
+Bundle-Version: 5.2.1.0
 Bundle-ClassPath: commons-codec-1.15.jar,
  commons-collections4-4.4.jar,
  commons-compress-1.21.jar,
  commons-csv-1.9.0.jar,
  commons-io-2.11.0.jar,
  commons-math3-3.6.1.jar,
  log4j-api-2.17.1.jar,
- poi-5.2.0.jar,
- poi-ooxml-5.2.0.jar,
- poi-ooxml-full-5.2.0.jar,
+ poi-5.2.1.jar,
+ poi-ooxml-5.2.1.jar,
+ poi-ooxml-full-5.2.1.jar,
  SparseBitSet-1.2.jar,
  spreadsheet-cfml.jar,
  xmlbeans-5.0.3.jar
diff --git a/build/task.cfc b/build/task.cfc
@@ -18,7 +18,7 @@ component{
 		variables.libPath = variables.rootPath & "lib/";
 		variables.classpathDirectories = [
 			variables.srcPath
-			,variables.libPath & "poi-ooxml-5.2.0.jar"
+			,variables.libPath & "poi-ooxml-5.2.1.jar"
 			,variables.libPath & "xmlbeans-5.0.3.jar"
 		];
 		var jarFileName = "spreadsheet-cfml.jar";

diff --git a/lib-osgi.jar b/lib-osgi.jar
diff --git a/lib/poi-5.2.0.jar → lib/poi-5.2.1.jar b/lib/poi-5.2.0.jar → lib/poi-5.2.1.jar
diff --git a/lib/poi-ooxml-5.2.0.jar → lib/poi-ooxml-5.2.1.jar b/lib/poi-ooxml-5.2.0.jar → lib/poi-ooxml-5.2.1.jar
diff --git a/lib/poi-ooxml-full-5.2.0.jar → lib/poi-ooxml-full-5.2.1.jar b/lib/poi-ooxml-full-5.2.0.jar → lib/poi-ooxml-full-5.2.1.jar
diff --git a/lib/spreadsheet-cfml.jar b/lib/spreadsheet-cfml.jar