Update to latest version of schema-service

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

diff --git a/sparkybe-onap-application/pom.xml b/sparkybe-onap-application/pom.xml
index d368769..4d36d15 100644 (file)
--- a/sparkybe-onap-application/pom.xml
+++ b/sparkybe-onap-application/pom.xml
@@ -5,12 +5,12 @@
        <parent>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-starter-parent</artifactId>
-               <version>1.5.12.RELEASE</version>
+               <version>1.5.20.RELEASE</version>
        </parent>
 
        <groupId>org.onap.aai.sparky-be</groupId>
        <artifactId>sparkybe-onap-application</artifactId>
-       <version>1.3.0-SNAPSHOT</version>
+       <version>1.4.0-SNAPSHOT</version>
        <packaging>jar</packaging>
 
        <properties>
@@ -18,16 +18,18 @@
                <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.4.0-SNAPSHOT</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>
                <docker.location>${basedir}/target</docker.location>
                <docker.image.name>sparky-be</docker.image.name>
-               <sitePath>/content/sites/site/org/onap/aai/sparky-be/${project.artifactId}/${project.version}</sitePath>
+               <version.aai-schema>1.0.5</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>
        </properties>
 
        <dependencyManagement>
@@ -42,12 +44,14 @@
                                <scope>import</scope>
                        </dependency>
 
-                       <dependency>
+                       <dependency>
                                <groupId>ch.qos.logback</groupId>
                                <artifactId>logback-classic</artifactId>
-                               <version>1.2.1</version>
+                               <version>1.2.3</version>
                        </dependency>
 
+ 
+ 
                </dependencies>
 
        </dependencyManagement>
@@ -58,6 +62,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>
@@ -84,6 +99,10 @@
                                        <groupId>ch.qos.logback</groupId>
                                        <artifactId>logback-classic</artifactId>
                                </exclusion>
+                               <exclusion>
+                               <groupId>org.slf4j</groupId>
+                               <artifactId>log4j-over-slf4j</artifactId>
+                               </exclusion>
                        </exclusions>
                </dependency>
 
@@ -149,7 +168,7 @@
                <dependency>
                        <groupId>org.onap.aai.sparky-be</groupId>
                        <artifactId>sparkybe-onap-service</artifactId>
-                       <version>1.3.0-SNAPSHOT</version>
+                       <version>1.4.0-SNAPSHOT</version>
                </dependency>
 
 
@@ -182,7 +201,7 @@
                <dependency>
                        <groupId>com.google.guava</groupId>
                        <artifactId>guava</artifactId>
-                       <version>19.0</version>
+                       <version>26.0-jre</version>
                </dependency>
 
                <dependency>
@@ -192,9 +211,10 @@
                </dependency>
 
                <dependency>
-                       <groupId>dom4j</groupId>
+                       <groupId>org.dom4j</groupId>
                        <artifactId>dom4j</artifactId>
                        <scope>provided</scope>
+                       <version>2.1.1</version>
                </dependency>
 
                <dependency>
@@ -216,15 +236,15 @@
                </dependency>
 
                <dependency>
-                       <groupId>org.onap.aai.aai-common</groupId>
+                       <groupId>org.onap.aai.schema-service</groupId>
                        <artifactId>aai-schema</artifactId>
-                       <version>1.3.0-SNAPSHOT</version>
+                       <version>${version.aai-schema}</version>
                </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 -->
@@ -263,7 +283,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>
@@ -383,7 +403,7 @@
                                <configuration>
                                        <folders>
                                                <folder>
-                                                       ${CONFIG_HOME}/portal/
+                                                       ${CONFIG_HOME}/portal/BOOT-INF/classes/
                                                </folder>
                                        </folders>
                                </configuration>
@@ -445,6 +465,37 @@
                                </executions>
                        </plugin>
 
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-resources-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <id>copy-config-to-target</id>
+                                               <phase>package</phase>
+                                               <goals>
+                                                       <goal>copy-resources</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <outputDirectory>target/config</outputDirectory>
+                                                       <overwrite>true</overwrite>
+                                                       <resources>
+                                                               <resource>
+                                                                       <directory>${basedir}/config</directory>
+                                                                       <filtering>true</filtering>
+                                                                       <includes>
+                                                                               <include>**/*</include>
+                                                                       </includes>
+                                                                       <excludes>
+                                                                               <exclude>**/auth/*</exclude>
+                                                                       </excludes>
+                                                               </resource>
+                                                       </resources>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
+
+
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-dependency-plugin</artifactId>
@@ -545,7 +596,6 @@
                                        <forceTags>true</forceTags>
                                </configuration>
                        </plugin>
-
                        <plugin>
                          <groupId>org.apache.maven.plugins</groupId>
                          <artifactId>maven-deploy-plugin</artifactId>
@@ -575,7 +625,33 @@
                                <include>src/main/java/**</include> </includes> </configuration> <executions>
                                <execution> <goals> <goal>format</goal> </goals> <phase>process-sources</phase>
                                </execution> </executions> </plugin> -->
-                       
+
+       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-dependency-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <id>unpack</id>
+                                               <phase>prepare-package</phase>
+                                               <goals>
+                                                       <goal>unpack</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <artifactItems>
+                                                               <artifactItem>
+                                                                       <groupId>org.onap.aai.schema-service</groupId>
+                                                                       <artifactId>aai-schema</artifactId>
+                                                                       <version>${version.aai-schema}</version>
+                                                                       <type>jar</type>
+                                                                       <includes>/${shemaUnpackVersion}/oxm/</includes>
+                                                                       <outputDirectory>${project.build.directory}/oxm</outputDirectory>
+                                                               </artifactItem>
+                                                       </artifactItems>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
+
                </plugins>
        </build>
 
@@ -614,5 +690,4 @@
             <url>${nexusproxy}/content/repositories/snapshots/</url>
         </repository>
     </repositories>
-
 </project>