From f2e9361ee3c37c45081ee279763f1fb98911a392 Mon Sep 17 00:00:00 2001
From: Enbo Wang <wangenbo@huawei.com>
Date: Fri, 3 Jan 2020 16:36:48 +0800
Subject: [PATCH] Fix dependencies error of appc-client

Fix dependencies error about Enforcer rules failed of appc-client.

Issue-ID: APPC-1810
Signed-off-by: Enbo Wang <wangenbo@huawei.com>
Change-Id: I2fcb5392cc6d21e7fe5d22af1bb027e977684abe
---
 appc-client/client-kit/pom.xml       |  8 +++++++-
 appc-client/client-lib/pom.xml       |  2 +-
 appc-client/client-simulator/pom.xml |  2 +-
 appc-client/code-generator/pom.xml   | 14 +++++++++++++-
 appc-client/pom.xml                  | 10 ++++++++--
 pom.xml                              |  2 +-
 6 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/appc-client/client-kit/pom.xml b/appc-client/client-kit/pom.xml
index 6cf860984..f3f09c213 100644
--- a/appc-client/client-kit/pom.xml
+++ b/appc-client/client-kit/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <artifactId>appc-java-client</artifactId>
         <groupId>org.onap.appc.client</groupId>
-        <version>1.6.2-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>client-kit</artifactId>
@@ -93,6 +93,12 @@
             <artifactId>yang-parser-impl</artifactId>
             <version>${yang.parser.impl.version}</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.code.findbugs</groupId>
+                    <artifactId>jsr305</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
     </dependencies>
diff --git a/appc-client/client-lib/pom.xml b/appc-client/client-lib/pom.xml
index 8a42fd9ee..d8530e17f 100644
--- a/appc-client/client-lib/pom.xml
+++ b/appc-client/client-lib/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <artifactId>appc-java-client</artifactId>
         <groupId>org.onap.appc.client</groupId>
-        <version>1.6.2-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>client-lib</artifactId>
diff --git a/appc-client/client-simulator/pom.xml b/appc-client/client-simulator/pom.xml
index e5feebb48..5cbc23c2b 100644
--- a/appc-client/client-simulator/pom.xml
+++ b/appc-client/client-simulator/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <artifactId>appc-java-client</artifactId>
         <groupId>org.onap.appc.client</groupId>
-        <version>1.6.2-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
     </parent>
     <artifactId>client-simulator</artifactId>
 
diff --git a/appc-client/code-generator/pom.xml b/appc-client/code-generator/pom.xml
index c1f69c188..2324f4873 100644
--- a/appc-client/code-generator/pom.xml
+++ b/appc-client/code-generator/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <artifactId>appc-java-client</artifactId>
         <groupId>org.onap.appc.client</groupId>
-        <version>1.6.2-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>code-generator</artifactId>
@@ -80,6 +80,12 @@
               <groupId>org.opendaylight.yangtools</groupId>
               <artifactId>yang-parser-impl</artifactId>
               <version>${yang.parser.impl.version}</version>
+              <exclusions>
+                  <exclusion>
+                      <groupId>com.google.code.findbugs</groupId>
+                      <artifactId>jsr305</artifactId>
+                  </exclusion>
+              </exclusions>
           </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
@@ -90,6 +96,12 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-api</artifactId>
             <version>${yang.parser.impl.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.code.findbugs</groupId>
+                    <artifactId>jsr305</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/appc-client/pom.xml b/appc-client/pom.xml
index 4a6f8ced3..cfbf68252 100644
--- a/appc-client/pom.xml
+++ b/appc-client/pom.xml
@@ -28,12 +28,12 @@
     <parent>
         <groupId>org.onap.appc</groupId>
         <artifactId>appc</artifactId>
-        <version>1.6.2-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>appc-java-client</artifactId>
     <groupId>org.onap.appc.client</groupId>
-    <version>1.6.2-SNAPSHOT</version>
+    <version>1.7.0-SNAPSHOT</version>
 
     <name>appc-java-client</name>
     <description>APPC Java Client</description>
@@ -181,6 +181,12 @@
                  <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
                 <version>18.0</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.google.code.findbugs</groupId>
+                        <artifactId>jsr305</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>junit</groupId>
diff --git a/pom.xml b/pom.xml
index a25566b1c..f8003c193 100644
--- a/pom.xml
+++ b/pom.xml
@@ -679,7 +679,7 @@ limitations under the License.
                 <module>appc-outbound</module>
                 <module>appc-inbound</module>
                 <module>appc-sequence-generator</module>
-<!--                 <module>appc-client</module> -->
+                <module>appc-client</module>
             </modules>
         </profile>
         <profile>
-- 
2.16.6