You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2015/09/03 19:16:57 UTC
[1/2] incubator-tinkerpop git commit: removed bump.sh and updated
RELEASE asciidoc. @dalaro provided new model based mvn:version. Thanks.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master a20860bb8 -> 0977a257c
removed bump.sh and updated RELEASE asciidoc. @dalaro provided new model based mvn:version. Thanks.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/847642e8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/847642e8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/847642e8
Branch: refs/heads/master
Commit: 847642e8efc7aa404cbd3b4803979334322f799a
Parents: 51eb806
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Sep 3 11:17:00 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Sep 3 11:17:00 2015 -0600
----------------------------------------------------------------------
RELEASE.asciidoc | 6 +++---
bin/bump.sh | 47 -----------------------------------------------
2 files changed, 3 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/847642e8/RELEASE.asciidoc
----------------------------------------------------------------------
diff --git a/RELEASE.asciidoc b/RELEASE.asciidoc
index abd282e..af342b3 100644
--- a/RELEASE.asciidoc
+++ b/RELEASE.asciidoc
@@ -33,12 +33,12 @@ A release candidate is an unofficial release that is represented by a tagged ver
.. `mvn verify -DskipIntegrationTests=false -DincludeNeo4j`
.. `mvn verify -DskipPerformanceTests=false`
. `bin/publish-docs.sh <username>` - note that under a release candidate the documentation is published as SNAPSHOT
-. `bin/bump.sh "version"` to update the project files to reference a non-SNAPSHOT `rc` version (e.g. `x.y.z-incubating-rc1)
+. `mvn versions:set -DnewVersion=x.y.z -DgenerateBackupPoms=false` to update the project files to reference a non-SNAPSHOT version.
. `git diff` and review the updated files (expect all `pom.xml` files and this README)
. `git commit -a -m "TinkerPop x.y.z release"` and `git push`
. `git tag -a -m "TinkerPop x.y.z release" x.y.z` and `git push --tags`
. `mvn clean install -Dmaven.test.skip=true`
-. `bin/bump.sh "version"` to go back to SNAPSHOT
+. `mvn versions:set -DnewVersion=x.y.z-SNAPSHOT -DgenerateBackupPoms=false` to go back to SNAPSHOT
. `git commit -a -m "Returned to x.y.z-SNAPSHOT"` and `git push`
. Announce the release candidate to `dev` mailing list and await feedback
. Repeat as required or proceed to the next phase
@@ -58,7 +58,7 @@ A positive vote for a particular release from the TinkerPop PMC is required to m
.. Update the release date
.. Generate the JIRA release notes report for the current version and append them to the `CHANGELOG.asciidoc`
.. Organize "breaking" changes to be clearly marked (use JIRA and the "breaking" label to identify those)
-. `bin/bump.sh "version"` to update project files to reference the non-SNAPSHOT version
+. `mvn versions:set -DnewVersion=x.y.z -DgenerateBackupPoms=false` to update project files to reference the non-SNAPSHOT version
. `git diff` and review the updated files (expect all `pom.xml` files and this README)
. `git commit -a -m "TinkerPop x.y.z release"` and `git push`
. `git tag -a -m "TinkerPop x.y.z release" x.y.z` and `git push --tags`
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/847642e8/bin/bump.sh
----------------------------------------------------------------------
diff --git a/bin/bump.sh b/bin/bump.sh
deleted file mode 100755
index 2d9614c..0000000
--- a/bin/bump.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# This script bumps version in the various files that reference the current TinkerPop version files (e.g. pom.xml)
-# in preparation for release. Usage:
-#
-# bin/bump.sh "version"
-
-VERSION="$1"
-SCRIPT_PATH="$0"
-SCRIPT_DIR=`dirname "${SCRIPT_PATH}"`
-PROJECT_DIR="${SCRIPT_DIR}/.."
-
-# switch to project directory (allows us to call bump.sh from everywhere and still use relative paths within the script)
-pushd "$PROJECT_DIR" > /dev/null
-
-# update pom.xml
-for pom in $(find . -name pom.xml); do
- cat "$pom" | grep -n -A2 -B2 '<groupId>org.apache.tinkerpop</groupId>' \
- | grep -A2 -B2 '<artifactId>tinkerpop</artifactId>' \
- | grep '<version>' | cut -f1 -d '-' | xargs -n1 -I{} sed -i.bak "{}s@>.*<@>${VERSION}<@" "$pom" && rm -f "${pom}.bak"
-done
-
-# README
-INPUT="README.asciidoc"
-sed -i.bak 's/\(http:\/\/tinkerpop.com\/.*docs\/\)[A-Za-z0-9.-]*\/\(.*\)/\1'"${VERSION}"'\/\2/' "${INPUT}" && rm -f "${INPUT}.bak"
-
-# switch back to initial directory
-popd > /dev/null
\ No newline at end of file
[2/2] incubator-tinkerpop git commit: Merge branch 'tp30'
Posted by ok...@apache.org.
Merge branch 'tp30'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/0977a257
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/0977a257
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/0977a257
Branch: refs/heads/master
Commit: 0977a257cde5994120c5c53082c53ff66337b69b
Parents: a20860b 847642e
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Sep 3 11:17:08 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Sep 3 11:17:08 2015 -0600
----------------------------------------------------------------------
RELEASE.asciidoc | 6 +++---
bin/bump.sh | 47 -----------------------------------------------
2 files changed, 3 insertions(+), 50 deletions(-)
----------------------------------------------------------------------