From cf84e105c332246baaddb957dc9af96bcd4b6c93 Mon Sep 17 00:00:00 2001
From: Diego Medina <diego@fmpwizard.com>
Date: Sat, 14 Mar 2015 18:14:30 -0400
Subject: [PATCH] Fixed minor patch error small changes to publishing script

---
 .../src/main/scala/net/liftweb/util/SecurityHelpers.scala | 8 +++++---
 unsafePublishLift.sh                                      | 7 +++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/core/util/src/main/scala/net/liftweb/util/SecurityHelpers.scala b/core/util/src/main/scala/net/liftweb/util/SecurityHelpers.scala
index 758170d39c..a8ecb9ff0c 100644
--- a/core/util/src/main/scala/net/liftweb/util/SecurityHelpers.scala
+++ b/core/util/src/main/scala/net/liftweb/util/SecurityHelpers.scala
@@ -212,8 +212,10 @@ trait SecurityHelpers {
   def secureXML: XMLLoader[Elem] = {
     val parserFactory = SAXParserFactory.newInstance()
     parserFactory.setNamespaceAware(false)
-    parserFactory.setFeature("http://xml.org/sax/features/external-general-entities", false);
-    parserFactory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+    parserFactory.setFeature("http://xml.org/sax/features/external-general-entities", false)
+    parserFactory.setFeature("http://xml.org/sax/features/external-parameter-entities", false)
 
-    val saxParser = parserFactory.newSAXParser();
+    val saxParser = parserFactory.newSAXParser()
     XML.withSAXParser(saxParser)
+  }
+}
diff --git a/unsafePublishLift.sh b/unsafePublishLift.sh
index 4e264a3516..778f390d74 100755
--- a/unsafePublishLift.sh
+++ b/unsafePublishLift.sh
@@ -141,9 +141,7 @@ for MODULE in framework ; do
     echo -e "\nStarting build on $MODULE module"
     cd ${SCRIPT_DIR}/${MODULE} || die "Could not change to $MODULE directory!"
 
-    #commented out because we are already on the branch that will be used to publish 2.5.1
-    #git checkout -b ${RELEASE_VERSION} >> ${BUILDLOG} || die "Error creating work branch!"
-
+    git checkout -b ${RELEASE_VERSION} >> ${BUILDLOG} || die "Error creating work branch!"
 
     ./liftsh ";set version in ThisBuild :=  \"${RELEASE_VERSION}\" ; session save  " >> ${BUILDLOG} || die "Could not update project version in SBT!"
 
@@ -158,7 +156,8 @@ for MODULE in framework ; do
     # Do a separate build for each configured Scala version so we don't blow the heap
     for SCALA_VERSION in $(grep crossScalaVersions build.sbt | cut -d '(' -f 2 |  sed s/[,\)\"]//g ); do
         echo -n "  Building against Scala ${SCALA_VERSION}..."
-        if ! ./liftsh ++${SCALA_VERSION} clean update test publish >> ${BUILDLOG} ; then
+        #we run the tests before running the build, everything is ok, so skipping it here.
+        if ! ./liftsh ++${SCALA_VERSION} clean update publish >> ${BUILDLOG} ; then
             echo "failed! See build log for details"
             exit
         fi