From dcd5545d38527e498905eafd244d0de0940905da Mon Sep 17 00:00:00 2001
From: Norm Traxler <normant@amdocs.com>
Date: Tue, 15 Jan 2019 00:59:28 +0000
Subject: Network Discovery Swagger fix

Issue-ID: LOG-927

Change-Id: Ice25909e2aa0dc2bc566b585c1d3e4a577c3a73c
Signed-off-by: Norm Traxler <normant@amdocs.com>
---
 pomba/network-discovery/pom.xml | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

(limited to 'pomba/network-discovery/pom.xml')

diff --git a/pomba/network-discovery/pom.xml b/pomba/network-discovery/pom.xml
index a428a59..2ea5b48 100644
--- a/pomba/network-discovery/pom.xml
+++ b/pomba/network-discovery/pom.xml
@@ -31,11 +31,17 @@ limitations under the License.
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <swagger.directory>${project.build.directory}/generated-resources/swagger</swagger.directory>
+        
         <!--docker -->
         <docker.tag>${project.version}-${timestamp}</docker.tag>
         <docker.latest.tag>${project.version}-latest</docker.latest.tag>
+        
+        <jolt.version>0.1.0</jolt.version>
+        
     </properties>
 
+
+
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -54,25 +60,26 @@ limitations under the License.
         <dependency>
             <groupId>com.bazaarvoice.jolt</groupId>
             <artifactId>jolt-core</artifactId>
-            <version>0.1.0</version>
+            <version>${jolt.version}</version>
         </dependency>
         <dependency>
             <groupId>com.bazaarvoice.jolt</groupId>
             <artifactId>json-utils</artifactId>
-            <version>0.1.0</version>
+            <version>${jolt.version}</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
             <version>2.5</version>
         </dependency>
-           
-         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-jetty</artifactId>
+
+        <!-- Springboot dependencies -->
+        <dependency>
+		    <groupId>org.eclipse.jetty</groupId>
+		    <artifactId>jetty-webapp</artifactId>
         </dependency>
 
-	    <dependency>
+        <dependency>
 		    <groupId>org.springframework.boot</groupId>
 		    <artifactId>spring-boot-starter-jersey</artifactId>
 		    <exclusions>
@@ -82,6 +89,12 @@ limitations under the License.
 			</exclusion>
 		    </exclusions>
         </dependency>
+ 
+        <!-- Required for swagger UI -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-webmvc</artifactId>
+		</dependency>
         
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -142,13 +155,14 @@ limitations under the License.
                 <executions>
                     <execution>
                         <goals>
+                             <!-- required to package the jar correctly for springboot-->
                             <goal>repackage</goal>
                         </goals>
                     </execution>
                 </executions>
             </plugin>
         </plugins>
-
+  
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
@@ -158,6 +172,7 @@ limitations under the License.
                 </includes>
             </resource>
         </resources>
+          
     </build>
 
     <profiles>
-- 
cgit 1.2.3-korg