Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jetty-9.3.x' of github.com:eclipse/jetty.project into jetty-9.3.x

This commit is contained in:
Joakim Erdfelt 2016-12-23 14:54:28 -07:00
parent 529dea0a7e a917ed5124
commit 827f94991b
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
View File

@ -552,6 +552,11 @@ public class StartArgs
{ {
CommandLineBuilder cmd = new CommandLineBuilder(); CommandLineBuilder cmd = new CommandLineBuilder();
// Special Stop/Shutdown properties
ensureSystemPropertySet("STOP.PORT");
ensureSystemPropertySet("STOP.KEY");
ensureSystemPropertySet("STOP.WAIT");
if (addJavaInit) if (addJavaInit)
{ {
cmd.addRawArg(CommandLineBuilder.findJavaBin()); cmd.addRawArg(CommandLineBuilder.findJavaBin());
@ -577,11 +582,7 @@ public class StartArgs
cmd.addRawArg(getMainClassname()); cmd.addRawArg(getMainClassname());
} }
// Special Stop/Shutdown properties
ensureSystemPropertySet("STOP.PORT");
ensureSystemPropertySet("STOP.KEY");
ensureSystemPropertySet("STOP.WAIT");
// pass properties as args or as a file // pass properties as args or as a file
if (dryRun && exec_properties==null) if (dryRun && exec_properties==null)
{ {

13
scripts/release-jetty.sh
View File

@ -66,6 +66,7 @@ GIT_USER_EMAIL=`git config --get user.email`
#fi #fi
VER_CURRENT=`sed -e "s/xmlns/ignore/" pom.xml | xmllint --xpath "/project/version/text()" -` VER_CURRENT=`sed -e "s/xmlns/ignore/" pom.xml | xmllint --xpath "/project/version/text()" -`
echo "Current pom.xml Version: ${VER_CURRENT}"
read -e -p "Release Version ? " VER_RELEASE read -e -p "Release Version ? " VER_RELEASE
read -e -p "Next Dev Version ? " VER_NEXT read -e -p "Next Dev Version ? " VER_NEXT
# VER_RELEASE=9.3.5.v20151012 # VER_RELEASE=9.3.5.v20151012
@ -87,8 +88,8 @@ if [ ! -d "$ALT_DEPLOY_DIR" ] ; then
mkdir -p "$ALT_DEPLOY_DIR" mkdir -p "$ALT_DEPLOY_DIR"
fi fi
DEPLOY_OPTS="-Dmaven.test.failure.ignore=true" # DEPLOY_OPTS="-Dmaven.test.failure.ignore=true"
# DEPLOY_OPTS="-Dtest=None" DEPLOY_OPTS="-Dtest=None"
# DEPLOY_OPTS="$DEPLOY_OPTS -DaltDeploymentRepository=intarget::default::file://$ALT_DEPLOY_DIR/" # DEPLOY_OPTS="$DEPLOY_OPTS -DaltDeploymentRepository=intarget::default::file://$ALT_DEPLOY_DIR/"
echo "" echo ""
@ -129,10 +130,13 @@ echo ""
if proceedyn "Are you sure you want to release using above? (y/N)" n; then if proceedyn "Are you sure you want to release using above? (y/N)" n; then
echo "" echo ""
if proceedyn "Update VERSION.txt for $VER_RELEASE? (Y/n)" y; then if proceedyn "Update VERSION.txt for $VER_RELEASE? (Y/n)" y; then
mvn -N -Pupdate-version mvn -N -Pupdate-version generate-resources
cp VERSION.txt VERSION.txt.backup cp VERSION.txt VERSION.txt.backup
cat VERSION.txt.backup | sed -e "s/$VER_CURRENT/$VER_RELEASE/" > VERSION.txt cat VERSION.txt.backup | sed -e "s/$VER_CURRENT/$VER_RELEASE/" > VERSION.txt
rm VERSION.txt.backup rm VERSION.txt.backup
echo "VERIFY the following files (in a different console window) before continuing."
echo " VERSION.txt - top section"
echo " target/vers-tag.txt - for the tag commit message"
fi fi
# This is equivalent to 'mvn release:prepare' # This is equivalent to 'mvn release:prepare'
@ -146,7 +150,8 @@ if proceedyn "Are you sure you want to release using above? (y/N)" n; then
fi fi
if proceedyn "Create Tag $TAG_NAME? (Y/n)" y; then if proceedyn "Create Tag $TAG_NAME? (Y/n)" y; then
echo "TODO: Sign tags with GIT_USER_EMAIL=$GIT_USER_EMAIL" echo "TODO: Sign tags with GIT_USER_EMAIL=$GIT_USER_EMAIL"
git tag -m "Creating tag $TAG_NAME" $TAG_NAME echo "Using target/vers-tag.txt as tag text"
git tag --file=target/vers-tag.txt $TAG_NAME
fi fi
# This is equivalent to 'mvn release:perform' # This is equivalent to 'mvn release:perform'