[kerberos][去除flink-shaded依赖]

Author: yanxi0227

core/pom.xml

@@ -67,9 +67,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-yarn_2.11</artifactId>
-            <version>${flink.version}</version>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.10</version>
         </dependency>
 
         <dependency>

launcher/pom.xml

@@ -22,6 +22,42 @@
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-yarn_2.11</artifactId>
             <version>${flink.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.flink</groupId>
+                    <artifactId>flink-shaded-hadoop-2</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-common</artifactId>
+            <version>${hadoop.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-hdfs</artifactId>
+            <version>${hadoop.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-yarn-common</artifactId>
+            <version>${hadoop.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-yarn-client</artifactId>
+            <version>${hadoop.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-mapreduce-client-core</artifactId>
+            <version>${hadoop.version}</version>
         </dependency>
 
         <dependency>

launcher/src/main/java/com/dtstack/flink/sql/launcher/perjob/PerJobClusterClientBuilder.java

@@ -71,7 +71,7 @@ public void init(String yarnConfDir, Properties conf) throws IOException {
 
         yarnConf = YarnConfLoader.getYarnConf(yarnConfDir);
 
-        if (openKerberos(conf)){
+        if (isKerberos(conf)){
             String keytab = (String) conf.get(KEYTAB);
             String principal = (String) conf.get(PRINCIPAL);
             login(yarnConf, keytab, principal);
@@ -161,17 +161,19 @@ private AbstractYarnClusterDescriptor getClusterDescriptor(
                 false);
     }
 
-    private boolean openKerberos(Properties conf){
+    private boolean isKerberos(Properties conf){
         String keytab = (String) conf.get(KEYTAB);
-        String principal = (String) conf.get(PRINCIPAL);
-        if (StringUtils.isNotBlank(keytab) && StringUtils.isNotBlank(principal)){
+        if (StringUtils.isNotBlank(keytab)){
             return true;
         } else {
             return false;
         }
     }
 
     private void login(org.apache.hadoop.conf.Configuration conf, String keytab, String principal) throws IOException {
+        if (StringUtils.isEmpty(principal)){
+            throw new RuntimeException(PRINCIPAL + " must not be null!");
+        }
         UserGroupInformation.setConfiguration(conf);
         UserGroupInformation.loginUserFromKeytab(principal, keytab);
         LOG.info("login successfully! keytab: " + keytab + "principal: " + principal);

pom.xml

@@ -36,6 +36,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <flink.version>1.9.1</flink.version>
+      <hadoop.version>2.7.3</hadoop.version>
   </properties>
 
     <build>