helix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hu...@apache.org
Subject [helix] branch zooscalability updated: Update bump-up.command and ivy imports (#824)
Date Thu, 27 Feb 2020 06:45:57 GMT
This is an automated email from the ASF dual-hosted git repository.

hulee pushed a commit to branch zooscalability
in repository https://gitbox.apache.org/repos/asf/helix.git


The following commit(s) were added to refs/heads/zooscalability by this push:
     new 8dc457f  Update bump-up.command and ivy imports (#824)
8dc457f is described below

commit 8dc457f053deaa61ff6dd58ccb95b1cc8758997b
Author: Hunter Lee <hulee@linkedin.com>
AuthorDate: Wed Feb 26 22:45:48 2020 -0800

    Update bump-up.command and ivy imports (#824)
    
    We update the bump-up.command script here so that it includes newly added modules.
    .ivy change was needed for wrapper repositories could pick up on the right open-source
libraries.
---
 bump-up.command                          | 62 +++++++++++++++++++++++++-------
 helix-core/helix-core-0.9.2-SNAPSHOT.ivy |  2 +-
 2 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/bump-up.command b/bump-up.command
index b59f314..a17049d 100755
--- a/bump-up.command
+++ b/bump-up.command
@@ -41,23 +41,42 @@ sed -i "s/${version}/${new_version}/g" pom.xml
 # git diff pom.xml
 grep -C 1 "$new_version" pom.xml
 
-echo "bump up helix-common/pom.xml"
-sed -i "s/${version}/${new_version}/g" helix-common/pom.xml
-grep -C 1 "$new_version" helix-common/pom.xml
-# git diff helix-common/pom.xml
+echo "bump up metrics-common/pom.xml"
+sed -i "s/${version}/${new_version}/g" metrics-common/pom.xml
+grep -C 1 "$new_version" metrics-common/pom.xml
+# git diff metrics-common/pom.xml
 
-ivy_file="helix-common-"$version".ivy"
-new_ivy_file="helix-common-"$new_version".ivy"
+ivy_file="metrics-common-"$version".ivy"
+new_ivy_file="metrics-common-"$new_version".ivy"
 # echo "$ivy_file"
-if [ -f helix-common/$ivy_file ]; then
-  echo "bump up helix-common/$ivy_file"
-  git mv "helix-common/$ivy_file" "helix-common/$new_ivy_file"
-  sed -i "s/${version}/${new_version}/g" "helix-common/$new_ivy_file"
-  grep -C 1 "$new_version" "helix-common/$new_ivy_file"
+if [ -f metrics-common/$ivy_file ]; then
+  echo "bump up metrics-common/$ivy_file"
+  git mv "metrics-common/$ivy_file" "metrics-common/$new_ivy_file"
+  sed -i "s/${version}/${new_version}/g" "metrics-common/$new_ivy_file"
+  grep -C 1 "$new_version" "metrics-common/$new_ivy_file"
 else
-  echo "helix-common/$ivy_file not exist"
+  echo "metrics-common/$ivy_file not exist"
 fi
 
+
+echo "bump up metadata-store-directory-common/pom.xml"
+sed -i "s/${version}/${new_version}/g" metadata-store-directory-common/pom.xml
+grep -C 1 "$new_version" metadata-store-directory-common/pom.xml
+# git diff metadata-store-directory-common/pom.xml
+
+ivy_file="metadata-store-directory-common-"$version".ivy"
+new_ivy_file="metadata-store-directory-common-"$new_version".ivy"
+# echo "$ivy_file"
+if [ -f metadata-store-directory-common/$ivy_file ]; then
+  echo "bump up metadata-store-directory-common/$ivy_file"
+  git mv "metadata-store-directory-common/$ivy_file" "metadata-store-directory-common/$new_ivy_file"
+  sed -i "s/${version}/${new_version}/g" "metadata-store-directory-common/$new_ivy_file"
+  grep -C 1 "$new_version" "metadata-store-directory-common/$new_ivy_file"
+else
+  echo "metadata-store-directory-common/$ivy_file not exist"
+fi
+
+
 echo "bump up zookeeper-api/pom.xml"
 sed -i "s/${version}/${new_version}/g" zookeeper-api/pom.xml
 grep -C 1 "$new_version" zookeeper-api/pom.xml
@@ -75,6 +94,25 @@ else
   echo "zookeeper-api/$ivy_file not exist"
 fi
 
+
+echo "bump up helix-common/pom.xml"
+sed -i "s/${version}/${new_version}/g" helix-common/pom.xml
+grep -C 1 "$new_version" helix-common/pom.xml
+# git diff helix-common/pom.xml
+
+ivy_file="helix-common-"$version".ivy"
+new_ivy_file="helix-common-"$new_version".ivy"
+# echo "$ivy_file"
+if [ -f helix-common/$ivy_file ]; then
+  echo "bump up helix-common/$ivy_file"
+  git mv "helix-common/$ivy_file" "helix-common/$new_ivy_file"
+  sed -i "s/${version}/${new_version}/g" "helix-common/$new_ivy_file"
+  grep -C 1 "$new_version" "helix-common/$new_ivy_file"
+else
+  echo "helix-common/$ivy_file not exist"
+fi
+
+
 echo "bump up helix-core/pom.xml"
 sed -i "s/${version}/${new_version}/g" helix-core/pom.xml
 grep -C 1 "$new_version" helix-core/pom.xml
diff --git a/helix-core/helix-core-0.9.2-SNAPSHOT.ivy b/helix-core/helix-core-0.9.2-SNAPSHOT.ivy
index 6a1cdee..5f3adc2 100644
--- a/helix-core/helix-core-0.9.2-SNAPSHOT.ivy
+++ b/helix-core/helix-core-0.9.2-SNAPSHOT.ivy
@@ -58,7 +58,7 @@ under the License.
     <dependency org="commons-io" name="commons-io" rev="1.4" conf="compile->compile(default);runtime->runtime(default);default->default"/>
     <dependency org="commons-cli" name="commons-cli" rev="1.2" conf="compile->compile(default);runtime->runtime(default);default->default"/>
     <dependency org="commons-math" name="commons-math" rev="2.1" conf="compile->compile(default);runtime->runtime(default);default->default"/>
-    <dependency org="commons-math" name="commons-math3" rev="3.6.1" conf="compile->compile(default);runtime->runtime(default);default->default"/>
+    <dependency org="org.apache.commons" name="commons-math3" rev="3.6.1" conf="compile->compile(default);runtime->runtime(default);default->default"/>
     <dependency org="com.google.guava" name="guava" rev="15.0" conf="compile->compile(default);runtime->runtime(default);default->default"/>
     <dependency org="org.yaml" name="snakeyaml" rev="1.12" conf="compile->compile(default);runtime->runtime(default);default->default"/>
     <dependency org="commons-logging" name="commons-logging-api" rev="1.1" conf="compile->compile(*),master(*);runtime->runtime(*)"/>


Mime
View raw message