HBASE-21842 Properly use flatten-maven-plugin in hbase-connectors

flatten-maven-plugin has been moved from <pluginManagement> to <plugins>. After doing an mvn install, it replaces ${revison} in <parent> section to the actual version. Other variable substitutions are untouched.
apache · Feb 13, 2019 · 2b8ed1d · 2b8ed1d
1 parent f0c3a3f
commit 2b8ed1d
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 32 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,6 +15,7 @@ hbase-*/test
 *.ipr
 patchprocess/
 dependency-reduced-pom.xml
+.flattened-pom.xml
 link_report/
 linklint-*.zip
 linklint/

diff --git a/hbase-connectors-assembly/pom.xml b/hbase-connectors-assembly/pom.xml
@@ -25,6 +25,7 @@
     <artifactId>hbase-connectors</artifactId>
     <groupId>org.apache.hbase.connectors</groupId>
     <version>${revision}</version>
+    <relativePath>../</relativePath>
   </parent>
   <artifactId>hbase-connectors-assembly</artifactId>
   <name>Apache HBase Connectors - Assembly</name>
@@ -39,12 +40,12 @@
     <dependency>
       <groupId>org.apache.hbase.connectors.kafka</groupId>
       <artifactId>hbase-kafka-proxy</artifactId>
-      <version>${project.version}</version>
+      <version>${revision}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.hbase.connectors.kafka</groupId>
       <artifactId>hbase-kafka-model</artifactId>
-      <version>${project.version}</version>
+      <version>${revision}</version>
     </dependency>
   </dependencies>
   <build>
@@ -59,7 +60,7 @@
               <goal>single</goal>
             </goals>
             <configuration>
-              <finalName>hbase-connectors-${project.version}</finalName>
+              <finalName>hbase-connectors-${revision}</finalName>
               <skipAssembly>false</skipAssembly>
               <appendAssemblyId>true</appendAssemblyId>
               <tarLongFileMode>gnu</tarLongFileMode>

diff --git a/hbase-connectors-assembly/src/main/assembly/hbase-connectors-bin.xml b/hbase-connectors-assembly/src/main/assembly/hbase-connectors-bin.xml
@@ -26,7 +26,7 @@
   <formats>
     <format>tar.gz</format>
   </formats>
-  <baseDirectory>hbase-connectors-${project.version}</baseDirectory>
+  <baseDirectory>hbase-connectors-${revision}</baseDirectory>
   <componentDescriptors>
       <componentDescriptor>src/main/assembly/connector-components.xml</componentDescriptor>
   </componentDescriptors>

diff --git a/kafka/pom.xml b/kafka/pom.xml
@@ -48,7 +48,7 @@
       <dependency>
         <groupId>org.apache.hbase.connectors.kafka</groupId>
         <artifactId>hbase-kafka-model</artifactId>
-        <version>${project.version}</version>
+        <version>${revision}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>

diff --git a/pom.xml b/pom.xml
@@ -291,31 +291,6 @@
     </extensions>
     <pluginManagement>
       <plugins>
-        <!-- See https://maven.apache.org/maven-ci-friendly.html-->
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>flatten-maven-plugin</artifactId>
-          <version>1.0.1</version>
-          <configuration>
-            <updatePomFile>true</updatePomFile>
-          </configuration>
-          <executions>
-            <execution>
-              <id>flatten</id>
-              <phase>process-resources</phase>
-              <goals>
-                <goal>flatten</goal>
-              </goals>
-            </execution>
-            <execution>
-              <id>flatten.clean</id>
-              <phase>clean</phase>
-              <goals>
-                <goal>clean</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
         <plugin>
           <artifactId>maven-assembly-plugin</artifactId>
           <configuration>
@@ -502,6 +477,32 @@
           </execution>
         </executions>
       </plugin>
+      <!-- See https://maven.apache.org/maven-ci-friendly.html-->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>flatten-maven-plugin</artifactId>
+        <version>1.1.0</version>
+        <configuration>
+          <updatePomFile>true</updatePomFile>
+          <flattenMode>resolveCiFriendliesOnly</flattenMode>
+        </configuration>
+        <executions>
+          <execution>
+            <id>flatten</id>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>flatten</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>flatten.clean</id>
+            <phase>clean</phase>
+            <goals>
+              <goal>clean</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
   <profiles>

diff --git a/spark/hbase-spark-it/pom.xml b/spark/hbase-spark-it/pom.xml
@@ -201,7 +201,7 @@
     <dependency>
       <groupId>org.apache.hbase.connectors.spark</groupId>
       <artifactId>hbase-spark</artifactId>
-      <version>${project.version}</version>
+      <version>${revision}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.hbase</groupId>

diff --git a/spark/pom.xml b/spark/pom.xml
@@ -53,7 +53,7 @@
       <dependency>
         <groupId>org.apache.hbase.connectors.spark</groupId>
         <artifactId>hbase-spark</artifactId>
-        <version>${project.version}</version>
+        <version>${revision}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.hbase.thirdparty</groupId>