This is an automated email from the ASF dual-hosted git repository.

chengpan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kyuubi.git


The following commit(s) were added to refs/heads/master by this push:
     new 0056b6c9f [KYUUBI #6500] Remove service loader descriptor for 
relocated HMS DelegationTokenIdentifier
0056b6c9f is described below

commit 0056b6c9f3e0db8a6ab45ecae656ab071eeaa308
Author: Cheng Pan <[email protected]>
AuthorDate: Tue Jun 25 12:24:42 2024 +0800

    [KYUUBI #6500] Remove service loader descriptor for relocated HMS 
DelegationTokenIdentifier
    
    # :mag: Description
    
    It was fixed in https://github.com/apache/kyuubi-shaded/pull/44
    
    ## Types of changes :bookmark:
    
    - [ ] Bugfix (non-breaking change which fixes an issue)
    - [ ] New feature (non-breaking change which adds functionality)
    - [ ] Breaking change (fix or feature that would cause existing 
functionality to change)
    
    ## Test Plan ๐Ÿงช
    
    Pass GHA.
    
    ---
    
    # Checklist ๐Ÿ“
    
    - [x] This patch was not authored or co-authored using [Generative 
Tooling](https://www.apache.org/legal/generative-tooling.html)
    
    **Be nice. Be informative.**
    
    Closes #6500 from pan3793/rm-hms-dt-identifiler.
    
    Closes #6500
    
    f535e3f1b [Cheng Pan] fix
    47b32e3b7 [Cheng Pan] Remove 
org.apache.kyuubi.shaded.hive.metastore.security.DelegationTokenIdentifier
    
    Authored-by: Cheng Pan <[email protected]>
    Signed-off-by: Cheng Pan <[email protected]>
---
 .../org.apache.hadoop.security.token.TokenIdentifier   | 18 ------------------
 .../apache/kyuubi/service/CheckServerSPISuite.scala    | 14 ++++++--------
 2 files changed, 6 insertions(+), 26 deletions(-)

diff --git 
a/kyuubi-server/src/main/resources/META-INF/services/org.apache.hadoop.security.token.TokenIdentifier
 
b/kyuubi-server/src/main/resources/META-INF/services/org.apache.hadoop.security.token.TokenIdentifier
deleted file mode 100644
index f1f00d9aa..000000000
--- 
a/kyuubi-server/src/main/resources/META-INF/services/org.apache.hadoop.security.token.TokenIdentifier
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-org.apache.kyuubi.shaded.hive.metastore.security.DelegationTokenIdentifier
diff --git 
a/kyuubi-server/src/test/scala/org/apache/kyuubi/service/CheckServerSPISuite.scala
 
b/kyuubi-server/src/test/scala/org/apache/kyuubi/service/CheckServerSPISuite.scala
index 295c7df3d..c48d6638b 100644
--- 
a/kyuubi-server/src/test/scala/org/apache/kyuubi/service/CheckServerSPISuite.scala
+++ 
b/kyuubi-server/src/test/scala/org/apache/kyuubi/service/CheckServerSPISuite.scala
@@ -26,17 +26,15 @@ import org.apache.kyuubi.util.AssertionUtils._
 import org.apache.kyuubi.util.GoldenFileUtils._
 
 class CheckServerSPISuite extends AnyFunSuite {
-  // scalastyle:on
+// scalastyle:on
 
   test("check server SPI service file sorted") {
     Seq(
-      "org.apache.hadoop.security.token.TokenIdentifier",
       "org.apache.kyuubi.credentials.HadoopDelegationTokenProvider",
-      "org.apache.kyuubi.engine.ApplicationOperation")
-      .foreach { fileName =>
-        val filePath = Paths.get(
-          
s"${getCurrentModuleHome(this)}/src/main/resources/META-INF/services/$fileName")
-        assertFileContentSorted(filePath)
-      }
+      "org.apache.kyuubi.engine.ApplicationOperation").foreach { fileName =>
+      val filePath = Paths.get(
+        
s"${getCurrentModuleHome(this)}/src/main/resources/META-INF/services/$fileName")
+      assertFileContentSorted(filePath)
+    }
   }
 }

Reply via email to