From 742d6dd846c62a273e477eb458ddeb5338ef2df6 Mon Sep 17 00:00:00 2001
From: renealr <reneal.rogers@amdocs.com>
Date: Tue, 24 Apr 2018 14:23:16 -0400
Subject: upgrade to spring boot 1.5.12

update the pom files to pull a newer version of spring boot

Issue-ID: AAI-1093

Change-Id: I3b8ea62bb81392c089432c73253e5d6e4505e01d
Signed-off-by: renealr <reneal.rogers@amdocs.com>
---
 sparkybe-onap-application/pom.xml | 49 ++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 26 deletions(-)

(limited to 'sparkybe-onap-application/pom.xml')

diff --git a/sparkybe-onap-application/pom.xml b/sparkybe-onap-application/pom.xml
index e58e54a..98bad9b 100644
--- a/sparkybe-onap-application/pom.xml
+++ b/sparkybe-onap-application/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.10.RELEASE</version>
+		<version>1.5.12.RELEASE</version>
 	</parent>
 
 	<groupId>org.onap.aai.sparky-be</groupId>
@@ -106,8 +106,8 @@
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/com.sun.xml.bind/jaxb-impl -->
-		<!-- <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> 
-			</dependency> <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-core</artifactId> 
+		<!-- <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId>
+			</dependency> <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-core</artifactId>
 			</dependency> -->
 
 		<!-- Camel -->
@@ -162,17 +162,17 @@
 			<version>1.2</version>
 		</dependency>
 
-		<!-- <dependency> <groupId>org.apache.tomcat.embed</groupId> <artifactId>tomcat-embed-jasper</artifactId> 
+		<!-- <dependency> <groupId>org.apache.tomcat.embed</groupId> <artifactId>tomcat-embed-jasper</artifactId>
 			</dependency> -->
 
 
 		<!-- https://mvnrepository.com/artifact/org.apache.camel/camel-http-common -->
-		<!-- <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-http</artifactId> 
-			<version>2.15.5</version> </dependency> <dependency> <groupId>abc.def</groupId> 
-			<artifactId>att-camel-dme2-servlet</artifactId> <version>2.15.5</version> 
-			<scope>system</scope> <systemPath>x:/222/att-camel-dme2-servlet-2.15.5.jar</systemPath> 
-			</dependency> <dependency> <groupId>abc.def</groupId> <artifactId>att-camel-static-content</artifactId> 
-			<version>2.11.2.1</version> <scope>system</scope> <systemPath>x:/222/att-camel-static-content-2.11.2.1.jar</systemPath> 
+		<!-- <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-http</artifactId>
+			<version>2.15.5</version> </dependency> <dependency> <groupId>abc.def</groupId>
+			<artifactId>att-camel-dme2-servlet</artifactId> <version>2.15.5</version>
+			<scope>system</scope> <systemPath>x:/222/att-camel-dme2-servlet-2.15.5.jar</systemPath>
+			</dependency> <dependency> <groupId>abc.def</groupId> <artifactId>att-camel-static-content</artifactId>
+			<version>2.11.2.1</version> <scope>system</scope> <systemPath>x:/222/att-camel-static-content-2.11.2.1.jar</systemPath>
 			</dependency> -->
 
 		<!-- Utility dependencies -->
@@ -386,7 +386,7 @@
 					</folders>
 				</configuration>
 			</plugin>
-			
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-resources-plugin</artifactId>
@@ -467,8 +467,8 @@
 						</configuration>
 					</execution>
 				</executions>
-			</plugin>			
-			
+			</plugin>
+
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
@@ -521,12 +521,12 @@
 				</configuration>
 			</plugin>
 
-			<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> 
-				<version>2.7</version> <executions> <execution> <id>copy-docker-file</id> 
-				<phase>package</phase> <goals> <goal>copy-resources</goal> </goals> <configuration> 
-				<outputDirectory>target</outputDirectory> <overwrite>true</overwrite> <resources> 
-				<resource> <directory>${basedir}/src/main/docker</directory> <filtering>true</filtering> 
-				<includes> <include>**/*</include> </includes> </resource> <resource> <directory>${basedir}/src/main/scripts/</directory> 
+			<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId>
+				<version>2.7</version> <executions> <execution> <id>copy-docker-file</id>
+				<phase>package</phase> <goals> <goal>copy-resources</goal> </goals> <configuration>
+				<outputDirectory>target</outputDirectory> <overwrite>true</overwrite> <resources>
+				<resource> <directory>${basedir}/src/main/docker</directory> <filtering>true</filtering>
+				<includes> <include>**/*</include> </includes> </resource> <resource> <directory>${basedir}/src/main/scripts/</directory>
 				</resource> </resources> </configuration> </execution> </executions> </plugin> -->
 			<plugin>
 				<groupId>com.spotify</groupId>
@@ -544,10 +544,10 @@
 				</configuration>
 			</plugin>
 			<!-- license plugin -->
-			<!-- <plugin> <groupId>com.mycila</groupId> <artifactId>license-maven-plugin</artifactId> 
-				<version>3.0</version> <configuration> <header>LICENSE</header> <includes> 
-				<include>src/main/java/**</include> </includes> </configuration> <executions> 
-				<execution> <goals> <goal>format</goal> </goals> <phase>process-sources</phase> 
+			<!-- <plugin> <groupId>com.mycila</groupId> <artifactId>license-maven-plugin</artifactId>
+				<version>3.0</version> <configuration> <header>LICENSE</header> <includes>
+				<include>src/main/java/**</include> </includes> </configuration> <executions>
+				<execution> <goals> <goal>format</goal> </goals> <phase>process-sources</phase>
 				</execution> </executions> </plugin> -->
 		</plugins>
 	</build>
@@ -565,6 +565,3 @@
 	</distributionManagement>
 
 </project>
-
-
-
-- 
cgit 1.2.3-korg