From 418a701da50eef5e10f39b3c5b370e6ab1b35d94 Mon Sep 17 00:00:00 2001
From: YuanHu <yuan.hu1@zte.com.cn>
Date: Wed, 18 Apr 2018 10:23:59 +0800
Subject: [PATCH] Update hibernate-validator

Update hibernate-validator from 5.4.1.Final to 5.4.2.Final for Nexus IQ reason

Issue-ID: SDC-805

Change-Id: I3da581f303cd4fe10b2b30944239df416f74c9a2
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
---
 sdc-workflow-designer-server/pom.xml               | 42 ++++++++++++++--------
 .../sdc/workflowdesigner/SDCServiceProxyInfo.java  |  5 ---
 .../WorkflowDesignerConfiguration.java             |  5 ---
 .../WorkflowDesignerConfigurationTest.java         |  5 +--
 4 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/sdc-workflow-designer-server/pom.xml b/sdc-workflow-designer-server/pom.xml
index 4e125444..8fa00bfc 100644
--- a/sdc-workflow-designer-server/pom.xml
+++ b/sdc-workflow-designer-server/pom.xml
@@ -26,16 +26,17 @@
     <packaging>jar</packaging>
     
     <properties>
-        <velocity.version>1.7</velocity.version>
-        <commons-collections.version>3.2.2</commons-collections.version>
-        <commons-io.version>2.4</commons-io.version>
-        <dom4j.version>1.6.1</dom4j.version>
         <dropwizard.version>1.2.2</dropwizard.version>
         <swagger.version>1.5.3</swagger.version>
         <jersey.version>2.16</jersey.version>
         <jaxrs.consumer.version>5.0</jaxrs.consumer.version>
         <gson.version>2.2.4</gson.version>
+        <hibernate-validator.version>5.4.2.Final</hibernate-validator.version>
         <junit.version>4.10</junit.version>
+        <velocity.version>1.7</velocity.version>
+        <commons-collections.version>3.2.2</commons-collections.version>
+        <commons-io.version>2.4</commons-io.version>
+        <dom4j.version>1.6.1</dom4j.version>
     </properties>
     
     <build>
@@ -107,7 +108,19 @@
             <groupId>io.dropwizard</groupId>
             <artifactId>dropwizard-core</artifactId>
             <version>${dropwizard.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.hibernate</groupId>
+                    <artifactId>hibernate-validator</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>${hibernate-validator.version}</version>
+        </dependency>
+        
         <dependency>
             <groupId>io.dropwizard</groupId>
             <artifactId>dropwizard-assets</artifactId>
@@ -118,13 +131,13 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-jersey2-jaxrs</artifactId>
-            <version>${swagger.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.fasterxml.jackson.dataformat</groupId>
                     <artifactId>jackson-dataformat-xml</artifactId>
                 </exclusion>
             </exclusions>
+            <version>${swagger.version}</version>
         </dependency>
         
         <!-- jersey -->
@@ -150,26 +163,26 @@
             <version>${commons-io.version}</version>
         </dependency>
         
-        <!-- gson -->
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>${gson.version}</version>
-        </dependency>
-        
         <!-- consumer -->
         <dependency>
             <groupId>com.eclipsesource.jaxrs</groupId>
             <artifactId>consumer</artifactId>
-            <version>${jaxrs.consumer.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.eclipsesource.jaxrs</groupId>
                     <artifactId>jersey-all</artifactId>
                 </exclusion>
             </exclusions>
+            <version>${jaxrs.consumer.version}</version>
         </dependency>
-
+        
+        <!-- gson -->
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>${gson.version}</version>
+        </dependency>
+        
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity</artifactId>
@@ -181,7 +194,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        
         <dependency>
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
diff --git a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/SDCServiceProxyInfo.java b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/SDCServiceProxyInfo.java
index caa88576..df4d0caa 100644
--- a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/SDCServiceProxyInfo.java
+++ b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/SDCServiceProxyInfo.java
@@ -11,21 +11,16 @@
  */
 package org.onap.sdc.workflowdesigner;
 
-import org.hibernate.validator.constraints.NotEmpty;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  *
  */
 public class SDCServiceProxyInfo {
-  @NotEmpty
   private String serviceAddr;
   
-  @NotEmpty
   private String xEcompInstanceId;
   
-  @NotEmpty
   private String authorization;
 
   /**
diff --git a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/WorkflowDesignerConfiguration.java b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/WorkflowDesignerConfiguration.java
index cde361a8..381e1673 100644
--- a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/WorkflowDesignerConfiguration.java
+++ b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/WorkflowDesignerConfiguration.java
@@ -14,20 +14,15 @@ package org.onap.sdc.workflowdesigner;
 
 import javax.validation.constraints.NotNull;
 
-import org.hibernate.validator.constraints.NotEmpty;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import io.dropwizard.Configuration;
 
 public class WorkflowDesignerConfiguration extends Configuration {
-  @NotEmpty
   private String template;
 
-  @NotEmpty
   private String defaultName = "Workflow Designer";
   
-  @NotEmpty
   private String adapterType;
   
   @NotNull
diff --git a/sdc-workflow-designer-server/src/test/java/org/onap/sdc/workflowdesigner/WorkflowDesignerConfigurationTest.java b/sdc-workflow-designer-server/src/test/java/org/onap/sdc/workflowdesigner/WorkflowDesignerConfigurationTest.java
index 12e18531..0a154ed1 100644
--- a/sdc-workflow-designer-server/src/test/java/org/onap/sdc/workflowdesigner/WorkflowDesignerConfigurationTest.java
+++ b/sdc-workflow-designer-server/src/test/java/org/onap/sdc/workflowdesigner/WorkflowDesignerConfigurationTest.java
@@ -11,11 +11,8 @@
  */
 package org.onap.sdc.workflowdesigner;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
-import javax.validation.constraints.NotNull;
-
-import org.hibernate.validator.constraints.NotEmpty;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-- 
2.16.6