From b3c4ffc9375b82ecd0b144ce65cd2aeca28c2a0f Mon Sep 17 00:00:00 2001
From: Brad Wood <brad@bradwood.com>
Date: Mon, 13 Jun 2016 23:27:16 -0500
Subject: [PATCH 01/11] Bump for 3.2.0 release

---
 build/build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/build.xml b/build/build.xml
index d60932884..bbfe6e1be 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -15,7 +15,7 @@ External Dependencies:
     <!-- Version: UPDATE ON EACH RELEASE AS NEEDED -->
  	<property name="distro.groupID"				value="ortussolutions" />
  	<property name="distro.name"				value="commandbox"/>
- 	<property name="commandbox.version"			value="3.1.0"/>
+ 	<property name="commandbox.version"			value="3.2.0"/>
  	<property name="commandbox.stableVersion"	value="3.1.0"/>
 
     <!-- Time Label -->

From 99e8e543447e10c156e07c99dd1bf35cf52cec4b Mon Sep 17 00:00:00 2001
From: Brad Wood <brad@bradwood.com>
Date: Mon, 13 Jun 2016 23:45:25 -0500
Subject: [PATCH 02/11] Trying out prerelease identifier

---
 build/build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/build.xml b/build/build.xml
index bbfe6e1be..4ab1652a3 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -15,7 +15,7 @@ External Dependencies:
     <!-- Version: UPDATE ON EACH RELEASE AS NEEDED -->
  	<property name="distro.groupID"				value="ortussolutions" />
  	<property name="distro.name"				value="commandbox"/>
- 	<property name="commandbox.version"			value="3.2.0"/>
+ 	<property name="commandbox.version"			value="3.2.0-snapshot"/>
  	<property name="commandbox.stableVersion"	value="3.1.0"/>
 
     <!-- Time Label -->

From 359e089d65ebd95741e9bdcee434bd63a1259d0a Mon Sep 17 00:00:00 2001
From: Brad Wood <brad@bradwood.com>
Date: Tue, 14 Jun 2016 00:14:36 -0500
Subject: [PATCH 03/11] Remove prereleaseID for Launch4J

---
 build/build.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/build/build.xml b/build/build.xml
index 4ab1652a3..829f551ad 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -486,6 +486,11 @@ External Dependencies:
         <taskdef name="launch4j" 
         		 classname="net.sf.launch4j.ant.Launch4jTask" 
         		 classpath="./launch4j/launch4j.jar:./launch4j/lib/xstream.jar" />
+        
+        <propertyregex property="commandbox.version.noPrereleaseID"
+               input="${commandbox.version}"
+               select="[0-9]*\.[0-9]*\.[0-9]*" />
+                		 
         <launch4j>
 			<config headerType="console" 
 					outfile="${dist.dir}/box.exe" 
@@ -496,7 +501,7 @@ External Dependencies:
 					icon="${src.dir}/resources/box.ico"
 					stayAlive="true">
 					<jre path="./jre/" minVersion="1.7.0" />
-					<versionInfo fileVersion="${commandbox.version}.0"
+					<versionInfo fileVersion="${commandbox.version.noPrereleaseID}.${build.number}"
 								 txtFileVersion="${commandbox.version}.${build.number}"
 								 fileDescription="${commandbox.description}"
 								 copyright="Copyright since 2013 Ortus Solutions, Corp"

From 27bc2cc70d706389e6826237f3e575f6d8ef3bc9 Mon Sep 17 00:00:00 2001
From: Brad Wood <brad@bradwood.com>
Date: Tue, 14 Jun 2016 00:24:25 -0500
Subject: [PATCH 04/11] Update regex

---
 build/build.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build/build.xml b/build/build.xml
index 829f551ad..da11001c1 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -489,7 +489,8 @@ External Dependencies:
         
         <propertyregex property="commandbox.version.noPrereleaseID"
                input="${commandbox.version}"
-               select="[0-9]*\.[0-9]*\.[0-9]*" />
+               regexp="([0-9]*\.[0-9]*\.[0-9]*)"
+               select="\1" />
                 		 
         <launch4j>
 			<config headerType="console" 

From ad53095c4e54b339fa571057d13dc0290e978a53 Mon Sep 17 00:00:00 2001
From: Brad Wood <brad@bradwood.com>
Date: Tue, 14 Jun 2016 00:33:20 -0500
Subject: [PATCH 05/11] Update regex again

---
 build/build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/build.xml b/build/build.xml
index da11001c1..dc9675e7c 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -489,7 +489,7 @@ External Dependencies:
         
         <propertyregex property="commandbox.version.noPrereleaseID"
                input="${commandbox.version}"
-               regexp="([0-9]*\.[0-9]*\.[0-9]*)"
+               regexp="([0-9]*\.[0-9]*\.[0-9]*).*"
                select="\1" />
                 		 
         <launch4j>

From ab9f29175cef69abae423e9434ab8ced41742f30 Mon Sep 17 00:00:00 2001
From: Brad Wood <brad@bradwood.com>
Date: Tue, 14 Jun 2016 00:47:30 -0500
Subject: [PATCH 06/11] Fix product ver too

---
 build/build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/build.xml b/build/build.xml
index dc9675e7c..d259a4abc 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -506,7 +506,7 @@ External Dependencies:
 								 txtFileVersion="${commandbox.version}.${build.number}"
 								 fileDescription="${commandbox.description}"
 								 copyright="Copyright since 2013 Ortus Solutions, Corp"
-								 productVersion="${commandbox.version}.0"
+								 productVersion="${commandbox.version.noPrereleaseID}.${build.number}"
 								 txtProductVersion="${commandbox.version}.${build.number}"
 								 productName="CommandBox"
 								 companyName="Ortus Solutions, Corp"

From 7c03fbafbbf905a26ccd138e49039f9af882c633 Mon Sep 17 00:00:00 2001
From: Brad Wood <brad@bradwood.com>
Date: Tue, 14 Jun 2016 01:02:40 -0500
Subject: [PATCH 07/11] remove build number

---
 build/build.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index d259a4abc..f84304f9b 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -502,11 +502,11 @@ External Dependencies:
 					icon="${src.dir}/resources/box.ico"
 					stayAlive="true">
 					<jre path="./jre/" minVersion="1.7.0" />
-					<versionInfo fileVersion="${commandbox.version.noPrereleaseID}.${build.number}"
+					<versionInfo fileVersion="${commandbox.version.noPrereleaseID}.0"
 								 txtFileVersion="${commandbox.version}.${build.number}"
 								 fileDescription="${commandbox.description}"
 								 copyright="Copyright since 2013 Ortus Solutions, Corp"
-								 productVersion="${commandbox.version.noPrereleaseID}.${build.number}"
+								 productVersion="${commandbox.version.noPrereleaseID}.0"
 								 txtProductVersion="${commandbox.version}.${build.number}"
 								 productName="CommandBox"
 								 companyName="Ortus Solutions, Corp"

From 761b79586f47eb23df4806ed1eada8b12f10fa09 Mon Sep 17 00:00:00 2001
From: Brad Wood <brad@bradwood.com>
Date: Tue, 14 Jun 2016 01:44:36 -0500
Subject: [PATCH 08/11] Remove prerelease ID for rpm task

---
 build/build.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index f84304f9b..30493c310 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -18,6 +18,11 @@ External Dependencies:
  	<property name="commandbox.version"			value="3.2.0-snapshot"/>
  	<property name="commandbox.stableVersion"	value="3.1.0"/>
 
+    <propertyregex property="commandbox.version.noPrereleaseID"
+           input="${commandbox.version}"
+           regexp="([0-9]*\.[0-9]*\.[0-9]*).*"
+           select="\1" />
+                		 
     <!-- Time Label -->
 	<tstamp prefix="start"/>
 	<!-- Load build lib tasks -->
@@ -487,11 +492,6 @@ External Dependencies:
         		 classname="net.sf.launch4j.ant.Launch4jTask" 
         		 classpath="./launch4j/launch4j.jar:./launch4j/lib/xstream.jar" />
         
-        <propertyregex property="commandbox.version.noPrereleaseID"
-               input="${commandbox.version}"
-               regexp="([0-9]*\.[0-9]*\.[0-9]*).*"
-               select="\1" />
-                		 
         <launch4j>
 			<config headerType="console" 
 					outfile="${dist.dir}/box.exe" 
@@ -652,7 +652,7 @@ External Dependencies:
     <echo message="RPM repository location: ${commandbox.rpm.repourl}"/>
     <rpm-create rpm.repo="${rpm.repo}" rpm.release="1"
       rpm.reponame="ortus" rpm.baseurl="${commandbox.rpm.repourl}"
-      rpm.group="com.ortussolutions" rpm.name="${distro.name}" rpm.version="${commandbox.version}"
+      rpm.group="com.ortussolutions" rpm.name="${distro.name}" rpm.version="${commandbox.version.noPrereleaseID}"
       rpm.packager="${commandbox.packager.name} ${commandbox.packager.email}"
       rpm.url="${commandbox.supportURL}" failonerror="false"
       rpm.keyring="${ortus.sign.keyring}" rpm.key="${ortus.sign.key.id}" 
@@ -679,7 +679,7 @@ External Dependencies:
 	    <echo message="RPM repository location: ${commandbox.rpm.repourl.stable}" />
 	    <rpm-create rpm.repo="${rpm.repo.stable}" rpm.release="1"
 	      rpm.reponame="ortus" rpm.baseurl="${commandbox.rpm.repourl.stable}"
-	      rpm.group="com.ortussolutions" rpm.name="${distro.name}" rpm.version="${commandbox.version}"
+	      rpm.group="com.ortussolutions" rpm.name="${distro.name}" rpm.version="${commandbox.version.noPrereleaseID}"
 	      rpm.packager="${commandbox.packager.name} ${commandbox.packager.email}"
 	      rpm.url="${commandbox.supportURL}" failonerror="false"
 	      rpm.keyring="${ortus.sign.keyring}" rpm.key="${ortus.sign.key.id}" 

From e7c9b0b26960f146bcf88e830cf63f273a004aee Mon Sep 17 00:00:00 2001
From: Brad Wood <brad@bradwood.com>
Date: Tue, 14 Jun 2016 07:15:09 -0500
Subject: [PATCH 09/11] Move after ant contrib

---
 build/build.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index 30493c310..46ad9b516 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -17,12 +17,7 @@ External Dependencies:
  	<property name="distro.name"				value="commandbox"/>
  	<property name="commandbox.version"			value="3.2.0-snapshot"/>
  	<property name="commandbox.stableVersion"	value="3.1.0"/>
-
-    <propertyregex property="commandbox.version.noPrereleaseID"
-           input="${commandbox.version}"
-           regexp="([0-9]*\.[0-9]*\.[0-9]*).*"
-           select="\1" />
-                		 
+ 	                		 
     <!-- Time Label -->
 	<tstamp prefix="start"/>
 	<!-- Load build lib tasks -->
@@ -74,6 +69,11 @@ External Dependencies:
 	    </else>
 	</if>
 	
+    <propertyregex property="commandbox.version.noPrereleaseID"
+           input="${commandbox.version}"
+           regexp="([0-9]*\.[0-9]*\.[0-9]*).*"
+           select="\1" />
+           
 	<!-- Init Build -->
 	<target name="init" description="Init build" unless="src.isInit">
 		<!-- cleanup -->

From f5e0e3739145b3ece064693a8e09f7cabe9e3fa1 Mon Sep 17 00:00:00 2001
From: Brad Wood <brad@bradwood.com>
Date: Tue, 14 Jun 2016 07:35:54 -0500
Subject: [PATCH 10/11] Update all rpm file names

---
 build/build.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index 46ad9b516..d3e960e24 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -660,9 +660,9 @@ External Dependencies:
       <tarfileset file="${dist.dir}/box" prefix="/usr/bin" filemode="744" username="root" group="root"/>
     </rpm-create>
     <!-- Copy rpm to repo -->
-    <copy file="${rpm.repo}/${distro.name}-${commandbox.version}-1.noarch.rpm" tofile="${dist.dir}/${distro.name}-rpm-${commandbox.version}.rpm" />
+    <copy file="${rpm.repo}/${distro.name}-${commandbox.version.noPrereleaseID}-1.noarch.rpm" tofile="${dist.dir}/${distro.name}-rpm-${commandbox.version.noPrereleaseID}.rpm" />
     <!-- Build Checksum -->
-    <checksum file="${dist.dir}/${distro.name}-rpm-${commandbox.version}.rpm" forceoverwrite="true" fileext=".md5" />
+    <checksum file="${dist.dir}/${distro.name}-rpm-${commandbox.version.noPrereleaseID}.rpm" forceoverwrite="true" fileext=".md5" />
         
 	<antcall target="build.cli.rpm.stablerepo" />
 	

From 833d2db797dad9134261424106badf69759de55f Mon Sep 17 00:00:00 2001
From: Brad Wood <brad@bradwood.com>
Date: Tue, 14 Jun 2016 13:15:37 -0500
Subject: [PATCH 11/11] Fix ForgeBox URL to prevent redirects

---
 build/build.xml                   | 4 ++--
 src/cfml/system/util/ForgeBox.cfc | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index d3e960e24..d1730fdcf 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -15,8 +15,8 @@ External Dependencies:
     <!-- Version: UPDATE ON EACH RELEASE AS NEEDED -->
  	<property name="distro.groupID"				value="ortussolutions" />
  	<property name="distro.name"				value="commandbox"/>
- 	<property name="commandbox.version"			value="3.2.0-snapshot"/>
- 	<property name="commandbox.stableVersion"	value="3.1.0"/>
+ 	<property name="commandbox.version"			value="3.1.1"/>
+ 	<property name="commandbox.stableVersion"	value="3.1.1"/>
  	                		 
     <!-- Time Label -->
 	<tstamp prefix="start"/>
diff --git a/src/cfml/system/util/ForgeBox.cfc b/src/cfml/system/util/ForgeBox.cfc
index 1f0e380ca..d4d0fbf52 100644
--- a/src/cfml/system/util/ForgeBox.cfc
+++ b/src/cfml/system/util/ForgeBox.cfc
@@ -47,7 +47,7 @@ or just add DEBUG to the root logger
 		<cfscript>
 			
 			// Setup Properties
-			variables.APIURL = "https://forgebox.io/api/v1/";
+			variables.APIURL = "https://www.forgebox.io/api/v1/";
 			variables.installURL = "http://www.coldbox.org/forgebox/install/";
 			variables.types = "";