Merge branch '7.1' into 7.2

# Conflicts:
#	core/src/main/java/lucee/runtime/PageContextImpl.java
#	core/src/main/java/lucee/runtime/debug/DebuggerRegistry.java
#	core/src/main/java/lucee/transformer/bytecode/expression/var/VariableImpl.java
#	loader/build.xml
#	loader/pom.xml

Author: michaeloffner

core/src/main/java/lucee/runtime/config/ConfigAdmin.java

@@ -1710,8 +1710,7 @@ private void _removeJDBCDriver(ClassDefinition cd) throws PageException {
 				try {
 					OSGiUtil.uninstall(bl);
 				}
-				catch (BundleException e) {
-				}
+				catch (BundleException e) {}
 			}
 		}
 	}
@@ -1742,8 +1741,7 @@ private void _removeStartupHook(ClassDefinitionImpl cd) throws PageException {
 				try {
 					OSGiUtil.uninstall(bl);
 				}
-				catch (BundleException e) {
-				}
+				catch (BundleException e) {}
 			}
 		}
 	}
@@ -1778,8 +1776,7 @@ private void unloadStartupIfNecessary(ConfigPro config, ClassDefinition<?> cd, b
 			}
 			config.getStartups().remove(cd.getClassName());
 		}
-		catch (Exception e) {
-		}
+		catch (Exception e) {}
 	}
 
 	public void updateJDBCDriver(String label, String id, ClassDefinition cd, String connectionString) throws PageException {
@@ -1830,8 +1827,7 @@ private void _updateJDBCDriver(String label, String id, ClassDefinition cd, Stri
 				try {
 					OSGiUtil.uninstall(bl);
 				}
-				catch (BundleException e) {
-				}
+				catch (BundleException e) {}
 			}
 		}
 	}
@@ -4968,7 +4964,7 @@ private void unSyncUpdateExtension(Config config, RHExtension rhext, ResetFilter
 				Map<String, String> map;
 				while (itl.hasNext()) {
 					map = itl.next();
-					ClassDefinitionImpl cd = ClassDefinitionImpl.toClassDefinition(map, false, config.getIdentification());
+					ClassDefinitionImpl cd = (ClassDefinitionImpl) ClassDefinitionImpl.toClassDefinition(map, false, config.getIdentification());
 					String cfc = map.get("component");
 
 					// class
@@ -4984,11 +4980,12 @@ else if (!StringUtil.isEmpty(cfc, true)) {
 						filter.add("resetStartups");
 						reloadNecessary = true;
 						logger.info("extension", "Update Startup Hook [" + cfc + "] from extension [" + rhext.getMetadata().getName() + ":" + rhext.getVersion() + "]");
-					} 
+					}
 					// neither valid class nor component - log error
 					else {
-						logger.error("extension", "Startup Hook from extension [" + rhext.getMetadata().getName() + ":" + rhext.getVersion()
-								+ "] could not be registered: class definition [" + cd + "] is not a valid OSGi bundle (missing bundle-name/bundle-version?) and no component specified");
+						logger.error("extension",
+								"Startup Hook from extension [" + rhext.getMetadata().getName() + ":" + rhext.getVersion() + "] could not be registered: class definition [" + cd
+										+ "] is not a valid OSGi bundle (missing bundle-name/bundle-version?) and no component specified");
 					}
 				}
 			}
@@ -5371,7 +5368,7 @@ private void unSyncRemoveExtension(Config config, RHExtension rhe, RHExtension r
 				Map<String, String> map;
 				while (itl.hasNext()) {
 					map = itl.next();
-					ClassDefinitionImpl cd = ClassDefinitionImpl.toClassDefinition(map, false, config.getIdentification());
+					ClassDefinitionImpl cd = (ClassDefinitionImpl) ClassDefinitionImpl.toClassDefinition(map, false, config.getIdentification());
 					String cfc = map.get("component");
 
 					if (cd != null && (cd.isBundle() || cd.isMaven())) {
@@ -6135,7 +6132,7 @@ private boolean _removeContext(Config config, String realpath, boolean _store) t
 		Resource context = config.getConfigDir().getRealResource("context");
 		Resource trg = context.getRealResource(realpath);
 		if (trg.exists()) {
-			LogUtil.log( config, Log.LEVEL_INFO, "deploy", "_removeContext() removing: " + trg.getAbsolutePath() );
+			LogUtil.log(config, Log.LEVEL_INFO, "deploy", "_removeContext() removing: " + trg.getAbsolutePath());
 			trg.remove(true);
 			if (_store) ConfigAdmin._storeAndReload((ConfigPro) config);
 			ResourceUtil.removeEmptyFolders(context, null);
@@ -6430,8 +6427,7 @@ public BundleDefinition[] _updateExtension(ConfigPro config, RHExtension ext) th
 								return old;
 							}
 						}
-						catch (Exception ee) {
-						}
+						catch (Exception ee) {}
 					}
 				}
 				catch (Exception e) {

core/src/main/java/lucee/runtime/functions/FunctionHandlerPool.java

@@ -49,10 +49,6 @@ public static Object invoke(PageContext pc, Object[] args, String className) thr
 		return use(pc, className).invoke(pc, args);
 	}
 
-	public static Object invoke(PageContext pc, Object[] args, String className, String maven) throws PageException {
-		return use(pc, className, maven).invoke(pc, args);
-	}
-
 	/**
 	 * return a tag to use from a class
 	 *