Merge branch 'development'

apidocs/strategy/commandbox/CommandBoxStrategy.cfc

@@ -18,8 +18,8 @@ component extends="docbox.strategy.api.HTMLAPIStrategy"{
 	property name="projectTitle" default="Untitled" type="string";
 
 	// Static variables.
-	variables.static.TEMPLATE_PATH	= "/strategy/commandbox/resources/templates";
-	variables.static.ASSETS_PATH 	= "/docbox/strategy/api/resources/static";
+	variables.TEMPLATE_PATH	= "/strategy/commandbox/resources/templates";
+	variables.ASSETS_PATH 	= "/docbox/strategy/api/resources/static";
 
 	/**
 	* Constructor
@@ -52,12 +52,12 @@ component extends="docbox.strategy.api.HTMLAPIStrategy"{
 		}
 
 		// copy over the static assets
-		directoryCopy( expandPath( variables.static.ASSETS_PATH ), getOutputDir(), true );
+		directoryCopy( expandPath( variables.ASSETS_PATH ), getOutputDir(), true );
 
 		//write the index template
 		var args = {
 			path 		 = getOutputDir() & "/index.html",
-			template 	 = "#variables.static.TEMPLATE_PATH#/index.cfm",
+			template 	 = "#variables.TEMPLATE_PATH#/index.cfm",
 			projectTitle = getProjectTitle()
 		};
 		writeTemplate( argumentCollection=args )
@@ -84,15 +84,15 @@ component extends="docbox.strategy.api.HTMLAPIStrategy"{
 		// overview summary
 		writeTemplate(
 			path			= getOutputDir() & "/overview-summary.html",
-			template		= "#variables.static.TEMPLATE_PATH#/overview-summary.cfm",
+			template		= "#variables.TEMPLATE_PATH#/overview-summary.cfm",
 			projectTitle 	= getProjectTitle(),
 			qPackages 		= qPackages
 		);
 
 		//overview frame
 		writeTemplate(
 			path			= getOutputDir() & "/overview-frame.html",
-			template		= "#variables.static.TEMPLATE_PATH#/overview-frame.cfm",
+			template		= "#variables.TEMPLATE_PATH#/overview-frame.cfm",
 			projectTitle	= getProjectTitle(),
 			qMetadata 		= arguments.qMetadata
 		);
@@ -111,7 +111,7 @@ component extends="docbox.strategy.api.HTMLAPIStrategy"{
 		var qInterfaces = 0;
 
 		// done this way as ACF compat. Does not support writeoutput with query grouping.
-		include "#variables.static.TEMPLATE_PATH#/packagePages.cfm";
+		include "#variables.TEMPLATE_PATH#/packagePages.cfm";
 
 		return this;
 	}
@@ -154,7 +154,7 @@ component extends="docbox.strategy.api.HTMLAPIStrategy"{
 			// write it out
 			writeTemplate(
 				path			= currentDir & "/#thisRow.name#.html",
-				template		= "#variables.static.TEMPLATE_PATH#/class.cfm",
+				template		= "#variables.TEMPLATE_PATH#/class.cfm",
 				projectTitle 	= variables.projectTitle,
 				package 		= thisRow.package,
 				name 			= thisRow.name,

apidocs/strategy/commandbox/resources/templates/packagePages.cfm

@@ -8,7 +8,7 @@
 
 		writeTemplate(
 			path			= currentDir & "/package-summary.html",
-			template		= "#variables.static.TEMPLATE_PATH#/package-summary.cfm",
+			template		= "#variables.TEMPLATE_PATH#/package-summary.cfm",
 			projectTitle 	= this.getProjectTitle(),
 			package 		= package,
 			qClasses 		= qClasses,
@@ -20,7 +20,7 @@
 		/**
 		writeTemplate(
 			path			= currentDir & "/package-frame.html",
-			template		= "#variables.static.TEMPLATE_PATH#/package-frame.cfm",
+			template		= "#variables.TEMPLATE_PATH#/package-frame.cfm",
 			projectTitle 	= this.getProjectTitle(),
 			package 		= package,
 			qClasses 		= qClasses,

build/brew-template.rb

@@ -15,8 +15,6 @@ class Commandbox < Formula
     regex(/Download CommandBox v?(\d+(?:\.\d+)+)/i)
   end
 
-  bottle :unneeded
-
   depends_on "openjdk"
 
   resource "apidocs" do

build/build.properties

@@ -12,16 +12,17 @@ java.debug=true
 dependencies.dir=${basedir}/lib
 cfml.version=5.3.7.47
 cfml.extensions=8D7FB0DF-08BB-1589-FE3975678F07DB17
-cfml.loader.version=2.5.13
+cfml.loader.version=2.6.3
 cfml.cli.version=${cfml.loader.version}.${cfml.version}
 lucee.version=${cfml.version}
+# Don't bump this version.  Need to remove this dependency from cfmlprojects.org
 lucee.config.version=5.2.4.37
 jre.version=jdk-11.0.11+9
-launch4j.version=3.12
-runwar.version=4.4.4
-jline.version=3.18.0
-jansi.version=1.18
-jgit.version=5.5.1.201910021850-r
+launch4j.version=3.14
+runwar.version=4.4.6
+jline.version=3.19.0
+jansi.version=2.3.2
+jgit.version=5.11.0.202103091610-r
 
 #build locations
 build.type=localdev

build/build.xml

@@ -16,8 +16,8 @@ External Dependencies:
  	<property name="distro.groupID"				value="ortussolutions" />
  	<property name="distro.name"				value="commandbox"/>
  	<!-- Special things happen when the version and stableVersion are the same value as that signifies a "stable" build.   -->
- 	<property name="commandbox.version"			value="5.3.0"/>
- 	<property name="commandbox.stableVersion"	value="5.3.0"/>
+ 	<property name="commandbox.version"			value="5.3.1"/>
+ 	<property name="commandbox.stableVersion"	value="5.3.1"/>
 
     <!-- Time Label -->
 	<tstamp prefix="start"/>
@@ -1064,10 +1064,19 @@ External Dependencies:
 			</exclusions>
 		</dependency>
 
+		<dependency groupId="org.eclipse.jgit" artifactId="org.eclipse.jgit.ssh.jsch" version="${jgit.version}" dest="${lib.dir}" repoId="jgit-repository" unzip="false" type="jar">
+			<exclusions>
+				<!-- Lucee already includes these jars -->
+				<exclusion groupId="org.slf4j" artifactId="slf4j-api" />
+				<exclusion groupId="org.apache.httpcomponents" artifactId="httpclient" />
+			</exclusions>
+		</dependency>		
+
 	    <dependency groupId="com.beust" artifactId="jcommander" version="1.47" dest="${lib.dir}" type="jar" unzip="false"/>
 	    <dependency groupId="net.minidev" artifactId="json-smart-mini" version="1.0.8" unzip="false" type="jar" dest="${lib.dir}"/>
 
 	    <!-- engine libs -->
+	    <!-- stable builds require "maven-repository", and snapshots require "sonatype-repository" -->
 	  	<dependency groupId="org.lucee" artifactId="lucee" version="${lucee.version}" dest="${lib.dir}" unzip="false" type="jar" repoId="maven-repository">
 			<exclusions>
 				<exclusion groupId="org.apache.ant" artifactId="ant" />

src/cfml/system/modules/jmespath/models/TreeInterpreter.cfc

@@ -296,6 +296,7 @@ component singleton displayname="TreeInterpreter" {
                 }
                 var merged = [];
                 for (i = 1; i <= original.len(); i++) {
+					if (isNull(original[i])) continue;
                     current = original[i];
                     if (isArray(current)) {
                         merged = merged.merge(current);

src/cfml/system/modules_app/package-commands/commands/package/install.cfc

@@ -85,12 +85,6 @@
  * install cflib:AreaParallelogram
  * install cflib-coldbox:AreaParallelogram
  * {code}
- * .
- * Projects from RIAForge.org can be installed via the riaforge endpoint.
- * .
- * {code:bash}
- * install riaforge:iwantmylastfm
- * {code}
  **/
 component aliases="install" {
 

src/cfml/system/modules_app/package-commands/commands/package/outdated.cfc

@@ -65,19 +65,23 @@ component aliases="outdated" {
 			print.line( aAllDependencies.filter( (d)=>d.isOutdated ) );
 			return;
 		}
-		print.table(
-			[ 'Package', 'Installed', 'Update', 'Latest', 'Location' ],
-			aAllDependencies.map( ( d ) => {
-				return [
-					d.slug & ( d.endpointName contains 'forgebox' ? '@' & d.version : ' (#d.endpointName#)' ),
-					d.packageVersion,
-					{ 'value': d.newVersion, 'options': d.isOutdated ? 'boldWhiteOnRed' : 'white' },
-					{ 'value': d.latestVersion, 'options': d.isLatest ? 'white' : 'boldWhiteOnOrange3' },
-					d.location
-				]
-			} )
-		);
-		print.text( 'Key: ' ).boldWhiteOnRed( 'Update Available' ).text( '   ' ).boldWhiteOnOrange3line( 'Major Update Available' ).line();
+
+		if( aAllDependencies.len() ) {
+			print.table(
+				aAllDependencies.map( ( d ) => {
+					return [
+						d.slug & ( d.endpointName contains 'forgebox' ? '@' & d.version : ' (#d.endpointName#)' ),
+						d.packageVersion,
+						{ 'value': d.newVersion, 'options': d.isOutdated ? 'boldWhiteOnRed' : 'white' },
+						{ 'value': d.latestVersion, 'options': d.isLatest ? 'white' : 'boldWhiteOnOrange3' },
+						d.location
+						]
+					} ),
+					"",
+					[ 'Package', 'Installed', 'Update', 'Latest', 'Location' ]
+			);
+			print.text( 'Key: ' ).boldWhiteOnRed( 'Update Available' ).text( '   ' ).boldWhiteOnOrange3line( 'Major Update Available' ).line();
+		}
 
 		// normal output
 		if( aOutdatedDependencies.len() gt 0 ){

src/cfml/system/modules_app/package-commands/commands/package/update.cfc

@@ -68,25 +68,32 @@ component aliases="update" {
 		 	verbose      = arguments.verbose,
 		 	includeSlugs = arguments.slug
 		 );
-
-		 var dependenciesToUpdate = aAllDependencies.filter( (d)=>d.isOutdated ); 
-
-		print.table(
-			[ 'Package', 'Installed', 'Update', 'Latest', 'Location' ],
-			aAllDependencies.map( ( d ) => {
-				return [
-					d.slug & ( d.endpointName contains 'forgebox' ? '@' & d.version : ' (#d.endpointName#)' ),
-					d.packageVersion,
-					{ 'value': d.newVersion, 'options': d.isOutdated ? 'boldWhiteOnRed' : 'white' },
-					{ 'value': d.latestVersion, 'options': d.isLatest ? 'white' : 'boldWhiteOnOrange3' },
-					d.location
-				]
-			} )
-		);
-		print.text( 'Key: ' ).boldWhiteOnRed( 'Update Available' ).text( '   ' ).boldWhiteOnOrange3line( 'Major Update Available' ).line();
+
+		 if( len( slug ) && !aAllDependencies.len() ) {
+		 	error( message='Package(s) [#slug#] not found.', detail='Use "outdated" to see what packages are available to update.  Only pass the pacakge name to this command.' );
+		 }
+
+		var dependenciesToUpdate = aAllDependencies.filter( (d)=>d.isOutdated );
+
+		if( aAllDependencies.len() ) {
+			print.table(
+				aAllDependencies.map( ( d ) => {
+					return [
+						d.slug & ( d.endpointName contains 'forgebox' ? '@' & d.version : ' (#d.endpointName#)' ),
+						d.packageVersion,
+						{ 'value': d.newVersion, 'options': d.isOutdated ? 'boldWhiteOnRed' : 'white' },
+						{ 'value': d.latestVersion, 'options': d.isLatest ? 'white' : 'boldWhiteOnOrange3' },
+						d.location
+						]
+					} ),
+					"",
+					[ 'Package', 'Installed', 'Update', 'Latest', 'Location' ]
+			);
+			print.text( 'Key: ' ).boldWhiteOnRed( 'Update Available' ).text( '   ' ).boldWhiteOnOrange3line( 'Major Update Available' ).line();
+		}
 
 		// Advice initial notice
-		if( dependenciesToUpdate.len() ){			
+		if( dependenciesToUpdate.len() ){
 			print.green( 'Found ' )
 				.boldGreen( '(#dependenciesToUpdate.len()#)' )
 				.green( ' Outdated Dependenc#( dependenciesToUpdate.len()  == 1 ? 'y' : 'ies' )# ' )
@@ -97,7 +104,7 @@ component aliases="update" {
 				return;
 			}
 		} else {
-			print.boldYellowLine( 'There are no outdated dependencies!' );
+			print.blueLine( 'There are no outdated dependencies!' );
 			return;
 		}
 

src/cfml/system/modules_app/server-commands/commands/server/list.cfc

@@ -112,7 +112,7 @@ component {
 
 			// Process output
 			if( JSON ) {
-				print.line( servers );
+				print.line( servers.valueArray() );
 			} else {
 				servers.each( ( serverName, thisServerInfo ) => {
 					// Print out Header

src/cfml/system/modules_app/server-commands/commands/server/stop.cfc

@@ -14,19 +14,21 @@ component aliases="stop" {
 	property name="serverService" inject="ServerService";
 
 	/**
-	 * @name.hint the short name of the server to stop
+	 * @name the short name of the server to stop
 	 * @name.optionsUDF serverNameComplete
-	 * @directory.hint web root for the server
+	 * @directory web root for the server
 	 * @serverConfigFile The path to the server's JSON file.
-	 * @forget.hint Remove the directory information from disk
-	 * @all.hint Stop ALL running servers
+	 * @forget Remove the directory information from disk
+	 * @all Stop ALL running servers
+	 * @verbose Show raw output of stop command
 	 **/
 	function run(
 		string name,
 		string directory,
 		String serverConfigFile,
 		boolean forget=false,
-		boolean all=false ){
+		boolean all=false,
+		boolean verbose=false ){
 
 
 		if( arguments.all ) {
@@ -63,6 +65,9 @@ component aliases="stop" {
 				print.boldWhiteOnRedLine( 'ERROR' );
 				print.boldRedLine( results.messages );
 			} else {
+				if( verbose && len( results.messages ) ) {
+					print.line( results.messages )
+				}
 				print.greenLine( 'Stopped' );
 			}