Merge pull request #30 from carlyin0801/master

升级第三方依赖包版本

Author: carlyin0801

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.tencent.devops.ci-plugins</groupId>
     <artifactId>java-plugin-sdk</artifactId>
-    <version>1.0.6</version>
+    <version>1.0.7</version>
 
     <inceptionYear>2018-2118</inceptionYear>
     <description>bk-ci pipeline plugins sdk for java</description>
@@ -46,7 +46,7 @@
         <!--项目版本 -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- 依赖库/框架版本定义 -->
-        <lib.guava.version>19.0</lib.guava.version>
+        <lib.guava.version>30.1.1-jre</lib.guava.version>
         <lib.commons.lang3.version>3.12.0</lib.commons.lang3.version>
         <lib.javasimon.version>3.5.2</lib.javasimon.version>
         <lib.dozer.version>5.5.1</lib.dozer.version>
@@ -118,7 +118,7 @@
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>3.12.0</version>
+            <version>4.9.1</version>
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
@@ -133,7 +133,7 @@
         <dependency>
             <groupId>org.apache.ant</groupId>
             <artifactId>ant</artifactId>
-            <version>1.10.9</version>
+            <version>1.10.10</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

src/main/java/com/tencent/bk/devops/atom/AtomContext.java

@@ -29,9 +29,9 @@ public class AtomContext<T extends AtomBaseParam> {
 
     private final AtomResult result;
 
-    private final static String ATOM_FILE_ENCODING = "UTF-8";
+    private static final String ATOM_FILE_ENCODING = "UTF-8";
 
-    private final static Logger logger = LoggerFactory.getLogger(AtomContext.class);
+    private static final Logger logger = LoggerFactory.getLogger(AtomContext.class);
 
     /**
      * 插件定义的参数类
@@ -70,14 +70,15 @@ public T getParam() {
 
     /**
      * 获取敏感信息参数
+     *
      * @param filedName 字段名
      * @return 敏感信息参数
      */
-    public String getSensitiveConfParam(String filedName){
-        Map<String,String> bkSensitiveConfInfo = param.getBkSensitiveConfInfo();
-        if(null != bkSensitiveConfInfo){
+    public String getSensitiveConfParam(String filedName) {
+        Map<String, String> bkSensitiveConfInfo = param.getBkSensitiveConfInfo();
+        if (null != bkSensitiveConfInfo) {
             return bkSensitiveConfInfo.get(filedName);
-        }else{
+        } else {
             return null;
         }
     }
@@ -96,9 +97,10 @@ private T readParam(Class<T> paramClazz) throws IOException {
         return JsonUtil.fromJson(json, paramClazz);
     }
 
-    public Map<String,Object>  getAllParameters() throws IOException {
+    public Map<String, Object> getAllParameters() throws IOException {
         String json = FileUtils.readFileToString(new File(dataDir + "/" + inputFile), ATOM_FILE_ENCODING);
-        return JsonUtil.fromJson(json, new TypeReference<Map<String, Object>>(){});
+        return JsonUtil.fromJson(json, new TypeReference<Map<String, Object>>() {
+        });
     }
 
     void persistent() throws IOException {

src/main/java/com/tencent/bk/devops/atom/AtomRunner.java

@@ -12,6 +12,7 @@
 import java.io.IOException;
 
 /**
+ * 插件执行入口类
  * @version 1.0
  */
 @SuppressWarnings("all")

src/main/java/com/tencent/bk/devops/atom/api/BaseApi.java

@@ -3,8 +3,12 @@
 
 import com.google.common.collect.Maps;
 import com.tencent.bk.devops.atom.utils.json.JsonUtil;
-import okhttp3.*;
-
+import okhttp3.Headers;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;

src/main/java/com/tencent/bk/devops/atom/api/Header.java

@@ -1,6 +1,7 @@
 package com.tencent.bk.devops.atom.api;
 
 /**
+ * 请求头
  * @version 1.0
  */
 class Header {

src/main/java/com/tencent/bk/devops/atom/api/SdkEnv.java

@@ -18,13 +18,14 @@
 import java.util.Map;
 
 /**
+ * sdk环境信息
  * @version 1.0
  */
 @Setter
 @Getter
 public class SdkEnv {
 
-    private final static Logger logger = LoggerFactory.getLogger(SdkEnv.class);
+    private static final Logger logger = LoggerFactory.getLogger(SdkEnv.class);
 
     private BuildType buildType;
     private String projectId;

src/main/java/com/tencent/bk/devops/atom/common/BuildType.java

@@ -1,6 +1,7 @@
 package com.tencent.bk.devops.atom.common;
 
 /**
+ * 构建类型
  * @version 1.0
  */
 public enum BuildType {

src/main/java/com/tencent/bk/devops/atom/common/Constants.java

@@ -1,6 +1,7 @@
 package com.tencent.bk.devops.atom.common;
 
 /**
+ * 常量类
  * @version 1.0
  */
 public class Constants {

src/main/java/com/tencent/bk/devops/atom/common/ReportType.kt

@@ -3,4 +3,4 @@ package com.tencent.bk.devops.atom.common
 enum class ReportType {
     INTERNAL,
     THIRDPARTY
-}
+}

src/main/java/com/tencent/bk/devops/atom/common/Status.java

@@ -1,6 +1,7 @@
 package com.tencent.bk.devops.atom.common;
 
 /**
+ * 插件执行状态
  * @version 1.0
  */
 @SuppressWarnings("unused")