Merge branch 'branch-3.1.1' of git://github.com/apache/hadoop into ar…

…enadata-branch-3.1.0
arenadata · Mar 23, 2021 · af33d00 · af33d00
2 parents d4f04f2 + 7caf768
commit af33d00
Show file tree

Hide file tree

Showing 114 changed files with 895 additions and 664 deletions.
diff --git a/hadoop-assemblies/pom.xml b/hadoop-assemblies/pom.xml
@@ -23,12 +23,20 @@
   <parent>
     <groupId>org.apache.hadoop</groupId>
     <artifactId>hadoop-project</artifactId>
+<<<<<<< HEAD
 <<<<<<< HEAD
     <version>3.1.0</version>
     <relativePath>../hadoop-project</relativePath>
   </parent>
   <artifactId>hadoop-assemblies</artifactId>
   <version>3.1.0</version>
+=======
+    <version>3.1.1</version>
+    <relativePath>../hadoop-project</relativePath>
+  </parent>
+  <artifactId>hadoop-assemblies</artifactId>
+  <version>3.1.1</version>
+>>>>>>> 7caf768a8c9a639b6139b2cae8656c89e3d8c58d
 =======
     <version>3.1.1</version>
     <relativePath>../hadoop-project</relativePath>

diff --git a/hadoop-build-tools/pom.xml b/hadoop-build-tools/pom.xml
@@ -18,8 +18,12 @@
   <parent>
     <artifactId>hadoop-main</artifactId>
     <groupId>org.apache.hadoop</groupId>
+<<<<<<< HEAD
 <<<<<<< HEAD
     <version>3.1.0</version>
+=======
+    <version>3.1.1</version>
+>>>>>>> 7caf768a8c9a639b6139b2cae8656c89e3d8c58d
 =======
     <version>3.1.1</version>
 >>>>>>> 7caf768a8c9a639b6139b2cae8656c89e3d8c58d

diff --git a/hadoop-client-modules/hadoop-client-api/pom.xml b/hadoop-client-modules/hadoop-client-api/pom.xml
@@ -18,12 +18,20 @@
 <parent>
    <groupId>org.apache.hadoop</groupId>
    <artifactId>hadoop-project</artifactId>
+<<<<<<< HEAD
 <<<<<<< HEAD
    <version>3.1.0</version>
    <relativePath>../../hadoop-project</relativePath>
 </parent>
   <artifactId>hadoop-client-api</artifactId>
   <version>3.1.0</version>
+=======
+   <version>3.1.1</version>
+   <relativePath>../../hadoop-project</relativePath>
+</parent>
+  <artifactId>hadoop-client-api</artifactId>
+  <version>3.1.1</version>
+>>>>>>> 7caf768a8c9a639b6139b2cae8656c89e3d8c58d
 =======
    <version>3.1.1</version>
    <relativePath>../../hadoop-project</relativePath>

diff --git a/hadoop-client-modules/hadoop-client-check-invariants/pom.xml b/hadoop-client-modules/hadoop-client-check-invariants/pom.xml
@@ -18,12 +18,20 @@
   <parent>
     <groupId>org.apache.hadoop</groupId>
     <artifactId>hadoop-project</artifactId>
+<<<<<<< HEAD
 <<<<<<< HEAD
     <version>3.1.0</version>
     <relativePath>../../hadoop-project</relativePath>
   </parent>
   <artifactId>hadoop-client-check-invariants</artifactId>
   <version>3.1.0</version>
+=======
+    <version>3.1.1</version>
+    <relativePath>../../hadoop-project</relativePath>
+  </parent>
+  <artifactId>hadoop-client-check-invariants</artifactId>
+  <version>3.1.1</version>
+>>>>>>> 7caf768a8c9a639b6139b2cae8656c89e3d8c58d
 =======
     <version>3.1.1</version>
     <relativePath>../../hadoop-project</relativePath>

diff --git a/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml b/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml
@@ -18,12 +18,20 @@
   <parent>
     <groupId>org.apache.hadoop</groupId>
     <artifactId>hadoop-project</artifactId>
+<<<<<<< HEAD
 <<<<<<< HEAD
     <version>3.1.0</version>
     <relativePath>../../hadoop-project</relativePath>
   </parent>
   <artifactId>hadoop-client-check-test-invariants</artifactId>
   <version>3.1.0</version>
+=======
+    <version>3.1.1</version>
+    <relativePath>../../hadoop-project</relativePath>
+  </parent>
+  <artifactId>hadoop-client-check-test-invariants</artifactId>
+  <version>3.1.1</version>
+>>>>>>> 7caf768a8c9a639b6139b2cae8656c89e3d8c58d
 =======
     <version>3.1.1</version>
     <relativePath>../../hadoop-project</relativePath>

diff --git a/hadoop-client-modules/hadoop-client-integration-tests/pom.xml b/hadoop-client-modules/hadoop-client-integration-tests/pom.xml
@@ -18,12 +18,20 @@
   <parent>
     <groupId>org.apache.hadoop</groupId>
     <artifactId>hadoop-project</artifactId>
+<<<<<<< HEAD
 <<<<<<< HEAD
     <version>3.1.0</version>
     <relativePath>../../hadoop-project</relativePath>
   </parent>
   <artifactId>hadoop-client-integration-tests</artifactId>
   <version>3.1.0</version>
+=======
+    <version>3.1.1</version>
+    <relativePath>../../hadoop-project</relativePath>
+  </parent>
+  <artifactId>hadoop-client-integration-tests</artifactId>
+  <version>3.1.1</version>
+>>>>>>> 7caf768a8c9a639b6139b2cae8656c89e3d8c58d
 =======
     <version>3.1.1</version>
     <relativePath>../../hadoop-project</relativePath>

diff --git a/hadoop-client-modules/hadoop-client-minicluster/pom.xml b/hadoop-client-modules/hadoop-client-minicluster/pom.xml
@@ -18,12 +18,20 @@
   <parent>
     <groupId>org.apache.hadoop</groupId>
     <artifactId>hadoop-project</artifactId>
+<<<<<<< HEAD
 <<<<<<< HEAD
     <version>3.1.0</version>
     <relativePath>../../hadoop-project</relativePath>
   </parent>
   <artifactId>hadoop-client-minicluster</artifactId>
   <version>3.1.0</version>
+=======
+    <version>3.1.1</version>
+    <relativePath>../../hadoop-project</relativePath>
+  </parent>
+  <artifactId>hadoop-client-minicluster</artifactId>
+  <version>3.1.1</version>
+>>>>>>> 7caf768a8c9a639b6139b2cae8656c89e3d8c58d
 =======
     <version>3.1.1</version>
     <relativePath>../../hadoop-project</relativePath>
@@ -759,6 +767,7 @@
                         <exclude>capacity-scheduler.xml</exclude>
                         <exclude>krb5.conf</exclude>
                         <exclude>.keep</exclude>
+<<<<<<< HEAD
                       </excludes>
                     </filter>
 
@@ -783,6 +792,32 @@
                       </excludes>
                     </filter>
 
+=======
+                      </excludes>
+                    </filter>
+
+                    <!-- remove .xsd from ehcache -->
+                    <filter>
+                      <artifact>org.ehcache</artifact>
+                      <excludes>
+                        <exclude>ehcache-107ext.xsd</exclude>
+                        <exclude>ehcache-core.xsd</exclude>
+                      </excludes>
+                    </filter>
+
+                   <!-- remove utility classes which are not required from
+                        dnsjava -->
+                    <filter>
+                      <artifact>dnsjava:dnsjava</artifact>
+                      <excludes>
+                        <excldue>dig*</excldue>
+                        <exclude>jnamed*</exclude>
+                        <exlcude>lookup*</exlcude>
+                        <exclude>update*</exclude>
+                      </excludes>
+                    </filter>
+
+>>>>>>> 7caf768a8c9a639b6139b2cae8656c89e3d8c58d
                   </filters>
 
                   <!-- relocate classes from mssql-jdbc -->

diff --git a/hadoop-client-modules/hadoop-client-runtime/pom.xml b/hadoop-client-modules/hadoop-client-runtime/pom.xml
@@ -18,12 +18,20 @@
 <parent>
    <groupId>org.apache.hadoop</groupId>
    <artifactId>hadoop-project</artifactId>
+<<<<<<< HEAD
 <<<<<<< HEAD
    <version>3.1.0</version>
    <relativePath>../../hadoop-project</relativePath>
 </parent>
   <artifactId>hadoop-client-runtime</artifactId>
   <version>3.1.0</version>
+=======
+   <version>3.1.1</version>
+   <relativePath>../../hadoop-project</relativePath>
+</parent>
+  <artifactId>hadoop-client-runtime</artifactId>
+  <version>3.1.1</version>
+>>>>>>> 7caf768a8c9a639b6139b2cae8656c89e3d8c58d
 =======
    <version>3.1.1</version>
    <relativePath>../../hadoop-project</relativePath>

diff --git a/hadoop-client-modules/hadoop-client/pom.xml b/hadoop-client-modules/hadoop-client/pom.xml
@@ -18,12 +18,20 @@
 <parent>
    <groupId>org.apache.hadoop</groupId>
    <artifactId>hadoop-project-dist</artifactId>
+<<<<<<< HEAD
 <<<<<<< HEAD
    <version>3.1.0</version>
    <relativePath>../../hadoop-project-dist</relativePath>
 </parent>
   <artifactId>hadoop-client</artifactId>
   <version>3.1.0</version>
+=======
+   <version>3.1.1</version>
+   <relativePath>../../hadoop-project-dist</relativePath>
+</parent>
+  <artifactId>hadoop-client</artifactId>
+  <version>3.1.1</version>
+>>>>>>> 7caf768a8c9a639b6139b2cae8656c89e3d8c58d
 =======
    <version>3.1.1</version>
    <relativePath>../../hadoop-project-dist</relativePath>

diff --git a/hadoop-client-modules/pom.xml b/hadoop-client-modules/pom.xml
@@ -18,8 +18,12 @@
   <parent>
     <groupId>org.apache.hadoop</groupId>
     <artifactId>hadoop-project</artifactId>
+<<<<<<< HEAD
 <<<<<<< HEAD
     <version>3.1.0</version>
+=======
+    <version>3.1.1</version>
+>>>>>>> 7caf768a8c9a639b6139b2cae8656c89e3d8c58d
 =======
     <version>3.1.1</version>
 >>>>>>> 7caf768a8c9a639b6139b2cae8656c89e3d8c58d

diff --git a/hadoop-cloud-storage-project/hadoop-cloud-storage/pom.xml b/hadoop-cloud-storage-project/hadoop-cloud-storage/pom.xml
@@ -18,12 +18,20 @@
   <parent>
     <groupId>org.apache.hadoop</groupId>
     <artifactId>hadoop-project</artifactId>
+<<<<<<< HEAD
 <<<<<<< HEAD
     <version>3.1.0</version>
     <relativePath>../../hadoop-project</relativePath>
   </parent>
   <artifactId>hadoop-cloud-storage</artifactId>
   <version>3.1.0</version>
+=======
+    <version>3.1.1</version>
+    <relativePath>../../hadoop-project</relativePath>
+  </parent>
+  <artifactId>hadoop-cloud-storage</artifactId>
+  <version>3.1.1</version>
+>>>>>>> 7caf768a8c9a639b6139b2cae8656c89e3d8c58d
 =======
     <version>3.1.1</version>
     <relativePath>../../hadoop-project</relativePath>

diff --git a/hadoop-cloud-storage-project/pom.xml b/hadoop-cloud-storage-project/pom.xml
@@ -20,12 +20,20 @@
   <parent>
     <groupId>org.apache.hadoop</groupId>
     <artifactId>hadoop-project</artifactId>
+<<<<<<< HEAD
 <<<<<<< HEAD
     <version>3.1.0</version>
     <relativePath>../hadoop-project</relativePath>
   </parent>
   <artifactId>hadoop-cloud-storage-project</artifactId>
   <version>3.1.0</version>
+=======
+    <version>3.1.1</version>
+    <relativePath>../hadoop-project</relativePath>
+  </parent>
+  <artifactId>hadoop-cloud-storage-project</artifactId>
+  <version>3.1.1</version>
+>>>>>>> 7caf768a8c9a639b6139b2cae8656c89e3d8c58d
 =======
     <version>3.1.1</version>
     <relativePath>../hadoop-project</relativePath>

diff --git a/hadoop-common-project/hadoop-annotations/pom.xml b/hadoop-common-project/hadoop-annotations/pom.xml
@@ -20,12 +20,20 @@
   <parent>
     <groupId>org.apache.hadoop</groupId>
     <artifactId>hadoop-project</artifactId>
+<<<<<<< HEAD
 <<<<<<< HEAD
     <version>3.1.0</version>
     <relativePath>../../hadoop-project</relativePath>
   </parent>
   <artifactId>hadoop-annotations</artifactId>
   <version>3.1.0</version>
+=======
+    <version>3.1.1</version>
+    <relativePath>../../hadoop-project</relativePath>
+  </parent>
+  <artifactId>hadoop-annotations</artifactId>
+  <version>3.1.1</version>
+>>>>>>> 7caf768a8c9a639b6139b2cae8656c89e3d8c58d
 =======
     <version>3.1.1</version>
     <relativePath>../../hadoop-project</relativePath>

diff --git a/hadoop-common-project/hadoop-auth-examples/pom.xml b/hadoop-common-project/hadoop-auth-examples/pom.xml
@@ -20,12 +20,20 @@
   <parent>
     <groupId>org.apache.hadoop</groupId>
     <artifactId>hadoop-project</artifactId>
+<<<<<<< HEAD
 <<<<<<< HEAD
     <version>3.1.0</version>
     <relativePath>../../hadoop-project</relativePath>
   </parent>
   <artifactId>hadoop-auth-examples</artifactId>
   <version>3.1.0</version>
+=======
+    <version>3.1.1</version>
+    <relativePath>../../hadoop-project</relativePath>
+  </parent>
+  <artifactId>hadoop-auth-examples</artifactId>
+  <version>3.1.1</version>
+>>>>>>> 7caf768a8c9a639b6139b2cae8656c89e3d8c58d
 =======
     <version>3.1.1</version>
     <relativePath>../../hadoop-project</relativePath>

diff --git a/hadoop-common-project/hadoop-auth/pom.xml b/hadoop-common-project/hadoop-auth/pom.xml
@@ -20,12 +20,20 @@
   <parent>
     <groupId>org.apache.hadoop</groupId>
     <artifactId>hadoop-project</artifactId>
+<<<<<<< HEAD
 <<<<<<< HEAD
     <version>3.1.0</version>
     <relativePath>../../hadoop-project</relativePath>
   </parent>
   <artifactId>hadoop-auth</artifactId>
   <version>3.1.0</version>
+=======
+    <version>3.1.1</version>
+    <relativePath>../../hadoop-project</relativePath>
+  </parent>
+  <artifactId>hadoop-auth</artifactId>
+  <version>3.1.1</version>
+>>>>>>> 7caf768a8c9a639b6139b2cae8656c89e3d8c58d
 =======
     <version>3.1.1</version>
     <relativePath>../../hadoop-project</relativePath>

diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml
@@ -20,12 +20,20 @@
   <parent>
     <groupId>org.apache.hadoop</groupId>
     <artifactId>hadoop-project-dist</artifactId>
+<<<<<<< HEAD
 <<<<<<< HEAD
     <version>3.1.0</version>
     <relativePath>../../hadoop-project-dist</relativePath>
   </parent>
   <artifactId>hadoop-common</artifactId>
   <version>3.1.0</version>
+=======
+    <version>3.1.1</version>
+    <relativePath>../../hadoop-project-dist</relativePath>
+  </parent>
+  <artifactId>hadoop-common</artifactId>
+  <version>3.1.1</version>
+>>>>>>> 7caf768a8c9a639b6139b2cae8656c89e3d8c58d
 =======
     <version>3.1.1</version>
     <relativePath>../../hadoop-project-dist</relativePath>

diff --git a/hadoop-common-project/hadoop-kms/pom.xml b/hadoop-common-project/hadoop-kms/pom.xml
@@ -22,12 +22,20 @@
   <parent>
     <groupId>org.apache.hadoop</groupId>
     <artifactId>hadoop-project</artifactId>
+<<<<<<< HEAD
 <<<<<<< HEAD
     <version>3.1.0</version>
     <relativePath>../../hadoop-project</relativePath>
   </parent>
   <artifactId>hadoop-kms</artifactId>
   <version>3.1.0</version>
+=======
+    <version>3.1.1</version>
+    <relativePath>../../hadoop-project</relativePath>
+  </parent>
+  <artifactId>hadoop-kms</artifactId>
+  <version>3.1.1</version>
+>>>>>>> 7caf768a8c9a639b6139b2cae8656c89e3d8c58d
 =======
     <version>3.1.1</version>
     <relativePath>../../hadoop-project</relativePath>