Update versions for next release

[cps.git] / cps-rest / pom.xml

diff --git a/cps-rest/pom.xml b/cps-rest/pom.xml
index 4b42656..6019197 100755 (executable)
--- a/cps-rest/pom.xml
+++ b/cps-rest/pom.xml
@@ -2,6 +2,7 @@
 <!--
   ============LICENSE_START=======================================================
   Copyright (c) 2020 Linux Foundation.
 <!--
   ============LICENSE_START=======================================================
   Copyright (c) 2020 Linux Foundation.

+  Modifications Copyright (C) 2020-2022 Nordix Foundation.

   Modifications Copyright (C) 2021 Bell Canada.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   Modifications Copyright (C) 2021 Bell Canada.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");


@@ -15,6 +16,8 @@
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.

+
+  SPDX-License-Identifier: Apache-2.0

   ============LICENSE_END=========================================================
 -->
 
   ============LICENSE_END=========================================================
 -->
 


@@ -25,7 +28,7 @@
     <parent>
         <groupId>org.onap.cps</groupId>
         <artifactId>cps-parent</artifactId>
     <parent>
         <groupId>org.onap.cps</groupId>
         <artifactId>cps-parent</artifactId>

-        <version>1.1.0-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>

         <relativePath>../cps-parent/pom.xml</relativePath>
     </parent>
 
         <relativePath>../cps-parent/pom.xml</relativePath>
     </parent>
 


@@ -67,20 +70,21 @@
             <artifactId>swagger-annotations</artifactId>
         </dependency>
         <dependency>
             <artifactId>swagger-annotations</artifactId>
         </dependency>
         <dependency>

-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-ui</artifactId>
+            <version>1.5.11</version>

         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
         <dependency>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
         <dependency>

-            <groupId>org.modelmapper</groupId>
-            <artifactId>modelmapper</artifactId>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct-processor</artifactId>

         </dependency>
         <!-- T E S T   D E P E N D E N C I E S -->
         <dependency>
         </dependency>
         <!-- T E S T   D E P E N D E N C I E S -->
         <dependency>


@@ -129,6 +133,7 @@
                 <artifactId>swagger-codegen-maven-plugin</artifactId>
                 <executions>
                     <execution>
                 <artifactId>swagger-codegen-maven-plugin</artifactId>
                 <executions>
                     <execution>

+                        <id>code-gen</id>

                         <goals>
                             <goal>generate</goal>
                         </goals>
                         <goals>
                             <goal>generate</goal>
                         </goals>


@@ -149,6 +154,29 @@
                     </execution>
                 </executions>
             </plugin>
                     </execution>
                 </executions>
             </plugin>

+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.basedir}/target/classes/static/api-docs/cps-core</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>${project.basedir}/target/generated-sources/swagger/</directory>
+                                    <includes>
+                                      <include>openapi.yaml</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>

         </plugins>
     </build>
 </project>
         </plugins>
     </build>
 </project>