X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=sparkybe-onap-service%2Fpom.xml;h=9d1b31134c22a32fcc8dd4920851c9473c7f60b4;hb=refs%2Fheads%2Fmaster;hp=ce40b14e7c9ddf7a1ee649f7645809ca7fb2f7f2;hpb=847b9d464fe26ac3bca915cbda65bc0e55b61677;p=aai%2Fsparky-be.git

diff --git a/sparkybe-onap-service/pom.xml b/sparkybe-onap-service/pom.xml
index ce40b14..b62de3a 100644
--- a/sparkybe-onap-service/pom.xml
+++ b/sparkybe-onap-service/pom.xml
@@ -2,39 +2,43 @@
   <modelVersion>4.0.0</modelVersion>
 
   	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.15.RELEASE</version>
+	  <groupId>org.onap.aai</groupId>
+	  <artifactId>sparky-be</artifactId>
+	  <version>2.0.4-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.onap.aai.sparky-be</groupId>
 	<artifactId>sparkybe-onap-service</artifactId>
-	<version>1.3.2-SNAPSHOT</version>
+	<version>2.0.4-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>11</java.version>
 		<frontEndGroupdId>org.onap.aai</frontEndGroupdId>
 		<frontEndArtifactId>sparky-fe</frontEndArtifactId>
-		<frontEndVersion>1.3.0</frontEndVersion>
+		<frontEndVersion>2.0.0</frontEndVersion>
 		<serverPort>9517</serverPort>
 		<sslport>8000</sslport>
 		<nexusproxy>https://nexus.onap.org</nexusproxy>
 		<camel-spring-boot.version>2.21.1</camel-spring-boot.version>
 		<config-home>${basedir}/</config-home>
-		<version.aai.aai-schema-ingest>1.3.0</version.aai.aai-schema-ingest>
-		<version.aai-schema>1.3.0</version.aai-schema>
+		<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>
@@ -64,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>
@@ -189,7 +204,7 @@ some of the depedencies should probably have a scope of provided so they don't a
 		<dependency>
 			<groupId>org.onap.aai.logging-service</groupId>
 			<artifactId>common-logging</artifactId>
-			<version>1.2.2</version>
+			<version>1.5.0</version>
 		</dependency>
 
 
@@ -203,7 +218,7 @@ some of the depedencies should probably have a scope of provided so they don't a
 		<dependency>
 			<groupId>org.eclipse.persistence</groupId>
 			<artifactId>eclipselink</artifactId>
-			<version>2.6.2</version>
+			<version>2.7.7</version>
 		</dependency>
 
 		<dependency>
@@ -219,7 +234,7 @@ 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>${version.aai-schema}</version>
 		</dependency>
@@ -278,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>
@@ -299,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>
@@ -356,9 +388,9 @@ some of the depedencies should probably have a scope of provided so they don't a
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
+					<version>3.8.0</version>
 					<configuration>
-						<source>1.8</source>
-						<target>1.8</target>
+						<release>11</release>  <!--or <release>10</release>-->
 					</configuration>
 				</plugin>
 
@@ -462,26 +494,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>
@@ -585,23 +597,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>