Merge branch 'develop'

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 3.4.4 - 25 March 2022
+
+- \#289 Prevent one-off OSGi bundle errors when the bundle version changes
+- \#290 Upgrade POI to 5.2.2
+
 ## 3.4.3 - 8 March 2022
 
 - \#288 sheetInfo() should default to the currently active sheet, not the first

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.3";
+    this.version = "3.4.4";
     this.autoMapModels = false;
 
     function configure(){

Spreadsheet.cfc

@@ -1,8 +1,8 @@
 component accessors="true"{
 
 	//"static"
-	property name="version" default="3.4.3" 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="version" default="3.4.4" setter="false";
+	property name="osgiLibBundleVersion" default="5.2.2.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

box.json

@@ -1,10 +1,10 @@
 {
     "name" : "Spreadsheet CFML",
     "slug" : "spreadsheet-cfml",
-    "version" : "3.4.3",
+    "version" : "3.4.4",
     "shortDescription" : "CFML spreadsheet library",
     "author" : "Julian Halliwell",
-    "location" : "https://github.com/cfsimplicity/spreadsheet-cfml/archive/v3.4.3.zip",
+    "location" : "https://github.com/cfsimplicity/spreadsheet-cfml/archive/v3.4.4.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",

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.1.0
+Bundle-Version: 5.2.2.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.1.jar,
- poi-ooxml-5.2.1.jar,
- poi-ooxml-full-5.2.1.jar,
+ log4j-api-2.17.2.jar,
+ poi-5.2.2.jar,
+ poi-ooxml-5.2.2.jar,
+ poi-ooxml-full-5.2.2.jar,
  SparseBitSet-1.2.jar,
  spreadsheet-cfml.jar,
  xmlbeans-5.0.3.jar

build/task.cfc

@@ -18,7 +18,7 @@ component{
 		variables.libPath = variables.rootPath & "lib/";
 		variables.classpathDirectories = [
 			variables.srcPath
-			,variables.libPath & "poi-ooxml-5.2.1.jar"
+			,variables.libPath & "poi-ooxml-5.2.2.jar"
 			,variables.libPath & "xmlbeans-5.0.3.jar"
 		];
 		var jarFileName = "spreadsheet-cfml.jar";

helpers/class.cfc

@@ -30,12 +30,22 @@ component extends="base" accessors="true"{
 
 	private any function loadClassUsingOsgi( required string javaclass ){
 		library().setJavaClassesLastLoadedVia( "OSGi bundle" );
-		return library().getOsgiLoader().loadClass(
-			className: arguments.javaclass
-			,bundlePath: this.getRootPath() & "lib-osgi.jar"
-			,bundleSymbolicName: library().getOsgiLibBundleSymbolicName()
-			,bundleVersion: library().getOsgiLibBundleVersion()
-		);
+		try{
+			return library().getOsgiLoader().loadClass(
+				className: arguments.javaclass
+				,bundlePath: this.getRootPath() & "lib-osgi.jar"
+				,bundleSymbolicName: library().getOsgiLibBundleSymbolicName()
+				,bundleVersion: library().getOsgiLibBundleVersion()
+			);
+		}
+		catch( org.osgi.framework.BundleException exception ){
+			if( exception.message.FindNoCase( "is not available in version" ) ){
+				library().flushOsgiBundle();
+				retry;
+			}
+			else
+				rethrow;
+		}
 	}
 
 }