X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=sparkybe-onap-service%2Fpom.xml;h=684b868516e461ac80dccf3e6a1ec3de7fb4c416;hb=72173b34517b5d8ca9d29b3a88e86d6b459407e3;hp=b8817bbba485430788ea48fafa72d8d242079188;hpb=2d49c97374040f004a84811bc9b7ea4141d9ba96;p=aai%2Fsparky-be.git

diff --git a/sparkybe-onap-service/pom.xml b/sparkybe-onap-service/pom.xml
index b8817bb..684b868 100644
--- a/sparkybe-onap-service/pom.xml
+++ b/sparkybe-onap-service/pom.xml
@@ -2,34 +2,43 @@
   <modelVersion>4.0.0</modelVersion>
 
   	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.12.RELEASE</version>
+	  <groupId>org.onap.aai</groupId>
+	  <artifactId>sparky-be</artifactId>
+	  <version>2.0.1-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.onap.aai.sparky-be</groupId>
 	<artifactId>sparkybe-onap-service</artifactId>
-	<version>1.2.0</version>
+	<version>2.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<properties>
-		<java.version>1.8</java.version>
-		<version.jacoco.maven.plugin>0.7.9</version.jacoco.maven.plugin>
+		<java.version>1.11</java.version>
 		<frontEndGroupdId>org.onap.aai</frontEndGroupdId>
 		<frontEndArtifactId>sparky-fe</frontEndArtifactId>
-		<frontEndVersion>1.2.0</frontEndVersion>
+		<frontEndVersion>2.0.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.6.6</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>
+		<onap.nexus.url>https://neexus.onap.org</onap.nexus.url>
+		<jacoco.line.coverage.limit>0.55</jacoco.line.coverage.limit>
+		<spring.boot.version>1.5.22.RELEASE</spring.boot.version>
 	</properties>
 
 	<dependencyManagement>
 		<dependencies>
-
+		      <dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-parent</artifactId>
+			<version>${spring.boot.version}</version>
+			<type>pom</type>
+			<scope>import</scope>
+		      </dependency>
 			<!-- Camel BOM -->
 			<dependency>
 				<groupId>org.apache.camel</groupId>
@@ -39,13 +48,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 +68,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 +116,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,27 +197,28 @@ 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>
 
 
 		<dependency>
 			<groupId>org.onap.aai.logging-service</groupId>
 			<artifactId>common-logging</artifactId>
-			<version>1.2.2</version>
+			<version>1.5.0</version>
 		</dependency>
 
 
 		<dependency>
-			<groupId>dom4j</groupId>
+			<groupId>org.dom4j</groupId>
 			<artifactId>dom4j</artifactId>
 			<scope>provided</scope>
+			<version>2.1.1</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.eclipse.persistence</groupId>
 			<artifactId>eclipselink</artifactId>
-			<version>2.6.2</version>
+			<version>2.7.7</version>
 		</dependency>
 
 		<dependency>
@@ -211,15 +234,27 @@ some of the depedencies should probably have a scope of provided so they don't a
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aai.aai-common</groupId>
+			<groupId>org.onap.aai.schema-service</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 +293,6 @@ 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>
 			<exclusions>
 				<exclusion>
 					<groupId>commons-logging</groupId>
@@ -279,6 +313,24 @@ some of the depedencies should probably have a scope of provided so they don't a
 			</exclusions>
 		</dependency>
 
+		<dependency>
+			<groupId>jakarta.xml.bind</groupId>
+			<artifactId>jakarta.xml.bind-api</artifactId>
+			<version>2.3.3</version>
+		</dependency>
+
+		<dependency>
+			<groupId>javax.json</groupId>
+			<artifactId>javax.json-api</artifactId>
+			<version>1.1</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.glassfish</groupId>
+			<artifactId>javax.json</artifactId>
+			<version>1.1</version>
+		</dependency>
+
 		<!-- Test dependencies -->
 
 		<dependency>
@@ -312,6 +364,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>
@@ -331,8 +389,7 @@ some of the depedencies should probably have a scope of provided so they don't a
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
 					<configuration>
-						<source>1.8</source>
-						<target>1.8</target>
+						<release>11</release>
 					</configuration>
 				</plugin>
 
@@ -436,26 +493,6 @@ some of the depedencies should probably have a scope of provided so they don't a
 				</executions>
 			</plugin>
  -->
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>${version.jacoco.maven.plugin}</version>
-				<executions>
-					<execution>
-						<id>prepare-agent</id>
-						<goals>
-							<goal>prepare-agent</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>report</id>
-						<phase>package</phase>
-						<goals>
-							<goal>report</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 
 <!-- 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
@@ -559,23 +596,6 @@ some of the depedencies should probably have a scope of provided so they don't a
             <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-deploy-plugin</artifactId>
                     <version>2.8.2</version>
-                    <executions>
-                        <execution>
-                            <id>default-deploy</id>
-                            <phase>none</phase>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>org.sonatype.plugins</groupId>
-                    <artifactId>nexus-staging-maven-plugin</artifactId>
-                    <version>1.6.7</version>
-                    <extensions>true</extensions>
-                    <configuration>
-                        <nexusUrl>${onap.nexus.url}</nexusUrl>
-                        <stagingProfileId>176c31dfe190a</stagingProfileId>
-                        <serverId>ecomp-staging</serverId>
-                    </configuration>
                 </plugin>
 	      </plugins>
 </build>