upgrade to spring boot 1.5.12

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

diff --git a/sparkybe-onap-application/pom.xml b/sparkybe-onap-application/pom.xml
index ec40b53..98bad9b 100644 (file)
--- a/sparkybe-onap-application/pom.xml
+++ b/sparkybe-onap-application/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-starter-parent</artifactId>
-               <version>1.5.10.RELEASE</version>
+               <version>1.5.12.RELEASE</version>
        </parent>
 
        <groupId>org.onap.aai.sparky-be</groupId>
@@ -18,17 +18,16 @@
                <version.jacoco.maven.plugin>0.7.9</version.jacoco.maven.plugin>
                <frontEndGroupdId>org.onap.aai</frontEndGroupdId>
                <frontEndArtifactId>sparky-fe</frontEndArtifactId>
-               <frontEndVersion>1.1.0-SNAPSHOT</frontEndVersion>
+               <frontEndVersion>1.2.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>
                <config-home>${basedir}/</config-home>
+               <docker.location>${basedir}/target</docker.location>
+               <docker.image.name>sparky-be</docker.image.name>
        </properties>
 
-
-
-
        <dependencyManagement>
                <dependencies>
 
@@ -107,8 +106,8 @@
                </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> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId>
+                       </dependency> <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-core</artifactId>
                        </dependency> -->
 
                <!-- Camel -->
@@ -163,17 +162,17 @@
                        <version>1.2</version>
                </dependency>
 
-               <!-- <dependency> <groupId>org.apache.tomcat.embed</groupId> <artifactId>tomcat-embed-jasper</artifactId> 
+               <!-- <dependency> <groupId>org.apache.tomcat.embed</groupId> <artifactId>tomcat-embed-jasper</artifactId>
                        </dependency> -->
 
 
                <!-- https://mvnrepository.com/artifact/org.apache.camel/camel-http-common -->
-               <!-- <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-http</artifactId> 
-                       <version>2.15.5</version> </dependency> <dependency> <groupId>abc.def</groupId> 
-                       <artifactId>att-camel-dme2-servlet</artifactId> <version>2.15.5</version> 
-                       <scope>system</scope> <systemPath>x:/222/att-camel-dme2-servlet-2.15.5.jar</systemPath> 
-                       </dependency> <dependency> <groupId>abc.def</groupId> <artifactId>att-camel-static-content</artifactId> 
-                       <version>2.11.2.1</version> <scope>system</scope> <systemPath>x:/222/att-camel-static-content-2.11.2.1.jar</systemPath> 
+               <!-- <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-http</artifactId>
+                       <version>2.15.5</version> </dependency> <dependency> <groupId>abc.def</groupId>
+                       <artifactId>att-camel-dme2-servlet</artifactId> <version>2.15.5</version>
+                       <scope>system</scope> <systemPath>x:/222/att-camel-dme2-servlet-2.15.5.jar</systemPath>
+                       </dependency> <dependency> <groupId>abc.def</groupId> <artifactId>att-camel-static-content</artifactId>
+                       <version>2.11.2.1</version> <scope>system</scope> <systemPath>x:/222/att-camel-static-content-2.11.2.1.jar</systemPath>
                        </dependency> -->
 
                <!-- Utility dependencies -->
@@ -387,12 +386,14 @@
                                        </folders>
                                </configuration>
                        </plugin>
+
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-resources-plugin</artifactId>
+                               <version>2.7</version>
                                <executions>
                                        <execution>
-                                               <id>copy-docker-file</id>
+                                               <id>copy-docker-file-to-target</id>
                                                <phase>package</phase>
                                                <goals>
                                                        <goal>copy-resources</goal>
@@ -408,8 +409,33 @@
                                                                                <include>**/*</include>
                                                                        </includes>
                                                                </resource>
+                                                       </resources>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
+
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-resources-plugin</artifactId>
+                               <version>2.7</version>
+                               <executions>
+                                       <execution>
+                                               <id>copy-scripts-to-target</id>
+                                               <phase>package</phase>
+                                               <goals>
+                                                       <goal>copy-resources</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <outputDirectory>target/scripts</outputDirectory>
+                                                       <overwrite>true</overwrite>
+                                                       <resources>
                                                                <resource>
-                                                                       <directory>${basedir}/src/main/bin/</directory>
+                                                                       <directory>${basedir}/src/main/scripts</directory>
+                                                                       <filtering>true</filtering>
+                                                                       <includes>
+                                                                               <include>**/*</include>
+                                                                       </includes>
                                                                </resource>
                                                        </resources>
                                                </configuration>
@@ -417,15 +443,16 @@
                                </executions>
                        </plugin>
 
-                       <plugin>
+                       <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-dependency-plugin</artifactId>
+                               <version>3.0.0</version>
                                <executions>
                                        <execution>
-                                               <id>copy-installed</id>
+                                               <id>copy-war-to-target</id>
                                                <phase>install</phase>
                                                <goals>
-                                                       <goal>copy</goal>
+                                                       <goal>unpack</goal>
                                                </goals>
                                                <configuration>
                                                        <artifactItems>
@@ -434,8 +461,7 @@
                                                                        <artifactId>${frontEndArtifactId}</artifactId>
                                                                        <version>${frontEndVersion}</version>
                                                                        <type>war</type>
-                                                                       <outputDirectory>${basedir}/target/</outputDirectory>
-                                                                       <destFileName>aai.war</destFileName>
+                                                                       <outputDirectory>${basedir}/target/static/services/aai/webapp/</outputDirectory>
                                                                </artifactItem>
                                                        </artifactItems>
                                                </configuration>
@@ -495,12 +521,12 @@
                                </configuration>
                        </plugin>
 
-                       <!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> 
-                               <version>2.7</version> <executions> <execution> <id>copy-docker-file</id> 
-                               <phase>package</phase> <goals> <goal>copy-resources</goal> </goals> <configuration> 
-                               <outputDirectory>target</outputDirectory> <overwrite>true</overwrite> <resources> 
-                               <resource> <directory>${basedir}/src/main/docker</directory> <filtering>true</filtering> 
-                               <includes> <include>**/*</include> </includes> </resource> <resource> <directory>${basedir}/src/main/scripts/</directory> 
+                       <!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId>
+                               <version>2.7</version> <executions> <execution> <id>copy-docker-file</id>
+                               <phase>package</phase> <goals> <goal>copy-resources</goal> </goals> <configuration>
+                               <outputDirectory>target</outputDirectory> <overwrite>true</overwrite> <resources>
+                               <resource> <directory>${basedir}/src/main/docker</directory> <filtering>true</filtering>
+                               <includes> <include>**/*</include> </includes> </resource> <resource> <directory>${basedir}/src/main/scripts/</directory>
                                </resource> </resources> </configuration> </execution> </executions> </plugin> -->
                        <plugin>
                                <groupId>com.spotify</groupId>
@@ -509,7 +535,7 @@
                                <configuration>
                                        <verbose>true</verbose>
                                        <serverId>docker-hub</serverId>
-                                       <imageName>${docker.push.registry}/onap/${project.artifactId}</imageName>
+                                       <imageName>${docker.push.registry}/onap/${docker.image.name}</imageName>
                                        <dockerDirectory>${docker.location}</dockerDirectory>
                                        <imageTags>
                                                <imageTag>latest</imageTag>
@@ -518,10 +544,10 @@
                                </configuration>
                        </plugin>
                        <!-- license plugin -->
-                       <!-- <plugin> <groupId>com.mycila</groupId> <artifactId>license-maven-plugin</artifactId> 
-                               <version>3.0</version> <configuration> <header>LICENSE</header> <includes> 
-                               <include>src/main/java/**</include> </includes> </configuration> <executions> 
-                               <execution> <goals> <goal>format</goal> </goals> <phase>process-sources</phase> 
+                       <!-- <plugin> <groupId>com.mycila</groupId> <artifactId>license-maven-plugin</artifactId>
+                               <version>3.0</version> <configuration> <header>LICENSE</header> <includes>
+                               <include>src/main/java/**</include> </includes> </configuration> <executions>
+                               <execution> <goals> <goal>format</goal> </goals> <phase>process-sources</phase>
                                </execution> </executions> </plugin> -->
                </plugins>
        </build>
@@ -539,6 +565,3 @@
        </distributionManagement>
 
 </project>
-
-
-