Upgrade Spring Boot to version 1.5.19

[aai/gizmo.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 16d43ef..f14e721 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,10 @@ limitations under the License.
 
     <properties>
         <docker.location>${basedir}/target</docker.location>
-        <version.org.onap.aai.aai-common>1.4.1-SNAPSHOT</version.org.onap.aai.aai-common>
+        <version.org.onap.aai.aai-schema-ingest>1.4.1</version.org.onap.aai.aai-schema-ingest>
+        <version.org.onap.aai.aai-schema>1.4.0</version.org.onap.aai.aai-schema>
+        <version.org.onap.aai.aai-utils>1.4.0</version.org.onap.aai.aai-utils>
+        <version.org.onap.aai.aai-auth>1.4.0</version.org.onap.aai.aai-auth>
         <event.client.version>1.3.1</event.client.version>
     </properties>
 
@@ -46,7 +49,7 @@ limitations under the License.
                 <!-- Import dependency management from Spring Boot -->
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>1.5.18.RELEASE</version>
+                <version>1.5.19.RELEASE</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -107,7 +110,7 @@ limitations under the License.
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
             <version>3.2.5</version>
         </dependency>
-        
+
 
      <dependency>
          <groupId>io.swagger</groupId>
@@ -124,18 +127,18 @@ limitations under the License.
          <artifactId>springfox-swagger-ui</artifactId>
          <version>2.9.2</version>
       </dependency>
-      
+
 
         <!-- ONAP AAI-COMMON (incl. model) -->
         <dependency>
             <groupId>org.onap.aai.aai-common</groupId>
             <artifactId>aai-schema</artifactId>
-            <version>${version.org.onap.aai.aai-common}</version>
+            <version>${version.org.onap.aai.aai-schema}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.aai.aai-common</groupId>
             <artifactId>aai-schema-ingest</artifactId>
-            <version>${version.org.onap.aai.aai-common}</version>
+            <version>${version.org.onap.aai.aai-schema-ingest}</version>
             <exclusions>
                 <exclusion>
                   <groupId>org.powermock</groupId>
@@ -146,12 +149,12 @@ limitations under the License.
         <dependency>
             <groupId>org.onap.aai.aai-common</groupId>
             <artifactId>aai-utils</artifactId>
-            <version>${version.org.onap.aai.aai-common}</version>
+            <version>${version.org.onap.aai.aai-utils}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.aai.aai-common</groupId>
             <artifactId>aai-auth</artifactId>
-            <version>${version.org.onap.aai.aai-common}</version>
+            <version>${version.org.onap.aai.aai-auth}</version>
         </dependency>
 
         <!-- ONAP EVENT CLIENT -->
@@ -359,6 +362,39 @@ limitations under the License.
     <build>
         <finalName>${project.artifactId}</finalName>
         <plugins>
+            <!--
+            Using https://code.revelc.net/formatter-maven-plugin/ for Eclipse formatter
+            Using https://github.com/diffplug/spotless/tree/master/plugin-maven for import order
+            Use in combination to rewrite code and imports, then checkstyle
+
+            mvn formatter:format spotless:apply process-sources
+            -->
+            <plugin>
+                 <groupId>net.revelc.code.formatter</groupId>
+                 <artifactId>formatter-maven-plugin</artifactId>
+                 <version>2.8.1</version>
+                 <configuration>
+                    <configFile>${project.basedir}/onap-java-formatter.xml</configFile>
+                 </configuration>
+                 <!-- https://code.revelc.net/formatter-maven-plugin/
+                      use mvn formatter:format to rewrite source files
+                      use mvn formatter:validate to validate source files -->
+             </plugin>
+            <plugin>
+              <groupId>com.diffplug.spotless</groupId>
+              <artifactId>spotless-maven-plugin</artifactId>
+              <version>1.18.0</version>
+              <configuration>
+                <java>
+                 <importOrder>
+                   <order>com,java,javax,org</order>
+                 </importOrder>
+                </java>
+              </configuration>
+            <!-- https://github.com/diffplug/spotless/tree/master/plugin-maven
+                 use mvn spotless:apply to rewrite source files
+                 use mvn spotless:check to validate source files -->
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
@@ -494,7 +530,7 @@ limitations under the License.
                                 <artifactItem>
                                     <groupId>org.onap.aai.aai-common</groupId>
                                     <artifactId>aai-schema</artifactId>
-                                    <version>${version.org.onap.aai.aai-common}</version>
+                                    <version>${version.org.onap.aai.aai-schema}</version>
                                     <type>jar</type>
                                     <includes>onap/**/</includes>
                                     <outputDirectory>${project.build.directory}/bundleconfig-local/etc</outputDirectory>