X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=sparkybe-onap-application%2Fpom.xml;h=402b521ae873f1da908a8783f3f0ad28cd427ccb;hb=refs%2Fheads%2Fmaster;hp=bdb37a7235d70d435a4ad25368fc9905c9d4dc03;hpb=34687b40708b969424b0f4489258a9476ec6a917;p=aai%2Fsparky-be.git

diff --git a/sparkybe-onap-application/pom.xml b/sparkybe-onap-application/pom.xml
index bdb37a7..1d7d3b0 100644
--- a/sparkybe-onap-application/pom.xml
+++ b/sparkybe-onap-application/pom.xml
@@ -5,25 +5,25 @@
   	<parent>
 	  <groupId>org.onap.aai</groupId>
 	  <artifactId>sparky-be</artifactId>
-	  <version>1.6.1-SNAPSHOT</version>
+	  <version>2.0.5-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.onap.aai.sparky-be</groupId>
 	<artifactId>sparkybe-onap-application</artifactId>
-	<version>1.6.1-SNAPSHOT</version>
+	<version>2.0.5-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
     <properties>
-        <java.version>1.8</java.version>
+        <java.version>11</java.version>
         <frontEndGroupdId>org.onap.aai</frontEndGroupdId>
         <frontEndArtifactId>sparky-fe</frontEndArtifactId>
-        <frontEndVersion>1.5.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-schema>1.6.0</version.aai-schema>
+        <version.aai-schema>1.6.6</version.aai-schema>
         <sitePath>/content/sites/site/org/onap/aai/sparky-be/${project.artifactId}/${project.version}</sitePath>
         <nexusproxy>https://nexus.onap.org</nexusproxy>
         <spring.boot.version>1.5.21.RELEASE</spring.boot.version>
@@ -36,7 +36,8 @@
         </aai.build.directory>
         <aai.docker.namespace>onap</aai.docker.namespace>
         <aai.base.image>alpine</aai.base.image>
-        <aai.base.image.version>1.6.0</aai.base.image.version>
+        <aai.base.image.version>1.13.2</aai.base.image.version>
+        <jacoco.line.coverage.limit>0.10</jacoco.line.coverage.limit>
         <!-- This will be used for the docker images as the default format of maven build has issues -->
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
     </properties>
@@ -93,6 +94,11 @@
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-restlet</artifactId>
@@ -130,32 +136,12 @@
             </exclusions>
         </dependency>
 
-        <!-- Camel BOM -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-spring-boot-dependencies</artifactId>
-            <version>${camel-spring-boot.version}</version>
-            <type>pom</type>
-            <scope>import</scope>
-        </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> -->
-
         <!-- Camel -->
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-spring-boot-starter</artifactId>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/org.apache.camel/camel-restlet -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-restlet</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
@@ -173,15 +159,10 @@
             <artifactId>camel-servlet-starter</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-
 		<dependency>
 			<groupId>org.onap.aai.sparky-be</groupId>
 			<artifactId>sparkybe-onap-service</artifactId>
-			<version>1.6.0-SNAPSHOT</version>
+			<version>${project.version}</version>
 		</dependency>
 
 
@@ -229,7 +210,7 @@
         <dependency>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>eclipselink</artifactId>
-            <version>2.6.2</version>
+            <version>2.7.7</version>
         </dependency>
 
         <dependency>
@@ -253,7 +234,7 @@
         <dependency>
             <groupId>org.onap.aai</groupId>
             <artifactId>rest-client</artifactId>
-            <version>1.5.0</version>
+            <version>1.3.0</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.restlet.jee/org.restlet.ext.servlet -->
@@ -292,7 +273,6 @@
         <dependency>
             <groupId>org.onap.portal.sdk</groupId>
             <artifactId>epsdk-fw</artifactId>
-            <version>2.5.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-logging</groupId>
@@ -313,6 +293,13 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.30</version>
+            <scope>provided</scope>
+        </dependency>
+
         <!-- Test dependencies -->
 
         <dependency>
@@ -486,9 +473,9 @@
                 <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>
                     </configuration>
                 </plugin>
             </plugins>
@@ -498,6 +485,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${spring.boot.version}</version>
                 <configuration>
                     <folders>
                         <folder>
@@ -559,7 +547,7 @@
                     </execution>
                     <execution>
                         <id>unpack</id>
-                        <phase>prepare-package</phase>
+                        <phase>initialize</phase>
                         <goals>
                             <goal>unpack</goal>
                         </goals>
@@ -573,6 +561,14 @@
                                     <includes>/${shemaUnpackVersion}/oxm/</includes>
                                     <outputDirectory>${aai.build.directory}</outputDirectory>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.onap.aai.schema-service</groupId>
+                                    <artifactId>aai-schema</artifactId>
+                                    <version>${version.aai-schema}</version>
+                                    <type>jar</type>
+                                    <outputDirectory>${project.basedir}/src/main/resources/schema/</outputDirectory>
+                                    <includes>**/oxm/**/*.xml</includes>
+                                </artifactItem>
                             </artifactItems>
                         </configuration>
                     </execution>
@@ -582,6 +578,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>
+                <version>2.7</version>
                 <executions>
                     <execution>
                         <phase/>