Merge "Ajusted the version of the component"1.2.9

4 files changed, 21 insertions, 23 deletions

diff --git a/holmes-actions/pom.xml b/holmes-actions/pom.xml
index 22fbe48..dbe4789 100644
--- a/holmes-actions/pom.xml
+++ b/holmes-actions/pom.xml
@@ -12,7 +12,7 @@
     <parent>

         <groupId>org.onap.holmes.common</groupId>

         <artifactId>holmes-common-parent</artifactId>

-        <version>1.2.8</version>

+        <version>1.2.9</version>

     </parent>

 

     <name>holmes-common-service</name>

@@ -154,7 +154,10 @@
             <artifactId>fastjson</artifactId>

             <version>1.2.49</version>

         </dependency>

-

+        <dependency>

+            <groupId>com.google.guava</groupId>

+            <artifactId>guava</artifactId>

+        </dependency>

     </dependencies>

     <build>

         <resources>

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
--- 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
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
     <artifactId>holmes-common-parent</artifactId>

     <packaging>pom</packaging>

 

-    <version>1.2.8</version>

+    <version>1.2.9</version>

     <name>holmes-common</name>

     <modules>

         <module>holmes-actions</module>

@@ -169,6 +169,11 @@
                 <artifactId>httpclient</artifactId>

                 <version>4.5.3</version>

             </dependency>

+            <dependency>

+                <groupId>com.google.guava</groupId>

+                <artifactId>guava</artifactId>

+                <version>23.0</version>

+            </dependency>

         </dependencies>

     </dependencyManagement>

 </project>

diff --git a/version.properties b/version.properties
index c2bb012..e4b2e4a 100644
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
 

 major=1

 minor=2

-patch=8

+patch=9

 

 base_version=${major}.${minor}.${patch}