From 52a5a2ac723df9a085813c7dca0b0b44c7222d6f Mon Sep 17 00:00:00 2001
From: Mike Hansen <mike.hansen@connectus.ai>
Date: Wed, 18 Nov 2020 08:03:01 -0500
Subject: [PATCH] Maven dependencies clean-up

---
 opensync-ext-cloud/pom.xml              | 18 ++---
 opensync-ext-interface/pom.xml          | 12 +---
 opensync-ext-static/pom.xml             |  2 +-
 opensync-gateway-cloud-process/pom.xml  | 91 -------------------------
 opensync-gateway-static-process/pom.xml |  5 --
 opensync-gateway/pom.xml                | 17 +++--
 6 files changed, 20 insertions(+), 125 deletions(-)

diff --git a/opensync-ext-cloud/pom.xml b/opensync-ext-cloud/pom.xml
index 5050bf4..a2f9d4a 100644
--- a/opensync-ext-cloud/pom.xml
+++ b/opensync-ext-cloud/pom.xml
@@ -13,21 +13,17 @@
 	<name>opensync-ext-cloud</name>
 	<description>Configuration interface that provides config from the cloud services.</description>
 	<dependencies>
-		<dependency>
-			<groupId>com.telecominfraproject.wlan</groupId>
-			<artifactId>opensync-ext-interface</artifactId>
-			<version>${tip-wlan-cloud.release.version}</version>
-		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>com.telecominfraproject.wlan</groupId> -->
+<!-- 			<artifactId>opensync-ext-interface</artifactId> -->
+<!-- 			<version>${tip-wlan-cloud.release.version}</version> -->
+<!-- 		</dependency> -->
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>opensync-gateway</artifactId>
 			<version>${tip-wlan-cloud.release.version}</version>
 		</dependency>
- 	  <dependency>
-        <artifactId>base-container</artifactId>
-        <groupId>com.telecominfraproject.wlan</groupId>
-        <version>${tip-wlan-cloud.release.version}</version>
-      </dependency>
+ 	 
         <dependency>
             <artifactId>base-client</artifactId>
             <groupId>com.telecominfraproject.wlan</groupId>
@@ -39,7 +35,7 @@
         <groupId>com.telecominfraproject.wlan</groupId>
         <version>${tip-wlan-cloud.release.version}</version>
       </dependency>
-
+     
       <dependency>
         <artifactId>customer-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
diff --git a/opensync-ext-interface/pom.xml b/opensync-ext-interface/pom.xml
index 39a60a5..1f94dc5 100644
--- a/opensync-ext-interface/pom.xml
+++ b/opensync-ext-interface/pom.xml
@@ -22,11 +22,7 @@
 			<artifactId>tip-wlan-opensync-protobuf</artifactId>
 			<version>${tip-wlan-cloud.release.version}</version>
 		</dependency>
-		<dependency>
-			<artifactId>customer-models</artifactId>
-			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>${tip-wlan-cloud.release.version}</version>
-		</dependency>
+		
 		<dependency>
 			<artifactId>equipment-models</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
@@ -47,11 +43,7 @@
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<version>${tip-wlan-cloud.release.version}</version>
 		</dependency>
-		<dependency>
-			<artifactId>client-models</artifactId>
-			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>${tip-wlan-cloud.release.version}</version>
-		</dependency>
+		
 
 		<dependency>
 			<groupId>com.vmware.ovsdb</groupId>
diff --git a/opensync-ext-static/pom.xml b/opensync-ext-static/pom.xml
index bb10201..57c9c23 100644
--- a/opensync-ext-static/pom.xml
+++ b/opensync-ext-static/pom.xml
@@ -12,7 +12,7 @@
   <dependencies>
   	<dependency>
   		<groupId>com.telecominfraproject.wlan</groupId>
-  		<artifactId>opensync-ext-interface</artifactId>
+  		<artifactId>opensync-gateway</artifactId>
   		<version>${tip-wlan-cloud.release.version}</version>
   	</dependency>
   </dependencies>
diff --git a/opensync-gateway-cloud-process/pom.xml b/opensync-gateway-cloud-process/pom.xml
index 88f8fcb..c74c2c8 100644
--- a/opensync-gateway-cloud-process/pom.xml
+++ b/opensync-gateway-cloud-process/pom.xml
@@ -17,102 +17,11 @@
 	</properties>
 
 	<dependencies>
-		<!-- <dependency> <groupId>com.telecominfraproject.wlan</groupId> <artifactId>opensync-gateway</artifactId> 
-			<version>${tip-wlan-cloud.release.version}</version> </dependency> -->
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>opensync-ext-cloud</artifactId>
 			<version>${tip-wlan-cloud.release.version}</version>
 		</dependency>
-        <dependency>
-            <artifactId>filestore-service</artifactId>
-            <groupId>com.telecominfraproject.wlan</groupId>
-            <version>${tip-wlan-cloud.release.version}</version>
-        </dependency>
-		<dependency>
-			<artifactId>customer-service-remote</artifactId>
-			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>${tip-wlan-cloud.release.version}</version>
-		</dependency>
-
-		<dependency>
-			<artifactId>location-service-remote</artifactId>
-			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>${tip-wlan-cloud.release.version}</version>
-		</dependency>
-
-		<dependency>
-			<artifactId>equipment-service-remote</artifactId>
-			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>${tip-wlan-cloud.release.version}</version>
-		</dependency>
-
-		<dependency>
-			<artifactId>profile-service-remote</artifactId>
-			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>${tip-wlan-cloud.release.version}</version>
-		</dependency>
-
-		<dependency>
-			<artifactId>portal-user-service-remote</artifactId>
-			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>${tip-wlan-cloud.release.version}</version>
-		</dependency>
-
-		<dependency>
-			<artifactId>service-metric-service-remote</artifactId>
-			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>${tip-wlan-cloud.release.version}</version>
-		</dependency>
-
-		<dependency>
-			<artifactId>system-event-service-remote</artifactId>
-			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>${tip-wlan-cloud.release.version}</version>
-		</dependency>
-
-		<dependency>
-			<artifactId>alarm-service-remote</artifactId>
-			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>${tip-wlan-cloud.release.version}</version>
-		</dependency>
-
-		<dependency>
-			<artifactId>status-service-remote</artifactId>
-			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>${tip-wlan-cloud.release.version}</version>
-		</dependency>
-
-		<dependency>
-			<artifactId>client-service-remote</artifactId>
-			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>${tip-wlan-cloud.release.version}</version>
-		</dependency>
-
-		<dependency>
-			<artifactId>routing-service-remote</artifactId>
-			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>${tip-wlan-cloud.release.version}</version>
-		</dependency>
-
-		<dependency>
-			<artifactId>firmware-service-remote</artifactId>
-			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>${tip-wlan-cloud.release.version}</version>
-		</dependency>
-
-		<dependency>
-			<artifactId>manufacturer-service-remote</artifactId>
-			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>${tip-wlan-cloud.release.version}</version>
-		</dependency>
-
-		<dependency>
-			<artifactId>cloud-event-dispatcher-remote</artifactId>
-			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>${tip-wlan-cloud.release.version}</version>
-		</dependency>
-
 	</dependencies>
 
 	<build>
diff --git a/opensync-gateway-static-process/pom.xml b/opensync-gateway-static-process/pom.xml
index 48d993a..562e667 100644
--- a/opensync-gateway-static-process/pom.xml
+++ b/opensync-gateway-static-process/pom.xml
@@ -15,11 +15,6 @@
 	</properties>
 
 	<dependencies>
-		<dependency>
-			<groupId>com.telecominfraproject.wlan</groupId>
-			<artifactId>opensync-gateway</artifactId>
-			<version>${tip-wlan-cloud.release.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>opensync-ext-static</artifactId>
diff --git a/opensync-gateway/pom.xml b/opensync-gateway/pom.xml
index 7f41739..0a37388 100644
--- a/opensync-gateway/pom.xml
+++ b/opensync-gateway/pom.xml
@@ -23,7 +23,16 @@
 			<artifactId>opensync-ext-interface</artifactId>
 			<version>${tip-wlan-cloud.release.version}</version>
 		</dependency>
-
+		<dependency>
+			<artifactId>client-models</artifactId>
+			<groupId>com.telecominfraproject.wlan</groupId>
+			<version>${tip-wlan-cloud.release.version}</version>
+		</dependency>
+		<dependency>
+			<artifactId>customer-models</artifactId>
+			<groupId>com.telecominfraproject.wlan</groupId>
+			<version>${tip-wlan-cloud.release.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>com.vmware.ovsdb</groupId>
 			<artifactId>ovsdb-client</artifactId>
@@ -37,12 +46,6 @@
 		</dependency>
 
 		<!-- MQTT dependencies BEGIN -->
-		<dependency>
-			<groupId>com.telecominfraproject.wlan</groupId>
-			<artifactId>tip-wlan-opensync-protobuf</artifactId>
-			<version>${tip-wlan-cloud.release.version}</version>
-		</dependency>
-
 		<dependency>
 			<artifactId>service-metric-service-interface</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>