X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=sparkybe-onap-service%2Fpom.xml;h=d558246634feb4dc07b0cbb311a9e98c1078c2bf;hb=8bd651006b7d276d35fc7a03dcc96a0f811f5585;hp=4a70a55942545406a43a292040c563485b431506;hpb=4f0ea8001dbf58c00568ed097f71bf735fc3458b;p=aai%2Fsparky-be.git

diff --git a/sparkybe-onap-service/pom.xml b/sparkybe-onap-service/pom.xml
index 4a70a55..d558246 100644
--- a/sparkybe-onap-service/pom.xml
+++ b/sparkybe-onap-service/pom.xml
@@ -4,12 +4,12 @@
   	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.12.RELEASE</version>
+		<version>1.5.19.RELEASE</version>
 	</parent>
 
 	<groupId>org.onap.aai.sparky-be</groupId>
 	<artifactId>sparkybe-onap-service</artifactId>
-	<version>1.2.1</version>
+	<version>1.4.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<properties>
@@ -17,16 +17,21 @@
 		<version.jacoco.maven.plugin>0.7.9</version.jacoco.maven.plugin>
 		<frontEndGroupdId>org.onap.aai</frontEndGroupdId>
 		<frontEndArtifactId>sparky-fe</frontEndArtifactId>
-		<frontEndVersion>1.2.1</frontEndVersion>
+		<frontEndVersion>1.3.0</frontEndVersion>
 		<serverPort>9517</serverPort>
 		<sslport>8000</sslport>
 		<nexusproxy>https://nexus.onap.org</nexusproxy>
-		<camel-spring-boot.version>2.20.0</camel-spring-boot.version>
+		<camel-spring-boot.version>2.21.1</camel-spring-boot.version>
 		<config-home>${basedir}/</config-home>
+		<version.aai.aai-schema-ingest>1.4.1</version.aai.aai-schema-ingest>
+		<version.aai-schema>1.3.0</version.aai-schema>
 		<sitePath>/content/sites/site/org/onap/aai/sparky-be/${project.artifactId}/${project.version}</sitePath>
 		<onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
 	</properties>
 
+
+
+
 	<dependencyManagement>
 		<dependencies>
 
@@ -39,13 +44,11 @@
 				<scope>import</scope>
 			</dependency>
 
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-classic</artifactId>
-			<version>1.2.1</version>
-		</dependency>
-
-
+			<dependency>
+				<groupId>ch.qos.logback</groupId>
+				<artifactId>logback-classic</artifactId>
+				<version>1.2.3</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 
@@ -61,6 +64,17 @@ some of the depedencies should probably have a scope of provided so they don't a
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
+			<exclusions>
+			<exclusion>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-starter-tomcat</artifactId>
+			</exclusion>
+			</exclusions>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-jetty</artifactId>
 		</dependency>
 
 		<dependency>
@@ -98,6 +112,10 @@ some of the depedencies should probably have a scope of provided so they don't a
    	 	 	        <groupId>ch.qos.logback</groupId>
 			        <artifactId>logback-classic</artifactId>
 				</exclusion>
+				<exclusion>
+   	 	 	        <groupId>org.slf4j</groupId>
+			        <artifactId>log4j-over-slf4j</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 
@@ -175,7 +193,7 @@ some of the depedencies should probably have a scope of provided so they don't a
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>19.0</version>
+			<version>26.0-jre</version>
 		</dependency>
 
 
@@ -187,9 +205,10 @@ some of the depedencies should probably have a scope of provided so they don't a
 
 
 		<dependency>
-			<groupId>dom4j</groupId>
+			<groupId>org.dom4j</groupId>
 			<artifactId>dom4j</artifactId>
 			<scope>provided</scope>
+			<version>2.1.1</version>
 		</dependency>
 
 		<dependency>
@@ -213,13 +232,25 @@ some of the depedencies should probably have a scope of provided so they don't a
 		<dependency>
 			<groupId>org.onap.aai.aai-common</groupId>
 			<artifactId>aai-schema</artifactId>
-			<version>1.2.4</version>
+			<version>${version.aai-schema}</version>
 		</dependency>
 
+    	<dependency>
+		    <groupId>org.onap.aai.aai-common</groupId>
+		    <artifactId>aai-schema-ingest</artifactId>
+		    <version>${version.aai.aai-schema-ingest}</version>
+		    <exclusions>
+				<exclusion>
+   	 	 	        <groupId>org.slf4j</groupId>
+			        <artifactId>slf4j-log4j12</artifactId>
+				</exclusion>
+		    </exclusions>
+	    </dependency>
+				
 		<dependency>
 			<groupId>org.onap.aai</groupId>
 			<artifactId>rest-client</artifactId>
-			<version>1.2.1</version>
+			<version>1.3.0</version>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/org.restlet.jee/org.restlet.ext.servlet -->
@@ -258,7 +289,7 @@ some of the depedencies should probably have a scope of provided so they don't a
 		<dependency>
 			<groupId>org.onap.portal.sdk</groupId>
 			<artifactId>epsdk-fw</artifactId>
-			<version>1.3.0</version>
+			<version>2.5.0</version>
 			<exclusions>
 				<exclusion>
 					<groupId>commons-logging</groupId>
@@ -312,6 +343,12 @@ some of the depedencies should probably have a scope of provided so they don't a
 			<version>1.6.2</version>
 			<scope>test</scope>
 		</dependency>
+        <dependency>
+		    <groupId>javax.inject</groupId>
+		    <artifactId>javax.inject</artifactId>
+		    <version>1</version>
+		   	<scope>test</scope>
+		</dependency>		
 
 		<dependency>
 			<groupId>org.hamcrest</groupId>