You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by nd...@apache.org on 2023/03/16 13:03:04 UTC
[hbase-operator-tools] branch master updated: HBASE-27696 [hbase-operator-tools] Use $revision as placeholder for maven version
This is an automated email from the ASF dual-hosted git repository.
ndimiduk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase-operator-tools.git
The following commit(s) were added to refs/heads/master by this push:
new b9b605b HBASE-27696 [hbase-operator-tools] Use $revision as placeholder for maven version
b9b605b is described below
commit b9b605bdb27041ea85631a1d282c88a306a2a938
Author: Nick Dimiduk <nd...@apache.org>
AuthorDate: Thu Mar 16 14:02:58 2023 +0100
HBASE-27696 [hbase-operator-tools] Use $revision as placeholder for maven version
Signed-off-by: Duo Zhang <zh...@apache.org>
Signed-off-by: Sean Busbey <bu...@apache.org>
---
.gitignore | 2 +-
dev-support/jenkins/Dockerfile | 5 +++--
hbase-hbck2/pom.xml | 2 +-
hbase-operator-tools-assembly/pom.xml | 9 ++++++---
hbase-table-reporter/pom.xml | 4 +---
hbase-tools/pom.xml | 2 +-
pom.xml | 31 +++++++++++++++++++++++++++++--
7 files changed, 42 insertions(+), 13 deletions(-)
diff --git a/.gitignore b/.gitignore
index cf0df74..b440d2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,7 @@ hbase-*/test
*.ipr
patchprocess/
dependency-reduced-pom.xml
-.flattened-pom.xml
+**/.flattened-pom.xml
link_report/
linklint-*.zip
linklint/
diff --git a/dev-support/jenkins/Dockerfile b/dev-support/jenkins/Dockerfile
index c87b905..cf13f71 100644
--- a/dev-support/jenkins/Dockerfile
+++ b/dev-support/jenkins/Dockerfile
@@ -15,12 +15,13 @@
# limitations under the License.
# Dockerfile for hbase-operator-tools pre-commit build.
-# https://builds.apache.org/job/PreCommit-HBASE-OPERATOR-TOOLS-Build
+# https://ci-hbase.apache.org/job/HBase-Operator-Tools-PreCommit/
-FROM maven:3.6-jdk-8
+FROM maven:3.8-jdk-8
# hadolint ignore=DL3008
RUN apt-get -q update && apt-get -q install --no-install-recommends -y \
+ binutils \
git \
rsync \
shellcheck \
diff --git a/hbase-hbck2/pom.xml b/hbase-hbck2/pom.xml
index 4948f21..629704e 100644
--- a/hbase-hbck2/pom.xml
+++ b/hbase-hbck2/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.hbase.operator.tools</groupId>
<artifactId>hbase-operator-tools</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${revision}</version>
<relativePath>..</relativePath>
</parent>
<artifactId>hbase-hbck2</artifactId>
diff --git a/hbase-operator-tools-assembly/pom.xml b/hbase-operator-tools-assembly/pom.xml
index 383a520..73b7aef 100644
--- a/hbase-operator-tools-assembly/pom.xml
+++ b/hbase-operator-tools-assembly/pom.xml
@@ -1,5 +1,8 @@
<?xml version="1.0"?>
-<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!--
/**
* Licensed to the Apache Software Foundation (ASF) under one
@@ -23,7 +26,7 @@
<parent>
<groupId>org.apache.hbase.operator.tools</groupId>
<artifactId>hbase-operator-tools</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${revision}</version>
<relativePath>..</relativePath>
</parent>
<artifactId>hbase-operator-tools-assembly</artifactId>
@@ -31,7 +34,7 @@
<description>
Module that does hbase-operator-tools assembly and that is all that it does.
We have a dedicated module just for assembly because of
- http://maven.apache.org/plugins/maven-assembly-plugin/faq.html#module-binaries
+ https://maven.apache.org/plugins/maven-assembly-plugin/faq.html#module-binaries
</description>
<packaging>pom</packaging>
<properties>
diff --git a/hbase-table-reporter/pom.xml b/hbase-table-reporter/pom.xml
index a02c33d..e866642 100644
--- a/hbase-table-reporter/pom.xml
+++ b/hbase-table-reporter/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.hbase.operator.tools</groupId>
<artifactId>hbase-operator-tools</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${revision}</version>
<relativePath>..</relativePath>
</parent>
<artifactId>hbase-table-reporter</artifactId>
@@ -62,8 +62,6 @@
<configuration>
<minimizeJar>true</minimizeJar>
<createDependencyReducedPom>true</createDependencyReducedPom>
- <dependencyReducedPomLocation>${java.io.tmpdir}/dependency-reduced-pom.xml
- </dependencyReducedPomLocation>
<artifactSet>
<excludes>
<exclude>org.apache.hbase:hbase-shaded-client</exclude>
diff --git a/hbase-tools/pom.xml b/hbase-tools/pom.xml
index 16e7723..281b7ff 100644
--- a/hbase-tools/pom.xml
+++ b/hbase-tools/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>hbase-operator-tools</artifactId>
<groupId>org.apache.hbase.operator.tools</groupId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${revision}</version>
<relativePath>..</relativePath>
</parent>
diff --git a/pom.xml b/pom.xml
index d5b7a84..56b1084 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,13 +38,13 @@
</parent>
<groupId>org.apache.hbase.operator.tools</groupId>
<artifactId>hbase-operator-tools</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${revision}</version>
<name>Apache HBase Operator Tools</name>
<packaging>pom</packaging>
<description>
Operator Tools for Apache HBase.
</description>
- <url>http://hbase.apache.org</url>
+ <url>https://hbase.apache.org</url>
<inceptionYear>2018</inceptionYear>
<licenses>
<license>
@@ -120,6 +120,7 @@
<developers/>
<!--TODO-->
<properties>
+ <revision>1.3.0-SNAPSHOT</revision>
<maven.javadoc.skip>true</maven.javadoc.skip>
<maven.build.timestamp.format>
yyyy-MM-dd'T'HH:mm
@@ -323,6 +324,32 @@
</plugins>
</pluginManagement>
<plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>flatten-maven-plugin</artifactId>
+ <version>1.3.0</version>
+ <configuration>
+ <updatePomFile>true</updatePomFile>
+ </configuration>
+ <executions>
+ <execution>
+ <!-- enable flattening -->
+ <id>flatten</id>
+ <goals>
+ <goal>flatten</goal>
+ </goals>
+ <phase>process-resources</phase>
+ </execution>
+ <execution>
+ <!-- ensure proper cleanup -->
+ <id>flatten.clean</id>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ <phase>clean</phase>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<configuration>