From ac9d934ad09acf15969e9c348f98dfb2ab794567 Mon Sep 17 00:00:00 2001 From: Sahil Aggarwal Date: Wed, 6 Jun 2018 17:50:39 +0530 Subject: [PATCH] HBASE-19453: Use maven resource plugin to filter hbase-common.xml instead of ant plugin --- hbase-common/pom.xml | 35 +++++++++++++++-------- hbase-common/src/main/resources/hbase-default.xml | 2 +- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml index 5ae8e0b637..3afb9e6731 100644 --- a/hbase-common/pom.xml +++ b/hbase-common/pom.xml @@ -62,6 +62,29 @@ org.apache.maven.plugins maven-remote-resources-plugin + + maven-resources-plugin + + + process-resources + + copy-resources + + + + + src/main/resources/ + + hbase-default.xml + + true + + + ${project.build.outputDirectory} + + + + maven-assembly-plugin @@ -72,18 +95,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