Migrate to springboot 2.6.2

[nonrtric.git] / r-app-catalogue / pom.xml

diff --git a/r-app-catalogue/pom.xml b/r-app-catalogue/pom.xml
index 110f2d0..67be912 100644 (file)
--- a/r-app-catalogue/pom.xml
+++ b/r-app-catalogue/pom.xml
@@ -26,12 +26,12 @@
     <parent>\r
         <groupId>org.springframework.boot</groupId>\r
         <artifactId>spring-boot-starter-parent</artifactId>\r
-        <version>2.3.4.RELEASE</version>\r
+        <version>2.6.2</version>\r
         <relativePath />\r
     </parent>\r
     <groupId>org.o-ran-sc.nonrtric</groupId>\r
     <artifactId>r-app-catalogue</artifactId>\r
-    <version>1.0.0-SNAPSHOT</version>\r
+    <version>1.1.0-SNAPSHOT</version>\r
     <licenses>\r
         <license>\r
             <name>The Apache Software License, Version 2.0</name>\r
@@ -43,8 +43,10 @@
         <swagger-annotations.version>1.5.22</swagger-annotations.version>\r
         <springfox.version>2.9.2</springfox.version>\r
         <jackson-databind-nullable.version>0.2.1</jackson-databind-nullable.version>\r
-        <openapi-generator-maven-plugin.version>4.3.1</openapi-generator-maven-plugin.version>\r
-        <swagger-codegen-maven-plugin.version>3.0.11</swagger-codegen-maven-plugin.version>\r
+        <openapi-generator-maven-plugin.version>5.3.1</openapi-generator-maven-plugin.version>\r
+        <swagger-codegen-maven-plugin.version>3.0.31</swagger-codegen-maven-plugin.version>\r
+        <formatter-maven-plugin.version>2.12.2</formatter-maven-plugin.version>\r
+        <spotless-maven-plugin.version>1.24.3</spotless-maven-plugin.version>\r
         <jacoco-maven-plugin.version>0.8.6</jacoco-maven-plugin.version>\r
         <docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>\r
     </properties>\r
@@ -155,6 +157,17 @@
             <artifactId>junit-jupiter-engine</artifactId>\r
             <scope>test</scope>\r
         </dependency>\r
+        <dependency>\r
+            <groupId>org.springframework.boot</groupId>\r
+            <artifactId>spring-boot-starter-test</artifactId>\r
+            <scope>test</scope>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.apache.httpcomponents</groupId>\r
+            <artifactId>httpclient</artifactId>\r
+            <scope>test</scope>\r
+        </dependency>\r
+\r
     </dependencies>\r
 \r
     <build>\r
@@ -180,6 +193,7 @@
                             <invokerPackage>org.oransc.rappcatalogue</invokerPackage>\r
                             <configOptions>\r
                                 <delegatePattern>true</delegatePattern>\r
+                                <unhandledException>true</unhandledException>\r
                             </configOptions>\r
                         </configuration>\r
                     </execution>\r
@@ -205,6 +219,32 @@
                     </execution>\r
                 </executions>\r
             </plugin>\r
+            <plugin>\r
+                <groupId>net.revelc.code.formatter</groupId>\r
+                <artifactId>formatter-maven-plugin</artifactId>\r
+                <version>${formatter-maven-plugin.version}</version>\r
+                <configuration>\r
+                    <configFile>${project.basedir}/eclipse-formatter.xml</configFile>\r
+                </configuration>\r
+                <!-- https://code.revelc.net/formatter-maven-plugin/ use mvn formatter:format\r
+                    spotless:apply process-sources -->\r
+            </plugin>\r
+            <plugin>\r
+                <groupId>com.diffplug.spotless</groupId>\r
+                <artifactId>spotless-maven-plugin</artifactId>\r
+                <version>${spotless-maven-plugin.version}</version>\r
+                <configuration>\r
+                    <java>\r
+                        <removeUnusedImports />\r
+                        <importOrder>\r
+                            <order>com,java,javax,org</order>\r
+                        </importOrder>\r
+                    </java>\r
+                </configuration>\r
+                <!-- https://github.com/diffplug/spotless/tree/master/plugin-maven use\r
+                    mvn spotless:apply to rewrite source files use mvn spotless:check to validate\r
+                    source files -->\r
+            </plugin>\r
             <plugin>\r
                 <groupId>org.jacoco</groupId>\r
                 <artifactId>jacoco-maven-plugin</artifactId>\r
@@ -288,4 +328,4 @@
             </plugin>\r
         </plugins>\r
     </build>\r
-</project>
\ No newline at end of file
+</project>\r