From 272844ee572be9de320ce64cc4fc136af6743920 Mon Sep 17 00:00:00 2001
From: Colm O hEigeartaigh <coheigea@users.noreply.github.com>
Date: Wed, 14 Sep 2022 17:43:25 +0100
Subject: [PATCH] HADOOP-15072 - Update Apache Kerby to 2.0.2 (#4473)

---
 LICENSE-binary         | 30 +++++++++++++++---------------
 hadoop-project/pom.xml |  8 +++++++-
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/LICENSE-binary b/LICENSE-binary
index 05b7dcfbe36..d9762b14c34 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -325,21 +325,21 @@ org.apache.htrace:htrace-core4:4.1.0-incubating
 org.apache.httpcomponents:httpclient:4.5.6
 org.apache.httpcomponents:httpcore:4.4.10
 org.apache.kafka:kafka-clients:2.8.1
-org.apache.kerby:kerb-admin:1.0.1
-org.apache.kerby:kerb-client:1.0.1
-org.apache.kerby:kerb-common:1.0.1
-org.apache.kerby:kerb-core:1.0.1
-org.apache.kerby:kerb-crypto:1.0.1
-org.apache.kerby:kerb-identity:1.0.1
-org.apache.kerby:kerb-server:1.0.1
-org.apache.kerby:kerb-simplekdc:1.0.1
-org.apache.kerby:kerb-util:1.0.1
-org.apache.kerby:kerby-asn1:1.0.1
-org.apache.kerby:kerby-config:1.0.1
-org.apache.kerby:kerby-pkix:1.0.1
-org.apache.kerby:kerby-util:1.0.1
-org.apache.kerby:kerby-xdr:1.0.1
-org.apache.kerby:token-provider:1.0.1
+org.apache.kerby:kerb-admin:2.0.2
+org.apache.kerby:kerb-client:2.0.2
+org.apache.kerby:kerb-common:2.0.2
+org.apache.kerby:kerb-core:2.0.2
+org.apache.kerby:kerb-crypto:2.0.2
+org.apache.kerby:kerb-identity:2.0.2
+org.apache.kerby:kerb-server:2.0.2
+org.apache.kerby:kerb-simplekdc:2.0.2
+org.apache.kerby:kerb-util:2.0.2
+org.apache.kerby:kerby-asn1:2.0.2
+org.apache.kerby:kerby-config:2.0.2
+org.apache.kerby:kerby-pkix:2.0.2
+org.apache.kerby:kerby-util:2.0.2
+org.apache.kerby:kerby-xdr:2.0.2
+org.apache.kerby:token-provider:2.0.2
 org.apache.solr:solr-solrj:8.8.2
 org.apache.yetus:audience-annotations:0.5.0
 org.apache.zookeeper:zookeeper:3.6.3
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 6649fa57400..771f0196802 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -126,7 +126,7 @@
     <commons-net.version>3.8.0</commons-net.version>
     <commons-text.version>1.4</commons-text.version>
 
-    <kerby.version>1.0.1</kerby.version>
+    <kerby.version>2.0.2</kerby.version>
     <jcache.version>1.0-alpha-1</jcache.version>
     <ehcache.version>3.3.1</ehcache.version>
     <hikari.version>4.0.3</hikari.version>
@@ -1782,6 +1782,12 @@
           <groupId>org.apache.kerby</groupId>
           <artifactId>kerb-simplekdc</artifactId>
           <version>${kerby.version}</version>
+          <exclusions>
+            <exclusion>
+                <groupId>org.jboss.xnio</groupId>
+                <artifactId>xnio-api</artifactId>
+            </exclusion>
+          </exclusions>
         </dependency>
         <dependency>
           <groupId>org.apache.kerby</groupId>