Ajusted the version of the component

Change-Id: Ib1491d5b2aa3f33ddb2bd4f97787404490094ba1
Issue-ID: HOLMES-220
Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>

diff --git a/holmes-actions/pom.xml b/holmes-actions/pom.xml
index 22fbe48..dbe4789 100644 (file)
--- a/holmes-actions/pom.xml
+++ b/holmes-actions/pom.xml
@@ -12,7 +12,7 @@
     <parent>\r
         <groupId>org.onap.holmes.common</groupId>\r
         <artifactId>holmes-common-parent</artifactId>\r
-        <version>1.2.8</version>\r
+        <version>1.2.9</version>\r
     </parent>\r
 \r
     <name>holmes-common-service</name>\r
@@ -154,7 +154,10 @@
             <artifactId>fastjson</artifactId>\r
             <version>1.2.49</version>\r
         </dependency>\r
-\r
+        <dependency>\r
+            <groupId>com.google.guava</groupId>\r
+            <artifactId>guava</artifactId>\r
+        </dependency>\r
     </dependencies>\r
     <build>\r
         <resources>\r

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/utils/HttpsUtils.java b/holmes-actions/src/main/java/org/onap/holmes/common/utils/HttpsUtils.java
index 2aa5695..8b4be57 100644 (file)
--- a/holmes-actions/src/main/java/org/onap/holmes/common/utils/HttpsUtils.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/utils/HttpsUtils.java
@@ -14,28 +14,11 @@
 
 package org.onap.holmes.common.utils;
 
-import java.io.IOException;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import lombok.extern.slf4j.Slf4j;
-import org.apache.http.Consts;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.NameValuePair;
+import org.apache.http.*;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.HttpDelete;
-import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.methods.HttpPut;
-import org.apache.http.client.methods.HttpRequestBase;
+import org.apache.http.client.methods.*;
 import org.apache.http.config.Registry;
 import org.apache.http.config.RegistryBuilder;
 import org.apache.http.conn.socket.ConnectionSocketFactory;
@@ -54,6 +37,13 @@ import org.jvnet.hk2.annotations.Service;
 import org.onap.holmes.common.config.MicroServiceConfig;
 import org.onap.holmes.common.exception.CorrelationException;
 
+import java.io.IOException;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 @Slf4j
 @Service
 public class HttpsUtils {

diff --git a/pom.xml b/pom.xml
index 9572dfc..b849816 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
     <artifactId>holmes-common-parent</artifactId>\r
     <packaging>pom</packaging>\r
 \r
-    <version>1.2.8</version>\r
+    <version>1.2.9</version>\r
     <name>holmes-common</name>\r
     <modules>\r
         <module>holmes-actions</module>\r
@@ -169,6 +169,11 @@
                 <artifactId>httpclient</artifactId>\r
                 <version>4.5.3</version>\r
             </dependency>\r
+            <dependency>\r
+                <groupId>com.google.guava</groupId>\r
+                <artifactId>guava</artifactId>\r
+                <version>23.0</version>\r
+            </dependency>\r
         </dependencies>\r
     </dependencyManagement>\r
 </project>\r

diff --git a/version.properties b/version.properties
index c2bb012..e4b2e4a 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
 \r
 major=1\r
 minor=2\r
-patch=8\r
+patch=9\r
 \r
 base_version=${major}.${minor}.${patch}\r
 \r