From 250cd9f5750984027c2fe6a8414b7ef63d5045e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tam=C3=A1s=20P=C3=A9nzes?= <tamaas@cloudera.com>
Date: Mon, 6 Jan 2020 14:12:28 +0100
Subject: [PATCH] HADOOP-16772. Extract version numbers to head of pom.xml
 (addendum) (#1774). Contributed by Tamas Penzes.

Follow up task of HADOOP-16729, extract even more version numbers for branch-3.2.

Change-Id: I0546fc8ec8f68baa4bcfa9db0df4d8293b078913
---
 hadoop-project/pom.xml | 40 ++++++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index cd13ac36a57..69d091d6ed2 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -107,10 +107,17 @@
     <!-- Apache Commons dependencies -->
     <commons-beanutils.version>1.9.4</commons-beanutils.version>
     <commons-cli.version>1.2</commons-cli.version>
+    <commons-codec.version>1.11</commons-codec.version>
     <commons-collections.version>3.2.2</commons-collections.version>
+    <commons-compress.version>1.19</commons-compress.version>
+    <commons-csv.version>1.0</commons-csv.version>
     <commons-io.version>2.5</commons-io.version>
     <commons-lang3.version>3.7</commons-lang3.version>
+    <commons-logging.version>1.1.3</commons-logging.version>
+    <commons-logging-api.version>1.1</commons-logging-api.version>
     <commons-math3.version>3.1.1</commons-math3.version>
+    <commons-net.version>3.6</commons-net.version>
+    <commons-text.version>1.4</commons-text.version>
 
     <!-- Apache Ratis version -->
     <ratis.version>0.3.0-eca3531-SNAPSHOT</ratis.version>
@@ -119,7 +126,12 @@
     <hikari.version>2.4.12</hikari.version>
     <mssql.version>6.2.1.jre7</mssql.version>
     <okhttp.version>2.7.5</okhttp.version>
+    <jdom.version>1.1</jdom.version>
+    <grizzly.version>2.2.21</grizzly.version>
     <gson.version>2.2.4</gson.version>
+    <htrace3.version>3.1.0-incubating</htrace3.version>
+    <htrace4.version>4.1.0-incubating</htrace4.version>
+    <metrics.version>3.2.4</metrics.version>
     <netty3.version>3.10.6.Final</netty3.version>
     <netty4.version>4.0.52.Final</netty4.version>
 
@@ -637,12 +649,12 @@
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-compress</artifactId>
-        <version>1.19</version>
+        <version>${commons-compress.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-csv</artifactId>
-        <version>1.0</version>
+        <version>${commons-csv.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
@@ -657,12 +669,12 @@
       <dependency>
         <groupId>commons-codec</groupId>
         <artifactId>commons-codec</artifactId>
-        <version>1.11</version>
+        <version>${commons-codec.version}</version>
       </dependency>
       <dependency>
         <groupId>commons-net</groupId>
         <artifactId>commons-net</artifactId>
-        <version>3.6</version>
+        <version>${commons-net.version}</version>
       </dependency>
       <dependency>
         <groupId>javax.servlet</groupId>
@@ -869,7 +881,7 @@
       <dependency>
         <groupId>commons-logging</groupId>
         <artifactId>commons-logging</artifactId>
-        <version>1.1.3</version>
+        <version>${commons-logging.version}</version>
         <exclusions>
           <exclusion>
             <groupId>avalon-framework</groupId>
@@ -888,7 +900,7 @@
       <dependency>
         <groupId>commons-logging</groupId>
         <artifactId>commons-logging-api</artifactId>
-        <version>1.1</version>
+        <version>${commons-logging-api.version}</version>
       </dependency>
       <dependency>
         <groupId>log4j</groupId>
@@ -987,7 +999,7 @@
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-text</artifactId>
-        <version>1.4</version>
+        <version>${commons-text.version}</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
@@ -1123,17 +1135,17 @@
       <dependency>
         <groupId>org.apache.htrace</groupId>
         <artifactId>htrace-core</artifactId>
-        <version>3.1.0-incubating</version>
+        <version>${htrace3.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.htrace</groupId>
         <artifactId>htrace-core4</artifactId>
-        <version>4.1.0-incubating</version>
+        <version>${htrace4.version}</version>
       </dependency>
       <dependency>
         <groupId>org.jdom</groupId>
         <artifactId>jdom</artifactId>
-        <version>1.1</version>
+        <version>${jdom.version}</version>
       </dependency>
       <dependency>
         <groupId>com.googlecode.json-simple</groupId>
@@ -1193,7 +1205,7 @@
       <dependency>
         <groupId>io.dropwizard.metrics</groupId>
         <artifactId>metrics-core</artifactId>
-        <version>3.2.4</version>
+        <version>${metrics.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.hadoop</groupId>
@@ -1235,17 +1247,17 @@
       <dependency>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-http-servlet</artifactId>
-        <version>2.2.21</version>
+        <version>${grizzly.version}</version>
       </dependency>
       <dependency>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-http</artifactId>
-        <version>2.2.21</version>
+        <version>${grizzly.version}</version>
       </dependency>
       <dependency>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-http-server</artifactId>
-        <version>2.2.21</version>
+        <version>${grizzly.version}</version>
       </dependency>
 
       <dependency>