Reestructore cps project

+ Introduce BOM artifacts
+ decoupling of root from parent

new artifacts introduced:

cps-bom: contains dependencyManagement declarations of all published components
cps-dependencies: contains dependencyManagement declarations of upstream versions
cps-parent: parent of cps project / decoupling of root project pom responsabilities

JIRA: CCSDK-2946
Signed-off-by: Claudio David Gasparini <claudio.gasparini@pantheon.tech> Change-Id: I752c19dea6c92f939f0a313f6a93f13a489cdef0

Change-Id: Iafb4eee7d1b20aa4e7fcca0c0027f5a0605e035d

7 files changed, 364 insertions, 271 deletions

diff --git a/cps/cps-bom/pom.xml b/cps/cps-bom/pom.xml
new file mode 100644
index 0000000000..ae9e806f3c
--- /dev/null
+++ b/cps/cps-bom/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.onap.cps</groupId>
+    <artifactId>cps-bom</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <description>This artifact contains dependencyManagement declarations of all published CPS components.</description>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.onap.cps</groupId>
+                <artifactId>cps-service</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.cps</groupId>
+                <artifactId>cps-rest</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.cps</groupId>
+                <artifactId>cps-ri</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+</project>
\ No newline at end of file
diff --git a/cps/cps-dependencies/pom.xml b/cps/cps-dependencies/pom.xml
new file mode 100644
index 0000000000..6f50cd0fc1
--- /dev/null
+++ b/cps/cps-dependencies/pom.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.onap.cps</groupId>
+    <artifactId>cps-dependencies</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>${project.groupId}:${project.artifactId}</name>
+    <description>This artifact contains dependencyManagement declarations of upstream versions.</description>
+
+    <properties>
+        <groovy.version>3.0.6</groovy.version>
+        <hibernate-types.version>2.10.0</hibernate-types.version>
+        <spock-core.version>2.0-M2-groovy-3.0</spock-core.version>
+        <springboot.version>2.3.3.RELEASE</springboot.version>
+        <swagger.version>2.1.4</swagger.version>
+        <yangtools.version>5.0.6</yangtools.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${springboot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yangtools-artifacts</artifactId>
+                <version>${yangtools.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>io.swagger.core.v3</groupId>
+                <artifactId>swagger-annotations</artifactId>
+                <version>${swagger.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.swagger.core.v3</groupId>
+                <artifactId>swagger-jaxrs2</artifactId>
+                <version>${swagger.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.vladmihalcea</groupId>
+                <artifactId>hibernate-types-52</artifactId>
+                <version>${hibernate-types.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.groovy</groupId>
+                <artifactId>groovy</artifactId>
+                <version>${groovy.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.spockframework</groupId>
+                <artifactId>spock-core</artifactId>
+                <version>${spock-core.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>cglib</groupId>
+                <artifactId>cglib-nodep</artifactId>
+                <version>3.1</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+</project>
\ No newline at end of file
diff --git a/cps/cps-parent/pom.xml b/cps/cps-parent/pom.xml
new file mode 100644
index 0000000000..2ddb2b6683
--- /dev/null
+++ b/cps/cps-parent/pom.xml
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.onap.oparent</groupId>
+        <artifactId>oparent</artifactId>
+        <version>3.1.0</version>
+        <relativePath/>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.onap.cps</groupId>
+    <artifactId>cps-parent</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <properties>
+        <java.version>11</java.version>
+        <maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
+        <maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
+        <maven-replacer-plugin.version>1.5.3</maven-replacer-plugin.version>
+        <oparent.version>3.1.0</oparent.version>
+        <spring-boot-maven-plugin.version>2.3.3.RELEASE</spring-boot-maven-plugin.version>
+        <swagger-ui.version>3.35.0</swagger-ui.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.onap.cps</groupId>
+                <artifactId>cps-dependencies</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.cps</groupId>
+                <artifactId>cps-bom</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+            <resource>
+                <directory>target/generated-sources/license</directory>
+                <includes>
+                    <include>third-party-licenses.txt</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>target/generated-resources/licenses</directory>
+                <includes>
+                    <include>*.*</include>
+                </includes>
+                <targetPath>third-party-licenses</targetPath>
+            </resource>
+        </resources>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-maven-plugin</artifactId>
+                    <version>${spring-boot-maven-plugin.version}</version>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>repackage</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <!-- Download Swagger UI webjar. -->
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <version>${maven-dependency-plugin.version}</version>
+                    <executions>
+                        <execution>
+                            <phase>prepare-package</phase>
+                            <goals>
+                                <goal>unpack</goal>
+                            </goals>
+                            <configuration>
+                                <artifactItems>
+                                    <artifactItem>
+                                        <groupId>org.webjars</groupId>
+                                        <artifactId>swagger-ui</artifactId>
+                                        <version>${swagger-ui.version}</version>
+                                    </artifactItem>
+                                </artifactItems>
+                                <outputDirectory>
+                                    ${project.build.directory}/swagger-ui-${swagger-ui.version}
+                                </outputDirectory>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <!-- Copy Swagger UI resources to static resources directory. -->
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>${maven-resources-plugin.version}</version>
+                    <executions>
+                        <execution>
+                            <id>copy-resources</id>
+                            <phase>prepare-package</phase>
+                            <goals>
+                                <goal>copy-resources</goal>
+                            </goals>
+                            <configuration>
+                                <outputDirectory>${project.build.outputDirectory}/static/swagger-ui
+                                </outputDirectory>
+                                <resources>
+                                    <resource>
+                                        <directory>
+                                            ${project.build.directory}/swagger-ui-${swagger-ui.version}/META-INF/resources/webjars/swagger-ui/${swagger-ui.version}/
+                                        </directory>
+                                        <excludes>
+                                            <exclude>**/*.gz</exclude>
+                                        </excludes>
+                                    </resource>
+                                </resources>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <!-- Replace the OpenAPI specification example URL with the local one. -->
+                    <groupId>com.google.code.maven-replacer-plugin</groupId>
+                    <artifactId>replacer</artifactId>
+                    <version>${maven-replacer-plugin.version}</version>
+                    <executions>
+                        <execution>
+                            <phase>prepare-package</phase>
+                            <goals>
+                                <goal>replace</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                    <configuration>
+                        <file>${project.build.outputDirectory}/static/swagger-ui/index.html</file>
+                        <replacements>
+                            <replacement>
+                                <token>https://petstore.swagger.io/v2/swagger.json</token>
+                                <value>/api/cps/openapi.json</value>
+                            </replacement>
+                        </replacements>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>onap-java-style</id>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                        <phase>process-sources</phase>
+                        <configuration>
+                            <configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
+                            <sourceDirectories>${project.build.sourceDirectory}</sourceDirectories>
+                            <includeResources>true</includeResources>
+                            <includeTestSourceDirectory>true</includeTestSourceDirectory>
+                            <includeTestResources>true</includeTestResources>
+                            <consoleOutput>false</consoleOutput>
+                            <violationSeverity>warning</violationSeverity>
+                            <failOnViolation>true</failOnViolation>
+                        </configuration>
+                    </execution>
+                </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.onap.oparent</groupId>
+                        <artifactId>checkstyle</artifactId>
+                        <version>${oparent.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+            <!-- Mandatory plugins for using Spock -->
+            <plugin>
+                <!-- The gmavenplus plugin is used to compile Groovy code.
+                    To learn more about this plugin, visit https://github.com/groovy/GMavenPlus/wiki -->
+                <groupId>org.codehaus.gmavenplus</groupId>
+                <artifactId>gmavenplus-plugin</artifactId>
+                <version>1.9.0</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>compileTests</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- Required because names of spec classes don't match default
+                Surefire patterns (`*Test` etc.) -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.0.0-M5</version>
+                <configuration>
+                    <useFile>false</useFile>
+                    <includes>
+                        <include>**/*Spec.java</include>
+                        <include>**/*Test.java</include> <!-- Just in case of having also "normal" JUnit tests -->
+                    </includes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/cps/cps-rest/pom.xml b/cps/cps-rest/pom.xml
index ed896a82f4..f9be75b7e3 100644
--- a/cps/cps-rest/pom.xml
+++ b/cps/cps-rest/pom.xml
@@ -2,27 +2,24 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">

     <modelVersion>4.0.0</modelVersion>

-    <artifactId>cps-rest</artifactId>

     <parent>

         <groupId>org.onap.cps</groupId>

-        <artifactId>cps</artifactId>

+        <artifactId>cps-parent</artifactId>

         <version>0.0.1-SNAPSHOT</version>

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

     </parent>

 

-    <dependencies>

+    <artifactId>cps-rest</artifactId>

 

+    <dependencies>

         <dependency>

-            <groupId>org.onap.cps</groupId>

+            <groupId>${project.groupId}</groupId>

             <artifactId>cps-service</artifactId>

-            <version>${project.version}</version>

         </dependency>

-

         <dependency>

-            <groupId>org.onap.cps</groupId>

+            <groupId>${project.groupId}</groupId>

             <artifactId>cps-ri</artifactId>

-            <version>${project.version}</version>

         </dependency>

-

         <dependency>

             <groupId>org.springframework.boot</groupId>

             <artifactId>spring-boot-starter-web</artifactId>

@@ -33,24 +30,18 @@
                 </exclusion>

             </exclusions>

         </dependency>

-

         <dependency>

             <groupId>org.springframework.boot</groupId>

             <artifactId>spring-boot-starter-jetty</artifactId>

         </dependency>

-

         <dependency>

             <groupId>io.swagger.core.v3</groupId>

             <artifactId>swagger-annotations</artifactId>

-            <version>${swagger.version}</version>

         </dependency>

-

         <dependency>

             <groupId>io.swagger.core.v3</groupId>

             <artifactId>swagger-jaxrs2</artifactId>

-            <version>${swagger.version}</version>

         </dependency>

-

         <dependency>

             <groupId>org.springframework.boot</groupId>

             <artifactId>spring-boot-starter-test</artifactId>

@@ -62,7 +53,6 @@
                 </exclusion>

             </exclusions>

         </dependency>

-

     </dependencies>

 

     <build>

@@ -70,93 +60,21 @@
             <plugin>

                 <groupId>org.springframework.boot</groupId>

                 <artifactId>spring-boot-maven-plugin</artifactId>

-                <version>${springboot.version}</version>

-                <executions>

-                    <execution>

-                        <goals>

-                            <goal>repackage</goal>

-                        </goals>

-                    </execution>

-                </executions>

             </plugin>

-

             <plugin>

                 <!-- Download Swagger UI webjar. -->

                 <groupId>org.apache.maven.plugins</groupId>

                 <artifactId>maven-dependency-plugin</artifactId>

-                <version>${maven-dependency-plugin.version}</version>

-                <executions>

-                    <execution>

-                        <phase>prepare-package</phase>

-                        <goals>

-                            <goal>unpack</goal>

-                        </goals>

-                        <configuration>

-                            <artifactItems>

-                                <artifactItem>

-                                    <groupId>org.webjars</groupId>

-                                    <artifactId>swagger-ui</artifactId>

-                                    <version>${swagger-ui.version}</version>

-                                </artifactItem>

-                            </artifactItems>

-                            <outputDirectory>

-                                ${project.build.directory}/swagger-ui-${swagger-ui.version}

-                            </outputDirectory>

-                        </configuration>

-                    </execution>

-                </executions>

             </plugin>

             <plugin>

                 <!-- Copy Swagger UI resources to static resources directory. -->

                 <groupId>org.apache.maven.plugins</groupId>

                 <artifactId>maven-resources-plugin</artifactId>

-                <version>${maven-resources-plugin.version}</version>

-                <executions>

-                    <execution>

-                        <id>copy-resources</id>

-                        <phase>prepare-package</phase>

-                        <goals>

-                            <goal>copy-resources</goal>

-                        </goals>

-                        <configuration>

-                            <outputDirectory>${project.build.outputDirectory}/static/swagger-ui

-                            </outputDirectory>

-                            <resources>

-                                <resource>

-                                    <directory>

-                                        ${project.build.directory}/swagger-ui-${swagger-ui.version}/META-INF/resources/webjars/swagger-ui/${swagger-ui.version}/

-                                    </directory>

-                                    <excludes>

-                                        <exclude>**/*.gz</exclude>

-                                    </excludes>

-                                </resource>

-                            </resources>

-                        </configuration>

-                    </execution>

-                </executions>

             </plugin>

             <plugin>

                 <!-- Replace the OpenAPI specification example URL with the local one. -->

                 <groupId>com.google.code.maven-replacer-plugin</groupId>

                 <artifactId>replacer</artifactId>

-                <version>${maven-replacer-plugin.version}</version>

-                <executions>

-                    <execution>

-                        <phase>prepare-package</phase>

-                        <goals>

-                            <goal>replace</goal>

-                        </goals>

-                    </execution>

-                </executions>

-                <configuration>

-                    <file>${project.build.outputDirectory}/static/swagger-ui/index.html</file>

-                    <replacements>

-                        <replacement>

-                            <token>https://petstore.swagger.io/v2/swagger.json</token>

-                            <value>/api/cps/openapi.json</value>

-                        </replacement>

-                    </replacements>

-                </configuration>

             </plugin>

         </plugins>

     </build>

diff --git a/cps/cps-ri/pom.xml b/cps/cps-ri/pom.xml
index 77cb5f86ac..2c28212afa 100644
--- a/cps/cps-ri/pom.xml
+++ b/cps/cps-ri/pom.xml
@@ -4,46 +4,37 @@
     <modelVersion>4.0.0</modelVersion>

     <parent>

         <groupId>org.onap.cps</groupId>

-        <artifactId>cps</artifactId>

+        <artifactId>cps-parent</artifactId>

         <version>0.0.1-SNAPSHOT</version>

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

     </parent>

     <artifactId>cps-ri</artifactId>

 

     <dependencies>

-

         <dependency>

-            <groupId>org.onap.cps</groupId>

+            <groupId>${project.groupId}</groupId>

             <artifactId>cps-service</artifactId>

-            <version>${project.version}</version>

         </dependency>

-

         <dependency>

             <groupId>org.springframework.boot</groupId>

             <artifactId>spring-boot-starter-data-jpa</artifactId>

         </dependency>

-

         <dependency>

             <groupId>org.springframework.boot</groupId>

             <artifactId>spring-boot-starter-validation</artifactId>

         </dependency>

-

         <dependency>

             <groupId>org.postgresql</groupId>

             <artifactId>postgresql</artifactId>

         </dependency>

-

-        <dependency>

         <!-- Add Hibernate support for Postgres datatype JSONB -->

+        <dependency>

             <groupId>com.vladmihalcea</groupId>

             <artifactId>hibernate-types-52</artifactId>

-            <version>${hibernate-types.version}</version>

         </dependency>

-

         <dependency>

             <groupId>org.projectlombok</groupId>

             <artifactId>lombok</artifactId>

         </dependency>

-

     </dependencies>

-

 </project>

diff --git a/cps/cps-service/pom.xml b/cps/cps-service/pom.xml
index ea1bdad39b..3e8cc2debd 100644
--- a/cps/cps-service/pom.xml
+++ b/cps/cps-service/pom.xml
@@ -4,75 +4,65 @@
   <modelVersion>4.0.0</modelVersion>

   <parent>

     <groupId>org.onap.cps</groupId>

-    <artifactId>cps</artifactId>

+    <artifactId>cps-parent</artifactId>

     <version>0.0.1-SNAPSHOT</version>

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

   </parent>

+

   <artifactId>cps-service</artifactId>

 

   <dependencies>

-

     <dependency>

       <groupId>org.opendaylight.yangtools</groupId>

       <artifactId>yang-parser-api</artifactId>

-      <version>${yangtools.version}</version>

     </dependency>

-

     <dependency>

       <groupId>org.opendaylight.yangtools</groupId>

       <artifactId>yang-parser-impl</artifactId>

-      <version>${yangtools.version}</version>

     </dependency>

-

     <dependency>

       <groupId>org.opendaylight.yangtools</groupId>

       <artifactId>yang-model-util</artifactId>

-      <version>${yangtools.version}</version>

     </dependency>

-

+    <!-- required for processing yang data in json format -->

     <dependency>

-      <!-- required for processing yang data in json format -->

       <groupId>org.opendaylight.yangtools</groupId>

       <artifactId>yang-data-codec-gson</artifactId>

-      <version>${yangtools.version}</version>

     </dependency>

-

     <dependency>

       <groupId>org.projectlombok</groupId>

       <artifactId>lombok</artifactId>

     </dependency>

-

     <dependency>

       <!-- For logging -->

       <groupId>org.slf4j</groupId>

       <artifactId>slf4j-api</artifactId>

     </dependency>

-

     <dependency>

       <!-- For dependency injection -->

       <groupId>org.springframework</groupId>

       <artifactId>spring-context</artifactId>

     </dependency>

-

     <dependency>

       <!-- For parsing JSON object -->

       <groupId>com.google.code.gson</groupId>

       <artifactId>gson</artifactId>

     </dependency>

-

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

     <dependency>

       <groupId>org.codehaus.groovy</groupId>

       <artifactId>groovy</artifactId>

+      <scope>test</scope>

     </dependency>

     <dependency>

       <groupId>org.spockframework</groupId>

       <artifactId>spock-core</artifactId>

+      <scope>test</scope>

     </dependency>

     <dependency>

       <groupId>cglib</groupId>

       <artifactId>cglib-nodep</artifactId>

+      <scope>test</scope>

     </dependency>

-

   </dependencies>

-

 </project>

diff --git a/cps/pom.xml b/cps/pom.xml
index 892492d2d2..c2d6c7994d 100644
--- a/cps/pom.xml
+++ b/cps/pom.xml
@@ -1,177 +1,37 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"

-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">

+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">

     <modelVersion>4.0.0</modelVersion>

     <parent>

         <groupId>org.onap.oparent</groupId>

         <artifactId>oparent</artifactId>

         <version>3.1.0</version>

     </parent>

+

     <groupId>org.onap.cps</groupId>

-    <artifactId>cps</artifactId>

+    <artifactId>cps-aggregator</artifactId>

     <version>0.0.1-SNAPSHOT</version>

     <packaging>pom</packaging>

+

     <name>cps</name>

     <description>ONAP Configuration and Persistency Service</description>

+

     <organization>

         <name>ONAP - CPS</name>

         <url>http://www.onap.org/</url>

     </organization>

 

-  <properties>

-    <java.version>11</java.version>

-    <springboot.version>2.3.3.RELEASE</springboot.version>

-    <oparent.version>3.1.0</oparent.version>

-    <yangtools.version>5.0.6</yangtools.version>

-    <swagger.version>2.1.4</swagger.version>

-    <groovy.version>3.0.6</groovy.version>

-    <spock-core.version>2.0-M2-groovy-3.0</spock-core.version>

-    <swagger-codegen.version>3.0.18</swagger-codegen.version>

-    <cxf-rt-rs-service.version>3.0.0</cxf-rt-rs-service.version>

-    <cxf-bundle-jaxrs.version>2.2.9</cxf-bundle-jaxrs.version>

-    <maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>

-    <maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>

-    <maven-replacer-plugin.version>1.5.3</maven-replacer-plugin.version>

-    <swagger-ui.version>3.35.0</swagger-ui.version>

-    <hibernate-types.version>2.10.0</hibernate-types.version>

-  </properties>

-

-    <dependencyManagement>

-        <dependencies>

-            <dependency>

-                <groupId>org.springframework.boot</groupId>

-                <artifactId>spring-boot-dependencies</artifactId>

-                <version>${springboot.version}</version>

-                <type>pom</type>

-                <scope>import</scope>

-            </dependency>

-

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

-            <dependency>

-                <groupId>org.codehaus.groovy</groupId>

-                <artifactId>groovy</artifactId>

-                <version>${groovy.version}</version>

-                <scope>test</scope>

-            </dependency>

-            <dependency>

-                <groupId>org.spockframework</groupId>

-                <artifactId>spock-core</artifactId>

-                <version>${spock-core.version}</version>

-                <scope>test</scope>

-            </dependency>

-            <dependency>

-                <groupId>cglib</groupId>

-                <artifactId>cglib-nodep</artifactId>

-                <version>3.1</version>

-                <scope>test</scope>

-            </dependency>

-

-        </dependencies>

-    </dependencyManagement>

-

-    <build>

-        <resources>

-            <resource>

-                <directory>src/main/resources</directory>

-                <filtering>true</filtering>

-            </resource>

-

-            <resource>

-                <directory>target/generated-sources/license</directory>

-                <includes>

-                    <include>third-party-licenses.txt</include>

-                </includes>

-            </resource>

-

-            <resource>

-                <directory>target/generated-resources/licenses</directory>

-                <includes>

-                    <include>*.*</include>

-                </includes>

-                <targetPath>third-party-licenses</targetPath>

-            </resource>

-        </resources>

-

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-compiler-plugin</artifactId>

-                <configuration>

-                    <source>${java.version}</source>

-                    <target>${java.version}</target>

-                </configuration>

-            </plugin>

-

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-checkstyle-plugin</artifactId>

-                <executions>

-                    <execution>

-                        <id>onap-java-style</id>

-                        <goals>

-                            <goal>check</goal>

-                        </goals>

-                        <phase>process-sources</phase>

-                        <configuration>

-                            <configLocation>onap-checkstyle/onap-java-style.xml</configLocation>

-                            <sourceDirectories>${project.build.sourceDirectory}</sourceDirectories>

-                            <includeResources>true</includeResources>

-                            <includeTestSourceDirectory>true</includeTestSourceDirectory>

-                            <includeTestResources>true</includeTestResources>

-                            <consoleOutput>false</consoleOutput>

-                            <violationSeverity>warning</violationSeverity>

-                            <failOnViolation>true</failOnViolation>

-                        </configuration>

-                    </execution>

-                </executions>

-

-                <dependencies>

-                    <dependency>

-                        <groupId>org.onap.oparent</groupId>

-                        <artifactId>checkstyle</artifactId>

-                        <version>${oparent.version}</version>

-                    </dependency>

-                </dependencies>

-

-            </plugin>

-

-            <!-- Mandatory plugins for using Spock -->

-            <plugin>

-                <!-- The gmavenplus plugin is used to compile Groovy code.

-                    To learn more about this plugin, visit https://github.com/groovy/GMavenPlus/wiki -->

-                <groupId>org.codehaus.gmavenplus</groupId>

-                <artifactId>gmavenplus-plugin</artifactId>

-                <version>1.9.0</version>

-                <executions>

-                    <execution>

-                        <goals>

-                            <goal>compileTests</goal>

-                        </goals>

-                    </execution>

-                </executions>

-            </plugin>

-            <!-- Required because names of spec classes don't match default

-                Surefire patterns (`*Test` etc.) -->

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-surefire-plugin</artifactId>

-                <version>3.0.0-M5</version>

-                <configuration>

-                    <useFile>false</useFile>

-                    <includes>

-                        <include>**/*Spec.java</include>

-                        <include>**/*Test.java</include> <!-- Just in case of having also "normal" JUnit tests -->

-                    </includes>

-                </configuration>

-            </plugin>

-

-        </plugins>

-    </build>

+    <properties>

+        <maven.deploy.skip>true</maven.deploy.skip>

+        <maven.install.skip>true</maven.install.skip>

+    </properties>

 

     <modules>

+        <module>cps-dependencies</module>

+        <module>cps-bom</module>

+        <module>cps-parent</module>

         <module>cps-service</module>

         <module>cps-rest</module>

         <module>cps-ri</module>

     </modules>

-

 </project>