Allow builds with new version schema
Dash between version and additional build information
(<version>-<additional info>) are now optional.
diff --git a/maven_plugin_version-master/pom.xml b/maven_plugin_version-master/pom.xml
index 14a9be3..ba70e01 100644
--- a/maven_plugin_version-master/pom.xml
+++ b/maven_plugin_version-master/pom.xml
@@ -31,8 +31,7 @@
<!-- Release Control -->
<master_release_pushChanges>false</master_release_pushChanges>
- <master_release_milestoneVersion>I</master_release_milestoneVersion>
- <master_release_newVersion>${base.version}-${master_release_milestoneVersion}</master_release_newVersion>
+ <master_release_newVersion>${project.version}</master_release_newVersion>
<master_release_tagName>${master_release_newVersion}</master_release_tagName>
<master_release_checkinMessage>[release] version updated to ${project.version}</master_release_checkinMessage>
<master_ossrh_autoReleaseAfterClose>false</master_ossrh_autoReleaseAfterClose>
@@ -858,7 +857,7 @@
<includes>
<include>pom.xml</include>
</includes>
- <!-- token finds the <scm><tag> and places the ${master_release_tagName} string there -->
+ <!-- token finds the <master_dependency_eclipseSettings_master_version> and places the ${master_release_newVersion} string there -->
<token>(\\x3cmaster_dependency_eclipseSettings_master_version\\x3e).*(\\x3c/master_dependency_eclipseSettings_master_version\\x3e)</token>
<value>$1${master_release_newVersion}$2</value>
<unescape>true</unescape>
diff --git a/shell_scripts/release.sh b/shell_scripts/release.sh
index 2e5fba9..d5b0dde 100755
--- a/shell_scripts/release.sh
+++ b/shell_scripts/release.sh
@@ -4,20 +4,19 @@
. $BASEDIR/_functions.sh
GIT_USERNAME=
-RELEASE=
-TAG=
-NEXT_DEVELOPMENT_VERSION=
+VERSION=
+NEXT_VERSION=
function usage {
cat << EOF
- ${PRG} [-h] --git_username <EGerritUser> --release <RELEASE> --development <NEXT_DEVELOPMENT> --tag <TAG>
+ ${PRG} [-h] --git_username <GitUser> --release <RELEASE> --development <NEXT_DEVELOPMENT> --tag <TAG>
-h - Usage info
- -u | --git_username <EGerritUser> - Eclipse Gerrit Username of Commiter, SSH Key is used for authorisation
- -r | --release <RELEASE> - <RELEASE> name
- -d | --development <NEXT_DEVELOPMENT> - <NEXT_DEVELOPMENT> name
- -t | --tag <TAG> - <TAG> name (Optional / Default: Project Version)
+ -u | --git_username <GitUser> - Eclipse Git Username, SSH Key is used for authorisation
+ -r | --release <VERSION> - <VERSION> name
+ -d | --development <NEXT_VERSION> - <NEXT_VERSION> name
+ -t | --tag <TAG> - <TAG> name (Optional / Default: <VERSION>)
Example: ${PRG} -u sleicht -r 1.7 -d 1.7.1-SNAPSHOT -t v1.7
@@ -32,10 +31,10 @@
GIT_USERNAME=$1
;;
-r | --release ) shift
- RELEASE=$1
+ VERSION=$1
;;
-d | --development ) shift
- NEXT_DEVELOPMENT=$1
+ NEXT_VERSION=$1
;;
-t | --tag ) shift
TAG=$1
@@ -51,20 +50,20 @@
}
get_options $*
-if [[ -z "$GIT_USERNAME" ]]; then
- echo "[ERROR]: <EGerritUser> missing"
+if [[ -z "$GIT_USERNAME" ]]; then
+ echo "[ERROR]: <GitUser> missing"
usage
exit 7
fi
-if [[ -z "$RELEASE" ]]; then
- echo "[ERROR]: <RELEASE> missing"
+if [[ -z "$VERSION" ]]; then
+ echo "[ERROR]: <VERSION> missing"
usage
exit 7
fi
-if [[ -z "$NEXT_DEVELOPMENT" ]]; then
- echo "[ERROR]: <NEXT_DEVELOPMENT> missing"
+if [[ -z "$NEXT_VERSION" ]]; then
+ echo "[ERROR]: <NEXT_VERSION> missing"
usage
exit 7
fi
@@ -74,7 +73,7 @@
fi
_MAVEN_OPTS="$_MAVEN_OPTS -e -B"
-mvn -Prelease.setversion -Dmaster_release_newVersion=$RELEASE -f maven_plugin_version-master -N $_MAVEN_OPTS
+mvn -Prelease.setversion -Dmaster_release_newVersion=$VERSION -f maven_plugin_version-master -N $_MAVEN_OPTS
processError
mvn -Prelease.checkin -Declipse_gerrit_username=$GIT_USERNAME -f maven_plugin_version-master $_MAVEN_OPTS
@@ -83,7 +82,7 @@
mvn -Prelease.tag -Declipse_gerrit_username=$GIT_USERNAME -Dmaster_release_pushChanges=false -f maven_plugin_version-master $_MAVEN_OPTS
processError
-mvn -Prelease.setversion -Dmaster_release_newVersion=$NEXT_DEVELOPMENT -f maven_plugin_version-master -N $_MAVEN_OPTS -Dmaster_release_tagName="master"
+mvn -Prelease.setversion -Dmaster_release_newVersion=$NEXT_VERSION -f maven_plugin_version-master -N $_MAVEN_OPTS -Dmaster_release_tagName="master"
processError
mvn -Prelease.checkin -Declipse_gerrit_username=$GIT_USERNAME -Dmaster_release_pushChanges=false -Dmaster_release_checkinMessage="[release] prepare for next development iteration" -f maven_plugin_version-master $_MAVEN_OPTS
