Adjust sparky parent pom

[aai/sparky-be.git] / sparkybe-onap-application / pom.xml

diff --git a/sparkybe-onap-application/pom.xml b/sparkybe-onap-application/pom.xml
index 7f3e036..f86e2a1 100644 (file)
--- a/sparkybe-onap-application/pom.xml
+++ b/sparkybe-onap-application/pom.xml
@@ -2,15 +2,15 @@
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
        <modelVersion>4.0.0</modelVersion>
 
-       <parent>
-               <groupId>org.springframework.boot</groupId>
-               <artifactId>spring-boot-starter-parent</artifactId>
-               <version>1.5.15.RELEASE</version>
+       <parent>
+         <groupId>org.onap.aai</groupId>
+         <artifactId>sparky-be</artifactId>
+         <version>1.5.0-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.aai.sparky-be</groupId>
        <artifactId>sparkybe-onap-application</artifactId>
-       <version>1.3.1-SNAPSHOT</version>
+       <version>1.5.0-SNAPSHOT</version>
        <packaging>jar</packaging>
 
        <properties>
@@ -18,7 +18,7 @@
                <version.jacoco.maven.plugin>0.7.9</version.jacoco.maven.plugin>
                <frontEndGroupdId>org.onap.aai</frontEndGroupdId>
                <frontEndArtifactId>sparky-fe</frontEndArtifactId>
-               <frontEndVersion>1.3.0-SNAPSHOT</frontEndVersion>
+               <frontEndVersion>1.5.0</frontEndVersion>
                <serverPort>9517</serverPort>
                <sslport>8000</sslport>
                <nexusproxy>https://nexus.onap.org</nexusproxy>
@@ -26,34 +26,39 @@
                <config-home>${basedir}/</config-home>
                <docker.location>${basedir}/target</docker.location>
                <docker.image.name>sparky-be</docker.image.name>
-               <version.aai-schema>1.3.0</version.aai-schema>
-        <sitePath>/content/sites/site/org/onap/aai/sparky-be/${project.artifactId}/${project.version}</sitePath>
+               <version.aai-schema>1.5.0</version.aai-schema>
+               <sitePath>/content/sites/site/org/onap/aai/sparky-be/${project.artifactId}/${project.version}</sitePath>
                <nexusproxy>https://nexus.onap.org</nexusproxy>
-    <shemaUnpackVersion>onap</shemaUnpackVersion>
+               <spring.boot.version>1.5.20.RELEASE</spring.boot.version>
+               <shemaUnpackVersion>onap</shemaUnpackVersion>
        </properties>
 
        <dependencyManagement>
-               <dependencies>
-
-                       <!-- 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>
-
-                       <dependency>
-                               <groupId>ch.qos.logback</groupId>
-                               <artifactId>logback-classic</artifactId>
-                               <version>1.2.3</version>
-                       </dependency>
-
- 
- 
-               </dependencies>
-
+          <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>
+             <artifactId>camel-spring-boot-dependencies</artifactId>
+             <version>${camel-spring-boot.version}</version>
+             <type>pom</type>
+             <scope>import</scope>
+           </dependency>
+           
+           <dependency>
+             <groupId>ch.qos.logback</groupId>
+             <artifactId>logback-classic</artifactId>
+             <version>1.2.3</version>
+           </dependency>
+
+         </dependencies>
+         
        </dependencyManagement>
 
        <dependencies>
@@ -62,6 +67,17 @@
                <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>
@@ -157,7 +173,7 @@
                <dependency>
                        <groupId>org.onap.aai.sparky-be</groupId>
                        <artifactId>sparkybe-onap-service</artifactId>
-                       <version>1.3.1-SNAPSHOT</version>
+                       <version>1.5.0-SNAPSHOT</version>
                </dependency>
 
 
@@ -196,7 +212,7 @@
                <dependency>
                        <groupId>org.onap.aai.logging-service</groupId>
                        <artifactId>common-logging</artifactId>
-                       <version>1.2.2</version>
+                       <version>1.5.0</version>
                </dependency>
 
                <dependency>
@@ -225,7 +241,7 @@
                </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>
@@ -233,7 +249,7 @@
                <dependency>
                        <groupId>org.onap.aai</groupId>
                        <artifactId>rest-client</artifactId>
-                       <version>1.3.0</version>
+                       <version>1.5.0</version>
                </dependency>
 
                <!-- https://mvnrepository.com/artifact/org.restlet.jee/org.restlet.ext.servlet -->
@@ -272,7 +288,7 @@
                <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>
@@ -392,7 +408,7 @@
                                <configuration>
                                        <folders>
                                                <folder>
-                                                       ${CONFIG_HOME}/portal/
+                                                       ${CONFIG_HOME}/portal/BOOT-INF/classes/
                                                </folder>
                                        </folders>
                                </configuration>
@@ -588,26 +604,7 @@
                        <plugin>
                          <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>${nexusproxy}</nexusUrl>
-                            <stagingProfileId>176c31dfe190a</stagingProfileId>
-                            <serverId>ecomp-staging</serverId>
-                         </configuration>
                        </plugin>
-                       
                        <!-- license plugin -->
                        <!-- <plugin> <groupId>com.mycila</groupId> <artifactId>license-maven-plugin</artifactId>
                                <version>3.0</version> <configuration> <header>LICENSE</header> <includes>
@@ -628,7 +625,7 @@
                                                <configuration>
                                                        <artifactItems>
                                                                <artifactItem>
-                                                                       <groupId>org.onap.aai.aai-common</groupId>
+                                                                       <groupId>org.onap.aai.schema-service</groupId>
                                                                        <artifactId>aai-schema</artifactId>
                                                                        <version>${version.aai-schema}</version>
                                                                        <type>jar</type>