Skip to content

Commit

Permalink
Fixed minor patch error
Browse files Browse the repository at this point in the history
small changes to publishing script
  • Loading branch information
fmpwizard committed Mar 14, 2015
1 parent a3b4afb commit cf84e10
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
7 changes: 3 additions & 4 deletions unsafePublishLift.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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!"

Expand All @@ -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
Expand Down

0 comments on commit cf84e10

Please sign in to comment.