You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mnemonic.apache.org by ga...@apache.org on 2016/05/07 00:04:41 UTC

[1/2] incubator-mnemonic git commit: MNEMONIC-45: Support Candidate Release

Repository: incubator-mnemonic
Updated Branches:
  refs/heads/branch-0.1.2 [created] ee52bcbb7


MNEMONIC-45: Support Candidate Release


Project: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/commit/0d1f7e8b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/tree/0d1f7e8b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/diff/0d1f7e8b

Branch: refs/heads/branch-0.1.2
Commit: 0d1f7e8b73cc919090cfe9bfaf3709b09c05e437
Parents: c6ea8e6
Author: Wang, Gang(Gary) <ga...@intel.com>
Authored: Fri May 6 16:57:40 2016 -0700
Committer: Wang, Gang(Gary) <ga...@intel.com>
Committed: Fri May 6 16:57:40 2016 -0700

----------------------------------------------------------------------
 build-tools/release.sh | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/0d1f7e8b/build-tools/release.sh
----------------------------------------------------------------------
diff --git a/build-tools/release.sh b/build-tools/release.sh
index 590e174..05e2085 100755
--- a/build-tools/release.sh
+++ b/build-tools/release.sh
@@ -18,8 +18,9 @@
 #
 
 usage(){
-    echo "Usage: $0 Release_Version Next_Release_Version"
-    echo "For example, $0 0.2.0 0.2.1"
+    echo "Usage: $0 Release_Version Next_Release_Version Candidate_Id"
+    echo "e.g. $0 0.2.0 0.2.0 rc2"
+    echo "     $0 0.2.0 0.2.1 rc3"
     exit 1
 }
 
@@ -37,26 +38,39 @@ continueprompt() {
 [[ -n "$(git status --porcelain)" ]] &&
     echo "please commit all changes first." && exit
 
-[[ $# -ne 2 ]]  && usage
+[[ $# -ne 3 ]]  && usage
 
 RELEASE_VERSION="$1"
 NEXT_RELEASE_VERSION="$2"
+RELEASE_CANDIDATE_ID="$3"
+NEXT_VER_COMMIT_PREFIX="Bump version"
 
 echo "You have specified:"
 echo "RELEASE_VERSION = ${RELEASE_VERSION}"
 echo "NEXT_RELEASE_VERSION = ${NEXT_RELEASE_VERSION}"
+echo "RELEASE_CANDIDATE_ID = ${RELEASE_CANDIDATE_ID}"
 
 git checkout master
 
+if [ "${RELEASE_VERSION}" == "${NEXT_RELEASE_VERSION}" ]; then
+    echo "You are trying to prepare a same version candidate so going to clean up existing branch <branch-${RELEASE_VERSION}> and tag <v${RELEASE_VERSION}-incubating> if any"
+    continueprompt
+    git branch -d branch-${RELEASE_VERSION}
+    git push upstream --delete branch-${RELEASE_VERSION}
+    git tag -d v${RELEASE_VERSION}-incubating
+    git push upstream --delete v${RELEASE_VERSION}-incubating
+    NEXT_VER_COMMIT_PREFIX="Stay version"
+fi
+
 echo "Preparing to create a branch branch-${RELEASE_VERSION} for release"
 continueprompt
 
 git checkout -b branch-${RELEASE_VERSION} || { echo "Create branch failed"; exit; }
 
 mvn versions:set -DgenerateBackupPoms=false -DnewVersion=${RELEASE_VERSION}-incubating
-git commit . -m "Prepare for releasing ${RELEASE_VERSION}-incubating"
+git commit . -m "Prepare for releasing ${RELEASE_VERSION}-incubating ${RELEASE_CANDIDATE_ID}"
 
-git tag -s v${RELEASE_VERSION}-incubating -m "Releasing ${RELEASE_VERSION}-incubating"
+git tag -s v${RELEASE_VERSION}-incubating -m "Releasing ${RELEASE_VERSION}-incubating ${RELEASE_CANDIDATE_ID}"
 
 rm -rf target/
 
@@ -92,7 +106,7 @@ continueprompt
 git checkout master
 git merge --no-ff branch-${RELEASE_VERSION}
 mvn versions:set -DgenerateBackupPoms=false -DnewVersion=${NEXT_RELEASE_VERSION}-incubating-SNAPSHOT
-git commit . -m "Bump version to ${NEXT_RELEASE_VERSION}-incubating-SNAPSHOT"
+git commit . -m "${NEXT_VER_COMMIT_PREFIX} to ${NEXT_RELEASE_VERSION}-incubating-SNAPSHOT"
 
 echo "Push release merge and new version to upstream."
 continueprompt


[2/2] incubator-mnemonic git commit: Prepare for releasing 0.1.2-incubating rc3

Posted by ga...@apache.org.
Prepare for releasing 0.1.2-incubating rc3


Project: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/commit/ee52bcbb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/tree/ee52bcbb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/diff/ee52bcbb

Branch: refs/heads/branch-0.1.2
Commit: ee52bcbb771b84eeb16061e00ace35691cdc68d1
Parents: 0d1f7e8
Author: Wang, Gang(Gary) <ga...@intel.com>
Authored: Fri May 6 17:01:04 2016 -0700
Committer: Wang, Gang(Gary) <ga...@intel.com>
Committed: Fri May 6 17:01:04 2016 -0700

----------------------------------------------------------------------
 mnemonic-collections/pom.xml                                | 2 +-
 mnemonic-core/pom.xml                                       | 2 +-
 mnemonic-examples/pom.xml                                   | 2 +-
 mnemonic-memory-services/mnemonic-nvml-vmem-service/pom.xml | 2 +-
 mnemonic-memory-services/mnemonic-pmalloc-service/pom.xml   | 2 +-
 mnemonic-memory-services/pom.xml                            | 2 +-
 pom.xml                                                     | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/ee52bcbb/mnemonic-collections/pom.xml
----------------------------------------------------------------------
diff --git a/mnemonic-collections/pom.xml b/mnemonic-collections/pom.xml
index c67b4c8..0955401 100644
--- a/mnemonic-collections/pom.xml
+++ b/mnemonic-collections/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.mnemonic</groupId>
     <artifactId>mnemonic-parent</artifactId>
-    <version>0.1.3-incubating-SNAPSHOT</version>
+    <version>0.1.2-incubating</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/ee52bcbb/mnemonic-core/pom.xml
----------------------------------------------------------------------
diff --git a/mnemonic-core/pom.xml b/mnemonic-core/pom.xml
index 776675b..6d1edb0 100644
--- a/mnemonic-core/pom.xml
+++ b/mnemonic-core/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.mnemonic</groupId>
     <artifactId>mnemonic-parent</artifactId>
-    <version>0.1.3-incubating-SNAPSHOT</version>
+    <version>0.1.2-incubating</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/ee52bcbb/mnemonic-examples/pom.xml
----------------------------------------------------------------------
diff --git a/mnemonic-examples/pom.xml b/mnemonic-examples/pom.xml
index 78e72f3..d9af8b0 100644
--- a/mnemonic-examples/pom.xml
+++ b/mnemonic-examples/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.mnemonic</groupId>
     <artifactId>mnemonic-parent</artifactId>
-    <version>0.1.3-incubating-SNAPSHOT</version>
+    <version>0.1.2-incubating</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/ee52bcbb/mnemonic-memory-services/mnemonic-nvml-vmem-service/pom.xml
----------------------------------------------------------------------
diff --git a/mnemonic-memory-services/mnemonic-nvml-vmem-service/pom.xml b/mnemonic-memory-services/mnemonic-nvml-vmem-service/pom.xml
index 4f87a6d..76eb69e 100644
--- a/mnemonic-memory-services/mnemonic-nvml-vmem-service/pom.xml
+++ b/mnemonic-memory-services/mnemonic-nvml-vmem-service/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.mnemonic</groupId>
     <artifactId>mnemonic-memory-services</artifactId>
-    <version>0.1.3-incubating-SNAPSHOT</version>
+    <version>0.1.2-incubating</version>
   </parent>
   
   <artifactId>mnemonic-nvml-vmem-service</artifactId>

http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/ee52bcbb/mnemonic-memory-services/mnemonic-pmalloc-service/pom.xml
----------------------------------------------------------------------
diff --git a/mnemonic-memory-services/mnemonic-pmalloc-service/pom.xml b/mnemonic-memory-services/mnemonic-pmalloc-service/pom.xml
index 641e8a2..392a9a0 100644
--- a/mnemonic-memory-services/mnemonic-pmalloc-service/pom.xml
+++ b/mnemonic-memory-services/mnemonic-pmalloc-service/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.mnemonic</groupId>
     <artifactId>mnemonic-memory-services</artifactId>
-    <version>0.1.3-incubating-SNAPSHOT</version>
+    <version>0.1.2-incubating</version>
   </parent>
 
   <artifactId>mnemonic-pmalloc-service</artifactId>

http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/ee52bcbb/mnemonic-memory-services/pom.xml
----------------------------------------------------------------------
diff --git a/mnemonic-memory-services/pom.xml b/mnemonic-memory-services/pom.xml
index 63a4cf0..737e563 100644
--- a/mnemonic-memory-services/pom.xml
+++ b/mnemonic-memory-services/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.mnemonic</groupId>
     <artifactId>mnemonic-parent</artifactId>
-    <version>0.1.3-incubating-SNAPSHOT</version>
+    <version>0.1.2-incubating</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
  

http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/ee52bcbb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4a6fc4c..aa40c03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.mnemonic</groupId>
   <artifactId>mnemonic-parent</artifactId>
-  <version>0.1.3-incubating-SNAPSHOT</version>
+  <version>0.1.2-incubating</version>
   <packaging>pom</packaging>
   <name>mnemonic-parent</name>
   <url>http://mnemonic.incubator.apache.org</url>