HBASE-27434 Use ${revision} as placeholder for maven version to make it easier to control the version from command line (#4836)

Signed-off-by: GeorryHuang <huangzhuoyue@apache.org> (cherry picked from commit 2fc879e863)
2022-10-24 11:50:48 +08:00 · 2022-10-24 11:50:48 +08:00 · 738ed028ad
parent 25dad1fb68
commit 738ed028ad
51 changed files with 55 additions and 53 deletions
--- a/hbase-annotations/pom.xml
+++ b/hbase-annotations/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>..</relativePath>
  </parent>

--- a/hbase-archetypes/hbase-archetype-builder/pom.xml
+++ b/hbase-archetypes/hbase-archetype-builder/pom.xml
@ -24,7 +24,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-archetypes</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>..</relativePath>
  </parent>

--- a/hbase-archetypes/hbase-client-project/pom.xml
+++ b/hbase-archetypes/hbase-client-project/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-archetypes</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>..</relativePath>
  </parent>
  <artifactId>hbase-client-project</artifactId>
--- a/hbase-archetypes/hbase-shaded-client-project/pom.xml
+++ b/hbase-archetypes/hbase-shaded-client-project/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-archetypes</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>..</relativePath>
  </parent>
  <artifactId>hbase-shaded-client-project</artifactId>
--- a/hbase-archetypes/pom.xml
+++ b/hbase-archetypes/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-build-configuration</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>../hbase-build-configuration</relativePath>
  </parent>

--- a/hbase-assembly/pom.xml
+++ b/hbase-assembly/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-build-configuration</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>../hbase-build-configuration</relativePath>
  </parent>
  <artifactId>hbase-assembly</artifactId>
--- a/hbase-asyncfs/pom.xml
+++ b/hbase-asyncfs/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-build-configuration</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>../hbase-build-configuration</relativePath>
  </parent>

--- a/hbase-build-configuration/pom.xml
+++ b/hbase-build-configuration/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>..</relativePath>
  </parent>

--- a/hbase-checkstyle/pom.xml
+++ b/hbase-checkstyle/pom.xml
@ -25,12 +25,12 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>..</relativePath>
  </parent>
  <groupId>org.apache.hbase</groupId>
  <artifactId>hbase-checkstyle</artifactId>
-  <version>2.6.0-SNAPSHOT</version>
+  <version>${revision}</version>
  <name>Apache HBase - Checkstyle</name>
  <description>Module to hold Checkstyle properties for HBase.</description>

--- a/hbase-client/pom.xml
+++ b/hbase-client/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-build-configuration</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>../hbase-build-configuration</relativePath>
  </parent>

--- a/hbase-common/pom.xml
+++ b/hbase-common/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-build-configuration</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>../hbase-build-configuration</relativePath>
  </parent>

--- a/hbase-compression/hbase-compression-aircompressor/pom.xml
+++ b/hbase-compression/hbase-compression-aircompressor/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-compression</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>..</relativePath>
  </parent>
  <artifactId>hbase-compression-aircompressor</artifactId>
--- a/hbase-compression/hbase-compression-brotli/pom.xml
+++ b/hbase-compression/hbase-compression-brotli/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-compression</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>..</relativePath>
  </parent>
  <artifactId>hbase-compression-brotli</artifactId>
--- a/hbase-compression/hbase-compression-lz4/pom.xml
+++ b/hbase-compression/hbase-compression-lz4/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-compression</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>..</relativePath>
  </parent>
  <artifactId>hbase-compression-lz4</artifactId>
--- a/hbase-compression/hbase-compression-snappy/pom.xml
+++ b/hbase-compression/hbase-compression-snappy/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-compression</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>..</relativePath>
  </parent>
  <artifactId>hbase-compression-snappy</artifactId>
--- a/hbase-compression/hbase-compression-xz/pom.xml
+++ b/hbase-compression/hbase-compression-xz/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-compression</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>..</relativePath>
  </parent>
  <artifactId>hbase-compression-xz</artifactId>
--- a/hbase-compression/hbase-compression-zstd/pom.xml
+++ b/hbase-compression/hbase-compression-zstd/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-compression</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>..</relativePath>
  </parent>
  <artifactId>hbase-compression-zstd</artifactId>
--- a/hbase-compression/pom.xml
+++ b/hbase-compression/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-build-configuration</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>../hbase-build-configuration</relativePath>
  </parent>
  <artifactId>hbase-compression</artifactId>
--- a/hbase-endpoint/pom.xml
+++ b/hbase-endpoint/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-build-configuration</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>../hbase-build-configuration</relativePath>
  </parent>
  <artifactId>hbase-endpoint</artifactId>
--- a/hbase-examples/pom.xml
+++ b/hbase-examples/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-build-configuration</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>../hbase-build-configuration</relativePath>
  </parent>
  <artifactId>hbase-examples</artifactId>
--- a/hbase-external-blockcache/pom.xml
+++ b/hbase-external-blockcache/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-build-configuration</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>../hbase-build-configuration</relativePath>
  </parent>
  <artifactId>hbase-external-blockcache</artifactId>
--- a/hbase-hadoop-compat/pom.xml
+++ b/hbase-hadoop-compat/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-build-configuration</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>../hbase-build-configuration</relativePath>
  </parent>

--- a/hbase-hadoop2-compat/pom.xml
+++ b/hbase-hadoop2-compat/pom.xml
@ -21,7 +21,7 @@ limitations under the License.
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-build-configuration</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>../hbase-build-configuration</relativePath>
  </parent>

--- a/hbase-hbtop/pom.xml
+++ b/hbase-hbtop/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-build-configuration</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>../hbase-build-configuration</relativePath>
  </parent>
  <artifactId>hbase-hbtop</artifactId>
--- a/hbase-http/pom.xml
+++ b/hbase-http/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-build-configuration</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>../hbase-build-configuration</relativePath>
  </parent>
  <artifactId>hbase-http</artifactId>
--- a/hbase-it/pom.xml
+++ b/hbase-it/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-build-configuration</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>../hbase-build-configuration</relativePath>
  </parent>

--- a/hbase-logging/pom.xml
+++ b/hbase-logging/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-build-configuration</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>../hbase-build-configuration</relativePath>
  </parent>

--- a/hbase-mapreduce/pom.xml
+++ b/hbase-mapreduce/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-build-configuration</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>../hbase-build-configuration</relativePath>
  </parent>
  <artifactId>hbase-mapreduce</artifactId>
--- a/hbase-metrics-api/pom.xml
+++ b/hbase-metrics-api/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-build-configuration</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>../hbase-build-configuration</relativePath>
  </parent>

--- a/hbase-metrics/pom.xml
+++ b/hbase-metrics/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-build-configuration</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>../hbase-build-configuration</relativePath>
  </parent>

--- a/hbase-procedure/pom.xml
+++ b/hbase-procedure/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-build-configuration</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>../hbase-build-configuration</relativePath>
  </parent>

--- a/hbase-protocol-shaded/pom.xml
+++ b/hbase-protocol-shaded/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-build-configuration</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>../hbase-build-configuration</relativePath>
  </parent>
  <artifactId>hbase-protocol-shaded</artifactId>
--- a/hbase-protocol/pom.xml
+++ b/hbase-protocol/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-build-configuration</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>../hbase-build-configuration</relativePath>
  </parent>
  <artifactId>hbase-protocol</artifactId>
--- a/hbase-replication/pom.xml
+++ b/hbase-replication/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-build-configuration</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>../hbase-build-configuration</relativePath>
  </parent>
  <artifactId>hbase-replication</artifactId>
--- a/hbase-resource-bundle/pom.xml
+++ b/hbase-resource-bundle/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-build-configuration</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>../hbase-build-configuration</relativePath>
  </parent>

--- a/hbase-rest/pom.xml
+++ b/hbase-rest/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-build-configuration</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>../hbase-build-configuration</relativePath>
  </parent>
  <artifactId>hbase-rest</artifactId>
--- a/hbase-rsgroup/pom.xml
+++ b/hbase-rsgroup/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-build-configuration</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>../hbase-build-configuration</relativePath>
  </parent>
  <artifactId>hbase-rsgroup</artifactId>
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-build-configuration</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>../hbase-build-configuration</relativePath>
  </parent>
  <artifactId>hbase-server</artifactId>
--- a/hbase-shaded/hbase-shaded-check-invariants/pom.xml
+++ b/hbase-shaded/hbase-shaded-check-invariants/pom.xml
@ -15,7 +15,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>../..</relativePath>
  </parent>
  <artifactId>hbase-shaded-check-invariants</artifactId>
--- a/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml
+++ b/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-shaded</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>..</relativePath>
  </parent>
  <artifactId>hbase-shaded-client-byo-hadoop</artifactId>
--- a/hbase-shaded/hbase-shaded-client/pom.xml
+++ b/hbase-shaded/hbase-shaded-client/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-shaded</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>..</relativePath>
  </parent>
  <artifactId>hbase-shaded-client</artifactId>
--- a/hbase-shaded/hbase-shaded-mapreduce/pom.xml
+++ b/hbase-shaded/hbase-shaded-mapreduce/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-shaded</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>..</relativePath>
  </parent>
  <artifactId>hbase-shaded-mapreduce</artifactId>
--- a/hbase-shaded/hbase-shaded-testing-util-tester/pom.xml
+++ b/hbase-shaded/hbase-shaded-testing-util-tester/pom.xml
@ -24,7 +24,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-build-configuration</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>../../hbase-build-configuration</relativePath>
  </parent>

--- a/hbase-shaded/hbase-shaded-testing-util/pom.xml
+++ b/hbase-shaded/hbase-shaded-testing-util/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-shaded</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>..</relativePath>
  </parent>

--- a/hbase-shaded/hbase-shaded-with-hadoop-check-invariants/pom.xml
+++ b/hbase-shaded/hbase-shaded-with-hadoop-check-invariants/pom.xml
@ -15,7 +15,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>../..</relativePath>
  </parent>
  <artifactId>hbase-shaded-with-hadoop-check-invariants</artifactId>
--- a/hbase-shaded/pom.xml
+++ b/hbase-shaded/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-build-configuration</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>../hbase-build-configuration</relativePath>
  </parent>
  <artifactId>hbase-shaded</artifactId>
--- a/hbase-shell/pom.xml
+++ b/hbase-shell/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-build-configuration</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>../hbase-build-configuration</relativePath>
  </parent>
  <artifactId>hbase-shell</artifactId>
--- a/hbase-testing-util/pom.xml
+++ b/hbase-testing-util/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-build-configuration</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>../hbase-build-configuration</relativePath>
  </parent>
  <artifactId>hbase-testing-util</artifactId>
--- a/hbase-thrift/pom.xml
+++ b/hbase-thrift/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-build-configuration</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>../hbase-build-configuration</relativePath>
  </parent>
  <artifactId>hbase-thrift</artifactId>
--- a/hbase-zookeeper/pom.xml
+++ b/hbase-zookeeper/pom.xml
@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.hbase</groupId>
    <artifactId>hbase-build-configuration</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
    <relativePath>../hbase-build-configuration</relativePath>
  </parent>
  <artifactId>hbase-zookeeper</artifactId>
--- a/pom.xml
+++ b/pom.xml
@ -38,7 +38,7 @@
  </parent>
  <groupId>org.apache.hbase</groupId>
  <artifactId>hbase</artifactId>
-  <version>2.6.0-SNAPSHOT</version>
+  <version>${revision}</version>
  <packaging>pom</packaging>
  <name>Apache HBase</name>
  <description>Apache HBase is the Hadoop database. Use it when you need
@ -521,6 +521,7 @@
    </site>
  </distributionManagement>
  <properties>
+    <revision>2.6.0-SNAPSHOT</revision>
    <!-- override on command line to have generated LICENSE files include
         diagnostic info for verifying notice requirements -->
    <license.debug.print.included>false</license.debug.print.included>
@ -540,7 +541,8 @@
    <compileSource>1.8</compileSource>
    <releaseTarget>8</releaseTarget>
    <!-- Build dependencies -->
-    <maven.min.version>3.0.4</maven.min.version>
+    <!-- The $revision feature is introduced in 3.5.0 -->
+    <maven.min.version>3.5.0</maven.min.version>
    <java.min.version>${compileSource}</java.min.version>
    <!-- Dependencies -->
    <hadoop-two.version>2.10.2</hadoop-two.version>