From d837794a56f684531df3465a65d2f3cdd8030d11 Mon Sep 17 00:00:00 2001 From: Sahil Aggarwal Date: Wed, 6 Jun 2018 19:05:12 +0530 Subject: [PATCH] HBASE-19453: Use maven resource plugin to filter hbase-common.xml instead of ant plugin --- hbase-common/pom.xml | 16 ++++------------ hbase-common/src/main/resources/hbase-default.xml | 2 +- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml index 5ae8e0b637..d549e424d7 100644 --- a/hbase-common/pom.xml +++ b/hbase-common/pom.xml @@ -39,6 +39,7 @@ hbase-default.xml + true @@ -62,6 +63,9 @@ org.apache.maven.plugins maven-remote-resources-plugin + + maven-resources-plugin + maven-assembly-plugin @@ -72,18 +76,6 @@ maven-antrun-plugin - - process-resources - - - - - - - run - - generate diff --git a/hbase-common/src/main/resources/hbase-default.xml b/hbase-common/src/main/resources/hbase-default.xml index 7983ea3916..428a5c8a6e 100644 --- a/hbase-common/src/main/resources/hbase-default.xml +++ b/hbase-common/src/main/resources/hbase-default.xml @@ -1198,7 +1198,7 @@ possible configurations would overwhelm and obscure the important. hbase.defaults.for.version - @@@VERSION@@@ + ${project.version} This defaults file was compiled for version ${project.version}. This variable is used to make sure that a user doesn't have an old version of hbase-default.xml on the classpath. -- 2.16.2