Revert "Remove revision variable in pom.xml and update bump-up.sh (#2308

)" This reverts commit 917b786.
apache · Dec 15, 2022 · 69dc7d3 · 69dc7d3
1 parent fc1d0e1
commit 69dc7d3
Show file tree

Hide file tree

Showing 23 changed files with 51 additions and 21 deletions.
diff --git a/bump-snapshot.sh b/bump-snapshot.sh
@@ -21,7 +21,7 @@
 
 
 echo There are $# arguments to $0: $*
-version=`grep -A 1 "<artifactId>helix</artifactId>" pom.xml |tail -1 | awk 'BEGIN {FS="[<,>]"};{print $3}'`
+version=`grep "<revision>" pom.xml | awk 'BEGIN {FS="[<,>]"};{print $3}'`
 if [ "$#" -eq 1 ]; then
   new_version=$1
 elif [ "$#" -eq 2 ]; then
@@ -47,7 +47,7 @@ mv helix-view-aggregator/helix-view-aggregator-$version-SNAPSHOT.ivy helix-view-
 
 
 find . -type f -name '*.ivy' -exec sed -i "s/$version/$new_version/g" {} \;
-find . -type f -name 'pom.xml' -exec sed -i "s/$version/$new_version/g" {} \;
+find . -type f -name 'pom.xml' -exec sed -i "s/<revision>$version/<revision>$new_version/g" pom.xml;
 
 
 

diff --git a/bump-up.sh b/bump-up.sh
@@ -21,9 +21,9 @@
 
 update_pom_version() {
   pom=$1
-  version=$2
   echo "bump up $pom"
-  sed -i'' -e "s/${version}/${new_version}/g" "$pom"
+  version=`get_version_from_pom $pom`
+  sed -i'' -e "s/<revision>$version/<revision>$new_version/g" $pom
   if ! grep -C 1 "$new_version" $pom; then
     echo "Failed to update new version $new_version in $pom"
     exit 1
@@ -37,8 +37,7 @@ update_ivy() {
   if [ -f $ivy_file ]; then
     echo "bump up $ivy_file"
     git mv "$ivy_file" "$new_ivy_file"
-    current_ivy_version=`get_version_from_ivy $new_ivy_file`
-    sed -i'' -e "s/${current_ivy_version}/${new_version}/g" "$new_ivy_file"
+    sed -i'' -e "s/${current_version}/${new_version}/g" "$new_ivy_file"
     if ! grep -C 1 "$new_version" "$new_ivy_file"; then
       echo "Failed to update new version $new_version in $new_ivy_file"
       exit 1
@@ -49,11 +48,7 @@ update_ivy() {
 }
 
 get_version_from_pom() {
-  grep -A 1 "<artifactId>helix</artifactId>" $1 |tail -1 | awk 'BEGIN {FS="[<,>]"};{print $3}'
-}
-
-get_version_from_ivy() {
-  grep revision "$1" | awk 'BEGIN {FS="[=,\"]"};{print $3}'
+  grep "<revision>" $1 | awk 'BEGIN {FS="[<,>]"};{print $3}'
 }
 
 current_version=`get_version_from_pom pom.xml`
@@ -71,18 +66,18 @@ else
   new_version="$major_version.$submajor_version.$new_minor_version"
 fi
 echo "bump up: $current_version -> $new_version"
-update_pom_version "pom.xml" $current_version
+update_pom_version "pom.xml"
 
 for module in "metrics-common" "metadata-store-directory-common" "zookeeper-api" "helix-common" "helix-core" \
               "helix-admin-webapp" "helix-rest" "helix-lock" "helix-view-aggregator" "helix-agent"; do
   update_ivy $module
-  update_pom_version $module/pom.xml $current_version
+  update_pom_version $module/pom.xml
 done
 
-for module in recipes/task-execution recipes helix-front \
+for module in recipes/task-execution recipes \
            recipes/distributed-lock-manager recipes/rsync-replicated-file-system \
            recipes/rabbitmq-consumer-group recipes/service-discovery; do
-  update_pom_version $module/pom.xml $current_version
+  update_pom_version $module/pom.xml
 done
 
 #END
diff --git a/helix-admin-webapp/pom.xml b/helix-admin-webapp/pom.xml
@@ -43,6 +43,7 @@
   </organization>
 
   <properties>
+    <revision>1.0.5-SNAPSHOT</revision>
     <osgi.import>
       org.apache.helix*,
       com.fasterxml.jackson*,

diff --git a/helix-agent/pom.xml b/helix-agent/pom.xml
@@ -42,6 +42,7 @@
   </organization>
 
   <properties>
+    <revision>1.0.5-SNAPSHOT</revision>
     <osgi.import>
       org.apache.helix*,
       org.apache.commons.cli;version="[1.2,2)",

diff --git a/helix-common/pom.xml b/helix-common/pom.xml
@@ -43,6 +43,7 @@
   </organization>
 
   <properties>
+    <revision>1.0.5-SNAPSHOT</revision>
     <osgi.import>
       org.slf4j*;version="[1.7,2)",
       org.apache.logging.log4j*;version="[2.17,3)",

diff --git a/helix-core/pom.xml b/helix-core/pom.xml
@@ -44,6 +44,7 @@
   </organization>
 
   <properties>
+    <revision>1.0.5-SNAPSHOT</revision>
     <osgi.import>
       javax.management*,
       javax.xml.bind*,

diff --git a/helix-front/pom.xml b/helix-front/pom.xml
@@ -42,6 +42,10 @@
     <url>http://www.apache.org</url>
   </organization>
 
+  <properties>
+    <revision>1.0.5-SNAPSHOT</revision>
+  </properties>
+
   <dependencies>
 
   </dependencies>

diff --git a/helix-lock/pom.xml b/helix-lock/pom.xml
@@ -43,6 +43,7 @@
   </organization>
 
   <properties>
+    <revision>1.0.5-SNAPSHOT</revision>
     <osgi.import>
       org.apache.helix*,
       org.slf4j*;version="[1.7,2)",

diff --git a/helix-view-aggregator/pom.xml b/helix-view-aggregator/pom.xml
@@ -43,6 +43,7 @@ under the License.
   </organization>
 
   <properties>
+    <revision>1.0.5-SNAPSHOT</revision>
     <osgi.import>
       org.apache.helix*,
       org.apache.commons.cli*,

diff --git a/metadata-store-directory-common/pom.xml b/metadata-store-directory-common/pom.xml
@@ -43,6 +43,7 @@
   </organization>
 
   <properties>
+    <revision>1.0.5-SNAPSHOT</revision>
     <osgi.import>
       org.slf4j*;version="[1.7,2)",
       org.apache.logging.log4j*;version="[2.17,3)",

diff --git a/metrics-common/pom.xml b/metrics-common/pom.xml
@@ -43,6 +43,7 @@
   </organization>
 
   <properties>
+    <revision>1.0.5-SNAPSHOT</revision>
     <osgi.import>
       org.slf4j*;version="[1.7,2)",
       org.apache.logging.log4j*;version="[2.17,3)",

diff --git a/pom.xml b/pom.xml
@@ -401,7 +401,7 @@
   </ciManagement>
 
   <properties>
-    <revision>1.1.1-SNAPSHOT</revision>
+    <revision>1.0.5-SNAPSHOT</revision>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.build.outputTimestamp>1654806798</project.build.outputTimestamp>
 

diff --git a/recipes/distributed-lock-manager/pom.xml b/recipes/distributed-lock-manager/pom.xml
@@ -44,6 +44,7 @@
   </organization>
 
   <properties>
+    <revision>1.0.5-SNAPSHOT</revision>
     <osgi.import>
       org.apache.helix*,
       org.slf4j*;version="[1.7,2)",

diff --git a/recipes/pom.xml b/recipes/pom.xml
@@ -42,6 +42,9 @@
     <url>http://www.apache.org</url>
   </organization>
 
+  <properties>
+    <revision>1.0.5-SNAPSHOT</revision>
+  </properties>
   <modules>
     <module>rabbitmq-consumer-group</module>
     <module>rsync-replicated-file-system</module>

diff --git a/recipes/rabbitmq-consumer-group/pom.xml b/recipes/rabbitmq-consumer-group/pom.xml
@@ -45,6 +45,7 @@
   </organization>
 
   <properties>
+    <revision>1.0.5-SNAPSHOT</revision>
     <osgi.import>
       org.apache.helix*,
       org.slf4j*;version="[1.7,2)",

diff --git a/recipes/rsync-replicated-file-system/pom.xml b/recipes/rsync-replicated-file-system/pom.xml
@@ -44,6 +44,7 @@
   </organization>
 
   <properties>
+    <revision>1.0.5-SNAPSHOT</revision>
     <osgi.import>
       org.apache.helix*,
       org.slf4j*;version="[1.7,2)",

diff --git a/recipes/service-discovery/pom.xml b/recipes/service-discovery/pom.xml
@@ -44,6 +44,7 @@
   </organization>
 
   <properties>
+    <revision>1.0.5-SNAPSHOT</revision>
     <osgi.import>
       org.apache.helix*,
       org.slf4j*;version="[1.7,2)",

diff --git a/recipes/task-execution/pom.xml b/recipes/task-execution/pom.xml
@@ -43,6 +43,9 @@
     <url>http://www.apache.org</url>
   </organization>
 
+  <properties>
+    <revision>1.0.5-SNAPSHOT</revision>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>org.slf4j</groupId>

diff --git a/website/0.9.9/pom.xml b/website/0.9.9/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.helix</groupId>
     <artifactId>website</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <artifactId>0.9.9-docs</artifactId>
@@ -43,6 +43,10 @@
     <url>http://www.apache.org</url>
   </organization>
 
+  <properties>
+    <revision>1.0.5-SNAPSHOT</revision>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.testng</groupId>

diff --git a/website/1.0.2/pom.xml b/website/1.0.2/pom.xml
@@ -23,13 +23,17 @@
   <parent>
     <groupId>org.apache.helix</groupId>
     <artifactId>website</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <artifactId>1.0.2-docs</artifactId>
   <packaging>bundle</packaging>
   <name>Apache Helix :: Website :: 1.0.2</name>
 
+  <properties>
+    <revision>1.0.5-SNAPSHOT</revision>
+  </properties>
+
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>

diff --git a/website/1.0.4/pom.xml b/website/1.0.4/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.helix</groupId>
     <artifactId>website</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <artifactId>1.0.4-docs</artifactId>
@@ -43,6 +43,10 @@
     <url>http://www.apache.org</url>
   </organization>
 
+  <properties>
+    <revision>1.0.5-SNAPSHOT</revision>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.testng</groupId>

diff --git a/website/pom.xml b/website/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.helix</groupId>
     <artifactId>helix</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>pom</packaging>
@@ -51,7 +51,7 @@
   </modules>
 
   <properties>
-    <revision>1.1.1-SNAPSHOT</revision>
+    <revision>1.0.5-SNAPSHOT</revision>
     <!-- for svnpubsub site deployment -->
     <!-- you can use javasvn too -->
     <svnImpl>svn</svnImpl>

diff --git a/zookeeper-api/pom.xml b/zookeeper-api/pom.xml
@@ -43,6 +43,7 @@
   </organization>
 
   <properties>
+    <revision>1.0.5-SNAPSHOT</revision>
     <osgi.import>
       org.slf4j*;version="[1.7,2)",
       org.apache.zookeeper*;version="[3.6,3.7)",