diff --git a/VERSION b/VERSION index 573541ac..d00491fd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0 +1 diff --git a/neo4j-to-neptune/pom.xml b/neo4j-to-neptune/pom.xml index b63d2ab9..b918dd4f 100644 --- a/neo4j-to-neptune/pom.xml +++ b/neo4j-to-neptune/pom.xml @@ -6,7 +6,7 @@ com.amazonaws neo4j-to-neptune - 1.0-SNAPSHOT + 1.1 UTF-8 diff --git a/neptune-export/pom.xml b/neptune-export/pom.xml index fc623340..13ac15ba 100644 --- a/neptune-export/pom.xml +++ b/neptune-export/pom.xml @@ -6,7 +6,7 @@ com.amazonaws neptune-export - 1.0-SNAPSHOT + 1.1 diff --git a/neptune-gremlin-client/gremlin-client-demo/pom.xml b/neptune-gremlin-client/gremlin-client-demo/pom.xml index b1ed397f..5fe62678 100644 --- a/neptune-gremlin-client/gremlin-client-demo/pom.xml +++ b/neptune-gremlin-client/gremlin-client-demo/pom.xml @@ -5,7 +5,7 @@ neptune-gremlin-client software.amazon.neptune - 1.0-SNAPSHOT + 1.1 4.0.0 diff --git a/neptune-gremlin-client/gremlin-client/pom.xml b/neptune-gremlin-client/gremlin-client/pom.xml index 272300f7..afa01c4b 100644 --- a/neptune-gremlin-client/gremlin-client/pom.xml +++ b/neptune-gremlin-client/gremlin-client/pom.xml @@ -5,7 +5,7 @@ neptune-gremlin-client software.amazon.neptune - 1.0-SNAPSHOT + 1.1 4.0.0 diff --git a/neptune-gremlin-client/neptune-endpoints-info-lambda/pom.xml b/neptune-gremlin-client/neptune-endpoints-info-lambda/pom.xml index 59477502..780699ee 100644 --- a/neptune-gremlin-client/neptune-endpoints-info-lambda/pom.xml +++ b/neptune-gremlin-client/neptune-endpoints-info-lambda/pom.xml @@ -5,7 +5,7 @@ neptune-gremlin-client software.amazon.neptune - 1.0-SNAPSHOT + 1.1 4.0.0 diff --git a/neptune-gremlin-client/pom.xml b/neptune-gremlin-client/pom.xml index ca2c88c2..2eea63e2 100644 --- a/neptune-gremlin-client/pom.xml +++ b/neptune-gremlin-client/pom.xml @@ -7,7 +7,7 @@ software.amazon.neptune neptune-gremlin-client pom - 1.0-SNAPSHOT + 1.1 diff --git a/release.sh b/release.sh index 7be873e2..8b0a73ac 100755 --- a/release.sh +++ b/release.sh @@ -23,8 +23,8 @@ if [ ! -f "$VERSION_FILE" ] ; then exit 1 fi -if [ "$GIT_BRANCH" != "mainline" ] ; then - echo "WARNING: Starting a release from a non-mainline branch." +if [ "$GIT_BRANCH" != "master" ] ; then + echo "WARNING: Starting a release from a non-master branch." fi let NEW_VERSION=`cat $VERSION_FILE`+1 @@ -86,13 +86,13 @@ ${GIT_CMD} push "${repo}" refs/heads/${RELEASE_BRANCH} echo "Pushing the release tags to $repo." ${GIT_CMD} push "${repo}" refs/tags/${RELEASE_BRANCH} -#Update the VERSION on mainline +#Update the VERSION on master -${GIT_CMD} checkout mainline +${GIT_CMD} checkout master echo $NEW_VERSION > $VERSION_FILE -${GIT_CMD} pull $repo mainline ${GIT_CMD} commit -am "Incremented release version to `cat $VERSION_FILE`" -${GIT_CMD} push $repo mainline +${GIT_CMD} pull $repo master +${GIT_CMD} push $repo master #Return to the initial branch ${GIT_CMD} checkout ${GIT_BRANCH}