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

diff --git a/cps/cps-bom/pom.xml b/cps/cps-bom/pom.xml
new file mode 100644 (file)
index 0000000..ae9e806
--- /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 (file)
index 0000000..6f50cd0
--- /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 (file)
index 0000000..2ddb2b6
--- /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 ed896a8..f9be75b 100644 (file)
--- 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"\r
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">\r
     <modelVersion>4.0.0</modelVersion>\r
-    <artifactId>cps-rest</artifactId>\r
     <parent>\r
         <groupId>org.onap.cps</groupId>\r
-        <artifactId>cps</artifactId>\r
+        <artifactId>cps-parent</artifactId>\r
         <version>0.0.1-SNAPSHOT</version>\r
+        <relativePath>../cps-parent/pom.xml</relativePath>\r
     </parent>\r
 \r
-    <dependencies>\r
+    <artifactId>cps-rest</artifactId>\r
 \r
+    <dependencies>\r
         <dependency>\r
-            <groupId>org.onap.cps</groupId>\r
+            <groupId>${project.groupId}</groupId>\r
             <artifactId>cps-service</artifactId>\r
-            <version>${project.version}</version>\r
         </dependency>\r
-\r
         <dependency>\r
-            <groupId>org.onap.cps</groupId>\r
+            <groupId>${project.groupId}</groupId>\r
             <artifactId>cps-ri</artifactId>\r
-            <version>${project.version}</version>\r
         </dependency>\r
-\r
         <dependency>\r
             <groupId>org.springframework.boot</groupId>\r
             <artifactId>spring-boot-starter-web</artifactId>\r
@@ -33,24 +30,18 @@
                 </exclusion>\r
             </exclusions>\r
         </dependency>\r
-\r
         <dependency>\r
             <groupId>org.springframework.boot</groupId>\r
             <artifactId>spring-boot-starter-jetty</artifactId>\r
         </dependency>\r
-\r
         <dependency>\r
             <groupId>io.swagger.core.v3</groupId>\r
             <artifactId>swagger-annotations</artifactId>\r
-            <version>${swagger.version}</version>\r
         </dependency>\r
-\r
         <dependency>\r
             <groupId>io.swagger.core.v3</groupId>\r
             <artifactId>swagger-jaxrs2</artifactId>\r
-            <version>${swagger.version}</version>\r
         </dependency>\r
-\r
         <dependency>\r
             <groupId>org.springframework.boot</groupId>\r
             <artifactId>spring-boot-starter-test</artifactId>\r
@@ -62,7 +53,6 @@
                 </exclusion>\r
             </exclusions>\r
         </dependency>\r
-\r
     </dependencies>\r
 \r
     <build>\r
@@ -70,93 +60,21 @@
             <plugin>\r
                 <groupId>org.springframework.boot</groupId>\r
                 <artifactId>spring-boot-maven-plugin</artifactId>\r
-                <version>${springboot.version}</version>\r
-                <executions>\r
-                    <execution>\r
-                        <goals>\r
-                            <goal>repackage</goal>\r
-                        </goals>\r
-                    </execution>\r
-                </executions>\r
             </plugin>\r
-\r
             <plugin>\r
                 <!-- Download Swagger UI webjar. -->\r
                 <groupId>org.apache.maven.plugins</groupId>\r
                 <artifactId>maven-dependency-plugin</artifactId>\r
-                <version>${maven-dependency-plugin.version}</version>\r
-                <executions>\r
-                    <execution>\r
-                        <phase>prepare-package</phase>\r
-                        <goals>\r
-                            <goal>unpack</goal>\r
-                        </goals>\r
-                        <configuration>\r
-                            <artifactItems>\r
-                                <artifactItem>\r
-                                    <groupId>org.webjars</groupId>\r
-                                    <artifactId>swagger-ui</artifactId>\r
-                                    <version>${swagger-ui.version}</version>\r
-                                </artifactItem>\r
-                            </artifactItems>\r
-                            <outputDirectory>\r
-                                ${project.build.directory}/swagger-ui-${swagger-ui.version}\r
-                            </outputDirectory>\r
-                        </configuration>\r
-                    </execution>\r
-                </executions>\r
             </plugin>\r
             <plugin>\r
                 <!-- Copy Swagger UI resources to static resources directory. -->\r
                 <groupId>org.apache.maven.plugins</groupId>\r
                 <artifactId>maven-resources-plugin</artifactId>\r
-                <version>${maven-resources-plugin.version}</version>\r
-                <executions>\r
-                    <execution>\r
-                        <id>copy-resources</id>\r
-                        <phase>prepare-package</phase>\r
-                        <goals>\r
-                            <goal>copy-resources</goal>\r
-                        </goals>\r
-                        <configuration>\r
-                            <outputDirectory>${project.build.outputDirectory}/static/swagger-ui\r
-                            </outputDirectory>\r
-                            <resources>\r
-                                <resource>\r
-                                    <directory>\r
-                                        ${project.build.directory}/swagger-ui-${swagger-ui.version}/META-INF/resources/webjars/swagger-ui/${swagger-ui.version}/\r
-                                    </directory>\r
-                                    <excludes>\r
-                                        <exclude>**/*.gz</exclude>\r
-                                    </excludes>\r
-                                </resource>\r
-                            </resources>\r
-                        </configuration>\r
-                    </execution>\r
-                </executions>\r
             </plugin>\r
             <plugin>\r
                 <!-- Replace the OpenAPI specification example URL with the local one. -->\r
                 <groupId>com.google.code.maven-replacer-plugin</groupId>\r
                 <artifactId>replacer</artifactId>\r
-                <version>${maven-replacer-plugin.version}</version>\r
-                <executions>\r
-                    <execution>\r
-                        <phase>prepare-package</phase>\r
-                        <goals>\r
-                            <goal>replace</goal>\r
-                        </goals>\r
-                    </execution>\r
-                </executions>\r
-                <configuration>\r
-                    <file>${project.build.outputDirectory}/static/swagger-ui/index.html</file>\r
-                    <replacements>\r
-                        <replacement>\r
-                            <token>https://petstore.swagger.io/v2/swagger.json</token>\r
-                            <value>/api/cps/openapi.json</value>\r
-                        </replacement>\r
-                    </replacements>\r
-                </configuration>\r
             </plugin>\r
         </plugins>\r
     </build>\r

diff --git a/cps/cps-ri/pom.xml b/cps/cps-ri/pom.xml
index 77cb5f8..2c28212 100644 (file)
--- a/cps/cps-ri/pom.xml
+++ b/cps/cps-ri/pom.xml
@@ -4,46 +4,37 @@
     <modelVersion>4.0.0</modelVersion>\r
     <parent>\r
         <groupId>org.onap.cps</groupId>\r
-        <artifactId>cps</artifactId>\r
+        <artifactId>cps-parent</artifactId>\r
         <version>0.0.1-SNAPSHOT</version>\r
+        <relativePath>../cps-parent/pom.xml</relativePath>\r
     </parent>\r
     <artifactId>cps-ri</artifactId>\r
 \r
     <dependencies>\r
-\r
         <dependency>\r
-            <groupId>org.onap.cps</groupId>\r
+            <groupId>${project.groupId}</groupId>\r
             <artifactId>cps-service</artifactId>\r
-            <version>${project.version}</version>\r
         </dependency>\r
-\r
         <dependency>\r
             <groupId>org.springframework.boot</groupId>\r
             <artifactId>spring-boot-starter-data-jpa</artifactId>\r
         </dependency>\r
-\r
         <dependency>\r
             <groupId>org.springframework.boot</groupId>\r
             <artifactId>spring-boot-starter-validation</artifactId>\r
         </dependency>\r
-\r
         <dependency>\r
             <groupId>org.postgresql</groupId>\r
             <artifactId>postgresql</artifactId>\r
         </dependency>\r
-\r
-        <dependency>\r
         <!-- Add Hibernate support for Postgres datatype JSONB -->\r
+        <dependency>\r
             <groupId>com.vladmihalcea</groupId>\r
             <artifactId>hibernate-types-52</artifactId>\r
-            <version>${hibernate-types.version}</version>\r
         </dependency>\r
-\r
         <dependency>\r
             <groupId>org.projectlombok</groupId>\r
             <artifactId>lombok</artifactId>\r
         </dependency>\r
-\r
     </dependencies>\r
-\r
 </project>\r

diff --git a/cps/cps-service/pom.xml b/cps/cps-service/pom.xml
index ea1bdad..3e8cc2d 100644 (file)
--- a/cps/cps-service/pom.xml
+++ b/cps/cps-service/pom.xml
@@ -4,75 +4,65 @@
   <modelVersion>4.0.0</modelVersion>\r
   <parent>\r
     <groupId>org.onap.cps</groupId>\r
-    <artifactId>cps</artifactId>\r
+    <artifactId>cps-parent</artifactId>\r
     <version>0.0.1-SNAPSHOT</version>\r
+    <relativePath>../cps-parent/pom.xml</relativePath>\r
   </parent>\r
+\r
   <artifactId>cps-service</artifactId>\r
 \r
   <dependencies>\r
-\r
     <dependency>\r
       <groupId>org.opendaylight.yangtools</groupId>\r
       <artifactId>yang-parser-api</artifactId>\r
-      <version>${yangtools.version}</version>\r
     </dependency>\r
-\r
     <dependency>\r
       <groupId>org.opendaylight.yangtools</groupId>\r
       <artifactId>yang-parser-impl</artifactId>\r
-      <version>${yangtools.version}</version>\r
     </dependency>\r
-\r
     <dependency>\r
       <groupId>org.opendaylight.yangtools</groupId>\r
       <artifactId>yang-model-util</artifactId>\r
-      <version>${yangtools.version}</version>\r
     </dependency>\r
-\r
+    <!-- required for processing yang data in json format -->\r
     <dependency>\r
-      <!-- required for processing yang data in json format -->\r
       <groupId>org.opendaylight.yangtools</groupId>\r
       <artifactId>yang-data-codec-gson</artifactId>\r
-      <version>${yangtools.version}</version>\r
     </dependency>\r
-\r
     <dependency>\r
       <groupId>org.projectlombok</groupId>\r
       <artifactId>lombok</artifactId>\r
     </dependency>\r
-\r
     <dependency>\r
       <!-- For logging -->\r
       <groupId>org.slf4j</groupId>\r
       <artifactId>slf4j-api</artifactId>\r
     </dependency>\r
-\r
     <dependency>\r
       <!-- For dependency injection -->\r
       <groupId>org.springframework</groupId>\r
       <artifactId>spring-context</artifactId>\r
     </dependency>\r
-\r
     <dependency>\r
       <!-- For parsing JSON object -->\r
       <groupId>com.google.code.gson</groupId>\r
       <artifactId>gson</artifactId>\r
     </dependency>\r
-\r
     <!-- T E S T   D E P E N D E N C I E S -->\r
     <dependency>\r
       <groupId>org.codehaus.groovy</groupId>\r
       <artifactId>groovy</artifactId>\r
+      <scope>test</scope>\r
     </dependency>\r
     <dependency>\r
       <groupId>org.spockframework</groupId>\r
       <artifactId>spock-core</artifactId>\r
+      <scope>test</scope>\r
     </dependency>\r
     <dependency>\r
       <groupId>cglib</groupId>\r
       <artifactId>cglib-nodep</artifactId>\r
+      <scope>test</scope>\r
     </dependency>\r
-\r
   </dependencies>\r
-\r
 </project>\r

diff --git a/cps/pom.xml b/cps/pom.xml
index 892492d..c2d6c79 100644 (file)
--- a/cps/pom.xml
+++ b/cps/pom.xml
@@ -1,177 +1,37 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"\r
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">\r
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">\r
     <modelVersion>4.0.0</modelVersion>\r
     <parent>\r
         <groupId>org.onap.oparent</groupId>\r
         <artifactId>oparent</artifactId>\r
         <version>3.1.0</version>\r
     </parent>\r
+\r
     <groupId>org.onap.cps</groupId>\r
-    <artifactId>cps</artifactId>\r
+    <artifactId>cps-aggregator</artifactId>\r
     <version>0.0.1-SNAPSHOT</version>\r
     <packaging>pom</packaging>\r
+\r
     <name>cps</name>\r
     <description>ONAP Configuration and Persistency Service</description>\r
+\r
     <organization>\r
         <name>ONAP - CPS</name>\r
         <url>http://www.onap.org/</url>\r
     </organization>\r
 \r
-  <properties>\r
-    <java.version>11</java.version>\r
-    <springboot.version>2.3.3.RELEASE</springboot.version>\r
-    <oparent.version>3.1.0</oparent.version>\r
-    <yangtools.version>5.0.6</yangtools.version>\r
-    <swagger.version>2.1.4</swagger.version>\r
-    <groovy.version>3.0.6</groovy.version>\r
-    <spock-core.version>2.0-M2-groovy-3.0</spock-core.version>\r
-    <swagger-codegen.version>3.0.18</swagger-codegen.version>\r
-    <cxf-rt-rs-service.version>3.0.0</cxf-rt-rs-service.version>\r
-    <cxf-bundle-jaxrs.version>2.2.9</cxf-bundle-jaxrs.version>\r
-    <maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>\r
-    <maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>\r
-    <maven-replacer-plugin.version>1.5.3</maven-replacer-plugin.version>\r
-    <swagger-ui.version>3.35.0</swagger-ui.version>\r
-    <hibernate-types.version>2.10.0</hibernate-types.version>\r
-  </properties>\r
-\r
-    <dependencyManagement>\r
-        <dependencies>\r
-            <dependency>\r
-                <groupId>org.springframework.boot</groupId>\r
-                <artifactId>spring-boot-dependencies</artifactId>\r
-                <version>${springboot.version}</version>\r
-                <type>pom</type>\r
-                <scope>import</scope>\r
-            </dependency>\r
-\r
-            <!-- T E S T   D E P E N D E N C I E S -->\r
-            <dependency>\r
-                <groupId>org.codehaus.groovy</groupId>\r
-                <artifactId>groovy</artifactId>\r
-                <version>${groovy.version}</version>\r
-                <scope>test</scope>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>org.spockframework</groupId>\r
-                <artifactId>spock-core</artifactId>\r
-                <version>${spock-core.version}</version>\r
-                <scope>test</scope>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>cglib</groupId>\r
-                <artifactId>cglib-nodep</artifactId>\r
-                <version>3.1</version>\r
-                <scope>test</scope>\r
-            </dependency>\r
-\r
-        </dependencies>\r
-    </dependencyManagement>\r
-\r
-    <build>\r
-        <resources>\r
-            <resource>\r
-                <directory>src/main/resources</directory>\r
-                <filtering>true</filtering>\r
-            </resource>\r
-\r
-            <resource>\r
-                <directory>target/generated-sources/license</directory>\r
-                <includes>\r
-                    <include>third-party-licenses.txt</include>\r
-                </includes>\r
-            </resource>\r
-\r
-            <resource>\r
-                <directory>target/generated-resources/licenses</directory>\r
-                <includes>\r
-                    <include>*.*</include>\r
-                </includes>\r
-                <targetPath>third-party-licenses</targetPath>\r
-            </resource>\r
-        </resources>\r
-\r
-        <plugins>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
-                <configuration>\r
-                    <source>${java.version}</source>\r
-                    <target>${java.version}</target>\r
-                </configuration>\r
-            </plugin>\r
-\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-checkstyle-plugin</artifactId>\r
-                <executions>\r
-                    <execution>\r
-                        <id>onap-java-style</id>\r
-                        <goals>\r
-                            <goal>check</goal>\r
-                        </goals>\r
-                        <phase>process-sources</phase>\r
-                        <configuration>\r
-                            <configLocation>onap-checkstyle/onap-java-style.xml</configLocation>\r
-                            <sourceDirectories>${project.build.sourceDirectory}</sourceDirectories>\r
-                            <includeResources>true</includeResources>\r
-                            <includeTestSourceDirectory>true</includeTestSourceDirectory>\r
-                            <includeTestResources>true</includeTestResources>\r
-                            <consoleOutput>false</consoleOutput>\r
-                            <violationSeverity>warning</violationSeverity>\r
-                            <failOnViolation>true</failOnViolation>\r
-                        </configuration>\r
-                    </execution>\r
-                </executions>\r
-\r
-                <dependencies>\r
-                    <dependency>\r
-                        <groupId>org.onap.oparent</groupId>\r
-                        <artifactId>checkstyle</artifactId>\r
-                        <version>${oparent.version}</version>\r
-                    </dependency>\r
-                </dependencies>\r
-\r
-            </plugin>\r
-\r
-            <!-- Mandatory plugins for using Spock -->\r
-            <plugin>\r
-                <!-- The gmavenplus plugin is used to compile Groovy code.\r
-                    To learn more about this plugin, visit https://github.com/groovy/GMavenPlus/wiki -->\r
-                <groupId>org.codehaus.gmavenplus</groupId>\r
-                <artifactId>gmavenplus-plugin</artifactId>\r
-                <version>1.9.0</version>\r
-                <executions>\r
-                    <execution>\r
-                        <goals>\r
-                            <goal>compileTests</goal>\r
-                        </goals>\r
-                    </execution>\r
-                </executions>\r
-            </plugin>\r
-            <!-- Required because names of spec classes don't match default\r
-                Surefire patterns (`*Test` etc.) -->\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-surefire-plugin</artifactId>\r
-                <version>3.0.0-M5</version>\r
-                <configuration>\r
-                    <useFile>false</useFile>\r
-                    <includes>\r
-                        <include>**/*Spec.java</include>\r
-                        <include>**/*Test.java</include> <!-- Just in case of having also "normal" JUnit tests -->\r
-                    </includes>\r
-                </configuration>\r
-            </plugin>\r
-\r
-        </plugins>\r
-    </build>\r
+    <properties>\r
+        <maven.deploy.skip>true</maven.deploy.skip>\r
+        <maven.install.skip>true</maven.install.skip>\r
+    </properties>\r
 \r
     <modules>\r
+        <module>cps-dependencies</module>\r
+        <module>cps-bom</module>\r
+        <module>cps-parent</module>\r
         <module>cps-service</module>\r
         <module>cps-rest</module>\r
         <module>cps-ri</module>\r
     </modules>\r
-\r
 </project>\r