Skip to content

Commit 8bcd404

Browse files
committed
Fixing release script
1 parent abb7077 commit 8bcd404

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

scripts/release-jetty.sh

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@ if [ ! -d "$ALT_DEPLOY_DIR" ] ; then
8888
fi
8989

9090
# DEPLOY_OPTS="-Dmaven.test.failure.ignore=true"
91-
DEPLOY_OPTS="-DskipTests -Dtest=None"
91+
DEPLOY_OPTS="-DskipTests"
9292
# DEPLOY_OPTS="$DEPLOY_OPTS -DaltDeploymentRepository=intarget::default::file://$ALT_DEPLOY_DIR/"
9393

9494
# Uncomment for Java 1.7
95-
export MAVEN_OPTS="-Xmx1g -XX:MaxPermSize=128m"
95+
export MAVEN_OPTS="-Xmx2g"
9696

9797
echo ""
9898
echo "-----------------------------------------------"
@@ -131,19 +131,13 @@ reportMavenTestFailures() {
131131

132132
echo ""
133133
if proceedyn "Are you sure you want to release using above? (y/N)" n; then
134+
mvn clean install -pl build-resources
134135
echo ""
135136
if proceedyn "Update VERSION.txt for $VER_RELEASE? (Y/n)" y; then
136-
# Uncomment alternate JVM for jetty 9.2 builds
137-
# JAVA_HOME_ORIG=$JAVA_HOME
138-
# PATH_ORIG=$PATH
139-
# JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.8.0_171.jdk/Contents/Home
140-
# PATH=$JAVA_HOME/bin:$PATH
141-
mvn --debug -N -Pupdate-version generate-resources
137+
mvn -N -Pupdate-version generate-resources
142138
cp VERSION.txt VERSION.txt.backup
143139
cat VERSION.txt.backup | sed -e "s/$VER_CURRENT/$VER_RELEASE/" > VERSION.txt
144140
rm VERSION.txt.backup
145-
# JAVA_HOME=$JAVA_HOME_ORIG
146-
# PATH=$PATH_ORIG
147141
echo "VERIFY the following files (in a different console window) before continuing."
148142
echo " VERSION.txt - top section"
149143
echo " target/version-tag.txt - for the tag commit message"

0 commit comments

Comments
 (0)