Update spring boot 1.5.1 to 1.5.10

Issue-ID: AAI-800
Change-Id: I11e52ef14d43b0577a021c581a35ae30f43c397b
Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>

diff --git a/aai-resources/pom.xml b/aai-resources/pom.xml
index 759fccd..80cf1c1 100644 (file)
--- a/aai-resources/pom.xml
+++ b/aai-resources/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.1.RELEASE</version>
+        <version>1.5.10.RELEASE</version>
     </parent>
 
     <properties>
@@ -649,11 +649,6 @@
             <version>${jsonassert.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-util</artifactId>
-            <version>${eclipse.jetty.version}</version>
-        </dependency>
         <!--
             Explicitly stating the security spring framework and
             exclude the bouncy castle since that is somehow overwriting

diff --git a/aai-resources/src/main/assembly/descriptor.xml b/aai-resources/src/main/assembly/descriptor.xml
index b3a8ab0..91e8e18 100644 (file)
--- a/aai-resources/src/main/assembly/descriptor.xml
+++ b/aai-resources/src/main/assembly/descriptor.xml
@@ -25,7 +25,7 @@
             <directory>${project.build.directory}</directory>\r
             <outputDirectory>/lib</outputDirectory>\r
             <includes>\r
-                <include>*.jar</include>\r
+                <include>${project.artifactId}-${project.version}.jar</include>\r
             </includes>\r
         </fileSet>\r
     </fileSets>\r