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 ea619a208 Partially revert revision variable (#2267)
ea619a208 is described below
commit ea619a20818e71431921a29c57e6797cabd29422
Author: Qi (Quincy) Qu <[email protected]>
AuthorDate: Mon Nov 7 14:14:14 2022 -0800
Partially revert revision variable (#2267)
Add back revision number in each child pom.xml to maintain compatibility
with gradle build system.
---
bump-snapshot.sh | 2 +-
bump-up.sh | 7 +++++++
helix-admin-webapp/pom.xml | 1 +
helix-agent/pom.xml | 1 +
helix-common/pom.xml | 1 +
helix-core/pom.xml | 1 +
helix-front/pom.xml | 2 +-
helix-lock/pom.xml | 1 +
helix-rest/pom.xml | 1 +
helix-view-aggregator/pom.xml | 1 +
metadata-store-directory-common/pom.xml | 1 +
metrics-common/pom.xml | 1 +
recipes/distributed-lock-manager/pom.xml | 1 +
recipes/pom.xml | 3 +++
recipes/rabbitmq-consumer-group/pom.xml | 1 +
recipes/rsync-replicated-file-system/pom.xml | 1 +
recipes/service-discovery/pom.xml | 1 +
recipes/task-execution/pom.xml | 3 +++
website/0.9.9/pom.xml | 1 +
website/1.0.2/pom.xml | 1 +
website/1.0.4/pom.xml | 1 +
website/pom.xml | 2 +-
zookeeper-api/pom.xml | 1 +
23 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/bump-snapshot.sh b/bump-snapshot.sh
index 94de7acc5..a9869f2e3 100755
--- a/bump-snapshot.sh
+++ b/bump-snapshot.sh
@@ -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" {} \;
-sed -i "s/<revision>$version/<revision>$new_version/g" pom.xml;
+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
index 7c688e683..76f8635d7 100755
--- a/bump-up.sh
+++ b/bump-up.sh
@@ -71,6 +71,13 @@ 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
+done
+
+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
done
#END
diff --git a/helix-admin-webapp/pom.xml b/helix-admin-webapp/pom.xml
index 8bef6f49b..5bff8a459 100644
--- a/helix-admin-webapp/pom.xml
+++ b/helix-admin-webapp/pom.xml
@@ -30,6 +30,7 @@
<name>Apache Helix :: Admin Webapp</name>
<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
index 0fba357e9..61f5bde53 100644
--- a/helix-agent/pom.xml
+++ b/helix-agent/pom.xml
@@ -29,6 +29,7 @@
<name>Apache Helix :: HelixAgent</name>
<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
index e57ca07ed..959e7138e 100644
--- a/helix-common/pom.xml
+++ b/helix-common/pom.xml
@@ -30,6 +30,7 @@
<name>Apache Helix :: Helix Common</name>
<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
index c68ce6fae..f1b8888d5 100755
--- a/helix-core/pom.xml
+++ b/helix-core/pom.xml
@@ -31,6 +31,7 @@
<name>Apache Helix :: Core</name>
<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
index a5a9b7ea0..cfce75819 100644
--- a/helix-front/pom.xml
+++ b/helix-front/pom.xml
@@ -30,7 +30,7 @@
<name>Apache Helix :: Front End</name>
<properties>
-
+ <revision>1.0.5-SNAPSHOT</revision>
</properties>
<dependencies>
diff --git a/helix-lock/pom.xml b/helix-lock/pom.xml
index 99cc5d88b..592aeb351 100644
--- a/helix-lock/pom.xml
+++ b/helix-lock/pom.xml
@@ -30,6 +30,7 @@
<name>Apache Helix :: Distributed Lock</name>
<properties>
+ <revision>1.0.5-SNAPSHOT</revision>
<osgi.import>
org.apache.helix*,
org.slf4j*;version="[1.7,2)",
diff --git a/helix-rest/pom.xml b/helix-rest/pom.xml
index 6ebcad8fd..0ddeaee84 100644
--- a/helix-rest/pom.xml
+++ b/helix-rest/pom.xml
@@ -30,6 +30,7 @@
<name>Apache Helix :: Restful Interface</name>
<properties>
+ <revision>1.0.5-SNAPSHOT</revision>
<osgi.import>
org.apache.helix*,
org.apache.commons.cli*,
diff --git a/helix-view-aggregator/pom.xml b/helix-view-aggregator/pom.xml
index 793a14800..6eb91e8c8 100644
--- a/helix-view-aggregator/pom.xml
+++ b/helix-view-aggregator/pom.xml
@@ -30,6 +30,7 @@ under the License.
<name>Apache Helix :: View Aggregator</name>
<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
index 611901875..8eb84f6bd 100644
--- a/metadata-store-directory-common/pom.xml
+++ b/metadata-store-directory-common/pom.xml
@@ -30,6 +30,7 @@
<name>Apache Helix :: Metadata Store Directory Common</name>
<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
index 8ecb8a2b9..1c8757fb6 100644
--- a/metrics-common/pom.xml
+++ b/metrics-common/pom.xml
@@ -30,6 +30,7 @@
<name>Apache Helix :: Metrics Common</name>
<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/recipes/distributed-lock-manager/pom.xml
b/recipes/distributed-lock-manager/pom.xml
index e44c26fb8..174b908a2 100644
--- a/recipes/distributed-lock-manager/pom.xml
+++ b/recipes/distributed-lock-manager/pom.xml
@@ -31,6 +31,7 @@
<name>Apache Helix :: Recipes :: distributed lock manager</name>
<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
index ff48cf1b8..21c0c301f 100644
--- a/recipes/pom.xml
+++ b/recipes/pom.xml
@@ -29,6 +29,9 @@
<packaging>pom</packaging>
<name>Apache Helix :: Recipes</name>
+ <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
index f048df2ec..a34e071d2 100644
--- a/recipes/rabbitmq-consumer-group/pom.xml
+++ b/recipes/rabbitmq-consumer-group/pom.xml
@@ -32,6 +32,7 @@
<name>Apache Helix :: Recipes :: Rabbitmq Consumer Group</name>
<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
index 7e10f44ed..21586cf0d 100644
--- a/recipes/rsync-replicated-file-system/pom.xml
+++ b/recipes/rsync-replicated-file-system/pom.xml
@@ -31,6 +31,7 @@
<name>Apache Helix :: Recipes :: Rsync Replicated File Store</name>
<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
index 89bc2131e..7d7a5806b 100644
--- a/recipes/service-discovery/pom.xml
+++ b/recipes/service-discovery/pom.xml
@@ -31,6 +31,7 @@
<name>Apache Helix :: Recipes :: service discovery</name>
<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
index 3afba7048..59019b07c 100644
--- a/recipes/task-execution/pom.xml
+++ b/recipes/task-execution/pom.xml
@@ -30,6 +30,9 @@
<packaging>bundle</packaging>
<name>Apache Helix :: Recipes :: distributed task execution</name>
+ <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
index 362d0979c..013112a68 100644
--- a/website/0.9.9/pom.xml
+++ b/website/0.9.9/pom.xml
@@ -31,6 +31,7 @@
<name>Apache Helix :: Website :: 0.9.9</name>
<properties>
+ <revision>1.0.5-SNAPSHOT</revision>
</properties>
<dependencies>
diff --git a/website/1.0.2/pom.xml b/website/1.0.2/pom.xml
index 58faa93e1..283e332ed 100644
--- a/website/1.0.2/pom.xml
+++ b/website/1.0.2/pom.xml
@@ -31,6 +31,7 @@
<name>Apache Helix :: Website :: 1.0.2</name>
<properties>
+ <revision>1.0.5-SNAPSHOT</revision>
</properties>
<dependencies>
diff --git a/website/1.0.4/pom.xml b/website/1.0.4/pom.xml
index 9f5da5d80..d2e02af04 100644
--- a/website/1.0.4/pom.xml
+++ b/website/1.0.4/pom.xml
@@ -31,6 +31,7 @@
<name>Apache Helix :: Website :: 1.0.4</name>
<properties>
+ <revision>1.0.5-SNAPSHOT</revision>
</properties>
<dependencies>
diff --git a/website/pom.xml b/website/pom.xml
index 84bfd8739..5bf2cbf29 100644
--- a/website/pom.xml
+++ b/website/pom.xml
@@ -38,7 +38,7 @@
</modules>
<properties>
-
+ <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
index db6ecf5a2..8dde9d7b6 100644
--- a/zookeeper-api/pom.xml
+++ b/zookeeper-api/pom.xml
@@ -30,6 +30,7 @@
<name>Apache Helix :: ZooKeeper API</name>
<properties>
+ <revision>1.0.5-SNAPSHOT</revision>
<osgi.import>
org.slf4j*;version="[1.7,2)",
org.apache.zookeeper*;version="[3.6,3.7)",
