Merge remote-tracking branch 'refs/remotes/origin/development'

Ortus-Solutions · Mar 5, 2020 · e9c3b53 · e9c3b53
2 parents 72eab49 + 8a05f07
commit e9c3b53
Show file tree

Hide file tree

Showing 257 changed files with 38,955 additions and 7,056 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,6 +12,7 @@ tests/work
 Icon?
 src/cfml/logs
 build/launch4j-*
+build/runwar
 tests/testbox
 /mxunit
 /apidocs/CommandBox-CommandDocs/

diff --git a/build/brew-template.rb b/build/brew-template.rb
@@ -11,16 +11,15 @@ class Commandbox < Formula
 
   bottle :unneeded
 
-  depends_on :java => "1.8"
+  depends_on java: '>= 8'
 
   resource "apidocs" do
     url "@repoPRDURL@/ortussolutions/commandbox/@stable-version@/commandbox-apidocs-@stable-version@.zip"
     sha256 "@apidocs.stable-sha256@"
   end
 
   def install
-    libexec.install "box"
-    (bin/"box").write_env_script libexec/"box", Language::Java.java_home_env("1.8")
+    bin.install "box"
     doc.install resource("apidocs")
   end
 

diff --git a/build/build.properties b/build/build.properties
@@ -10,17 +10,18 @@ java.debug=true
 
 #dependencies
 dependencies.dir=${basedir}/lib
-cfml.version=5.2.9.31
-cfml.loader.version=2.3.0
+cfml.version=5.3.4.80
+cfml.loader.version=2.3.9
 cfml.cli.version=${cfml.loader.version}.${cfml.version}
 lucee.version=${cfml.version}
 lucee.config.version=5.2.4.37
-jre.adoptVesionr=openjdk8
-jre.version=jdk8u202-b08
+jre.adoptVesionr=openjdk11
+jre.version=jdk-11.0.6+10
 launch4j.version=3.12
-runwar.version=3.8.1-SNAPSHOT
-jline.version=3.10.0
-jgit.version=5.3.0.201903130848-r
+runwar.version=4.0.5
+jline.version=3.13.0
+jansi.version=1.18
+jgit.version=5.5.1.201910021850-r
 
 #build locations
 build.type=localdev