helix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject [helix] branch master updated: Bump up the snapshot version.
Date Tue, 13 Aug 2019 23:56:53 GMT
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
     new 436aa33  Bump up the snapshot version.
436aa33 is described below

commit 436aa336df4f9db58e953d6eddeedbaa456a1698
Author: jiajunwang <jjwang@linkedin.com>
AuthorDate: Tue Aug 13 16:54:12 2019 -0700

    Bump up the snapshot version.
    
    Also fix the missing helix-agent snapshot update logic in the bump-up.comand.
---
 bump-up.command                                     | 21 ++++++++++++++++++---
 ...OT.ivy => helix-admin-webapp-0.9.2-SNAPSHOT.ivy} |  4 ++--
 ...-SNAPSHOT.ivy => helix-agent-0.9.2-SNAPSHOT.ivy} | 12 ++++++------
 ...1-SNAPSHOT.ivy => helix-core-0.9.2-SNAPSHOT.ivy} |  2 +-
 ...1-SNAPSHOT.ivy => helix-rest-0.9.2-SNAPSHOT.ivy} |  4 ++--
 5 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/bump-up.command b/bump-up.command
index 6c64751..d67616c 100755
--- a/bump-up.command
+++ b/bump-up.command
@@ -92,10 +92,27 @@ else
   echo "helix-rest/$ivy_file not exist"
 fi
 
+echo "bump up helix-agent/pom.xml"
+sed -i "s/${version}/${new_version}/g" helix-agent/pom.xml
+grep -C 1 "$new_version" helix-agent/pom.xml
+# git diff helix-agent/pom.xml
+
+ivy_file="helix-agent-"$version".ivy"
+new_ivy_file="helix-agent-"$new_version".ivy"
+# echo "$ivy_file"
+if [ -f helix-agent/$ivy_file ]; then
+  echo "bump up helix-agent/$ivy_file"
+  git mv "helix-agent/$ivy_file" "helix-agent/$new_ivy_file"
+  sed -i "s/${version}/${new_version}/g" "helix-agent/$new_ivy_file"
+  grep -C 1 "$new_version" "helix-agent/$new_ivy_file"
+else
+  echo "helix-agent/$ivy_file not exist"
+fi
+
 for POM in helix-agent/pom.xml recipes/task-execution/pom.xml recipes/pom.xml recipes/distributed-lock-manager/pom.xml
recipes/rsync-replicated-file-system/pom.xml recipes/rabbitmq-consumer-group/pom.xml recipes/service-discovery/pom.xml
 do
   echo "bump up $POM"
-  sed -i "s/${version}/${new_version}/g" $POM 
+  sed -i "s/${version}/${new_version}/g" $POM
   grep -C 1 "$new_version" $POM
 done
 
@@ -104,5 +121,3 @@ sed -i "s/${version}/${new_version}/g" helix-front/pom.xml
 grep -C 1 "$new_version" helix-front/pom.xml
 
 #END
-
-
diff --git a/helix-admin-webapp/helix-admin-webapp-0.9.1-SNAPSHOT.ivy b/helix-admin-webapp/helix-admin-webapp-0.9.2-SNAPSHOT.ivy
similarity index 97%
rename from helix-admin-webapp/helix-admin-webapp-0.9.1-SNAPSHOT.ivy
rename to helix-admin-webapp/helix-admin-webapp-0.9.2-SNAPSHOT.ivy
index a0a7f19..e9b2952 100644
--- a/helix-admin-webapp/helix-admin-webapp-0.9.1-SNAPSHOT.ivy
+++ b/helix-admin-webapp/helix-admin-webapp-0.9.2-SNAPSHOT.ivy
@@ -20,7 +20,7 @@ under the License.
 <ivy-module version="1.0">
 	<info organisation="org.apache.helix"
 		module="helix-admin-webapp"
-		revision="0.9.1-SNAPSHOT"
+		revision="0.9.2-SNAPSHOT"
 		status="integration"
 		publication="20120315141623"
 	/>
@@ -43,7 +43,7 @@ under the License.
     <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.7.14" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)">
         <artifact name="slf4j-log4j12" ext="jar"/>
     </dependency>
-		<dependency org="org.apache.helix" name="helix-core" rev="0.9.1-SNAPSHOT" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+		<dependency org="org.apache.helix" name="helix-core" rev="0.9.2-SNAPSHOT" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
 		<dependency org="org.restlet.jse" name="org.restlet" rev="2.2.1" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
 		<dependency org="org.codehaus.jackson" name="jackson-core-asl" rev="1.8.5" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
 		<dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="1.8.5" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
diff --git a/helix-agent/helix-agent-0.9.1-SNAPSHOT.ivy b/helix-agent/helix-agent-0.9.2-SNAPSHOT.ivy
similarity index 96%
rename from helix-agent/helix-agent-0.9.1-SNAPSHOT.ivy
rename to helix-agent/helix-agent-0.9.2-SNAPSHOT.ivy
index 92a7704..8ce4c13 100644
--- a/helix-agent/helix-agent-0.9.1-SNAPSHOT.ivy
+++ b/helix-agent/helix-agent-0.9.2-SNAPSHOT.ivy
@@ -21,7 +21,7 @@ under the License.
 <ivy-module version="2.0" xmlns:m="http://ant.apache.org/ivy/maven">
 	<info organisation="org.apache.helix"
 		module="helix-agent"
-		revision="0.9.1-SNAPSHOT"
+		revision="0.9.2-SNAPSHOT"
 		status="integration"
 		publication="20141020152553"
 	>
@@ -31,7 +31,7 @@ under the License.
 		<m:properties__osgi.export>org.apache.helix.agent*;version=&quot;${project.version};-noimport:=true</m:properties__osgi.export>
 		<m:properties__svnImpl>svn</m:properties__svnImpl>
 		<m:properties__scmSkipDeletedFiles>false</m:properties__scmSkipDeletedFiles>
-		<m:properties__currentRelease>0.9.1-SNAPSHOT</m:properties__currentRelease>
+		<m:properties__currentRelease>0.9.2-SNAPSHOT</m:properties__currentRelease>
 		<m:properties__osgi.import>
       org.apache.helix*,
       org.apache.commons.cli;version=&quot;[1.2,2)&quot;,
@@ -46,7 +46,7 @@ under the License.
 		<m:properties__distMgmtSnapshotsUrl>https://repository.apache.org/content/repositories/snapshots</m:properties__distMgmtSnapshotsUrl>
 		<m:properties__SKIP_INTEGRATION_TESTS>true</m:properties__SKIP_INTEGRATION_TESTS>
 		<m:properties__gpg.useagent>true</m:properties__gpg.useagent>
-		<m:dependency.management__org.apache.helix__helix-core__version>0.9.1-SNAPSHOT</m:dependency.management__org.apache.helix__helix-core__version>
+		<m:dependency.management__org.apache.helix__helix-core__version>0.9.2-SNAPSHOT</m:dependency.management__org.apache.helix__helix-core__version>
 		<m:properties__project.build.sourceEncoding>UTF-8</m:properties__project.build.sourceEncoding>
 		<m:dependency.management__org.testng__testng__version>6.0.1</m:dependency.management__org.testng__testng__version>
 		<m:properties__helix.release.preparationGoals>clean install</m:properties__helix.release.preparationGoals>
@@ -77,12 +77,12 @@ under the License.
 		<artifact name="helix-agent" type="source" ext="jar" conf="sources" m:classifier="sources"/>
 	</publications>
 	<dependencies>
-		<dependency org="org.apache.helix" name="helix-core" rev="0.9.1-SNAPSHOT" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+		<dependency org="org.apache.helix" name="helix-core" rev="0.9.2-SNAPSHOT" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
 		<dependency org="org.restlet.jse" name="org.restlet" rev="2.2.1" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
 		<dependency org="org.testng" name="testng" rev="6.0.1" force="true" conf="test->runtime(*),master(*)">
 			<exclude org="junit" module="junit" name="*" type="*" ext="*" conf="" matcher="exact"/>
 		</dependency>
-		<dependency org="org.apache.helix" name="helix-core" rev="0.9.1-SNAPSHOT" force="true"
conf="test->runtime(*),master(*)">
+		<dependency org="org.apache.helix" name="helix-core" rev="0.9.2-SNAPSHOT" force="true"
conf="test->runtime(*),master(*)">
 			<artifact name="helix-core" type="test-jar" ext="jar" conf="" m:classifier="tests"/>
 		</dependency>
     <dependency org="org.slf4j" name="slf4j-api" rev="1.7.25" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)">
@@ -92,7 +92,7 @@ under the License.
         <artifact name="slf4j-log4j12" ext="jar"/>
     </dependency>
 		<override org="org.mockito" module="mockito-all" matcher="exact" rev="1.9.5"/>
-		<override org="org.apache.helix" module="helix-core" matcher="exact" rev="0.9.1-SNAPSHOT"/>
+		<override org="org.apache.helix" module="helix-core" matcher="exact" rev="0.9.2-SNAPSHOT"/>
 		<override org="org.restlet.jse" module="org.restlet" matcher="exact" rev="2.2.1"/>
 		<override org="junit" module="junit" matcher="exact" rev="4.11"/>
 		<override org="org.testng" module="testng" matcher="exact" rev="6.0.1"/>
diff --git a/helix-core/helix-core-0.9.1-SNAPSHOT.ivy b/helix-core/helix-core-0.9.2-SNAPSHOT.ivy
similarity index 99%
rename from helix-core/helix-core-0.9.1-SNAPSHOT.ivy
rename to helix-core/helix-core-0.9.2-SNAPSHOT.ivy
index ddc209c..2d6e298 100644
--- a/helix-core/helix-core-0.9.1-SNAPSHOT.ivy
+++ b/helix-core/helix-core-0.9.2-SNAPSHOT.ivy
@@ -20,7 +20,7 @@ under the License.
 <ivy-module version="1.0" xmlns:m="http://ant.apache.org/ivy/maven">
 	<info organisation="org.apache.helix"
 		module="helix-core"
-		revision="0.9.1-SNAPSHOT"
+		revision="0.9.2-SNAPSHOT"
 		status="release"
 		publication="2011111505113547"
 	>
diff --git a/helix-rest/helix-rest-0.9.1-SNAPSHOT.ivy b/helix-rest/helix-rest-0.9.2-SNAPSHOT.ivy
similarity index 97%
rename from helix-rest/helix-rest-0.9.1-SNAPSHOT.ivy
rename to helix-rest/helix-rest-0.9.2-SNAPSHOT.ivy
index 6aa52c3..aa255f9 100644
--- a/helix-rest/helix-rest-0.9.1-SNAPSHOT.ivy
+++ b/helix-rest/helix-rest-0.9.2-SNAPSHOT.ivy
@@ -20,7 +20,7 @@ under the License.
 <ivy-module version="1.0">
 	<info organisation="org.apache.helix"
 		module="helix-rest"
-		revision="0.9.1-SNAPSHOT"
+		revision="0.9.2-SNAPSHOT"
 		status="integration"
 		publication="20170128141623"
 	/>
@@ -46,7 +46,7 @@ under the License.
     <dependency org="org.yaml" name="snakeyaml" rev="1.17">
         <artifact name="snakeyaml" m:classifier="sources" ext="jar"/>
     </dependency>
-		<dependency org="org.apache.helix" name="helix-core" rev="0.9.1-SNAPSHOT" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+		<dependency org="org.apache.helix" name="helix-core" rev="0.9.2-SNAPSHOT" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
 		<dependency org="org.codehaus.jackson" name="jackson-core-asl" rev="1.8.5" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
 		<dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="1.8.5" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
 		<dependency org="commons-cli" name="commons-cli" rev="1.2" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>


Mime
View raw message