X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cps-parent%2Fpom.xml;h=938e75eb4f490c59675075edb31f5f8f04db733e;hb=be21595d53636e2c9b912bfbe8dfdefb81edc70f;hp=3552c28c9682bcee567e9fac601b55329c36d77b;hpb=bd35b4d03a474ce425040cc4656c7b94a87ef399;p=cps.git

diff --git a/cps-parent/pom.xml b/cps-parent/pom.xml
index 3552c28c9..938e75eb4 100755
--- a/cps-parent/pom.xml
+++ b/cps-parent/pom.xml
@@ -39,19 +39,6 @@
         <app>org.onap.cps.Application</app>
         <java.version>11</java.version>
         <minimum-coverage>0.9</minimum-coverage>
-        <nexusproxy>https://nexus.onap.org</nexusproxy>
-        <docker.repository.push>nexus3.onap.org:10003/</docker.repository.push>
-        <docker.repository.pull>nexus3.onap.org:10001/</docker.repository.pull>
-        <oparent.version>3.1.0</oparent.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
-        <spotbugs-maven-plugin.version>4.1.3</spotbugs-maven-plugin.version>
-        <spring-boot-maven-plugin.version>2.3.3.RELEASE</spring-boot-maven-plugin.version>
-        <spotbugs.slf4j.version>1.8.0-beta4</spotbugs.slf4j.version>
-        <spotbugs.bug-pattern.version>1.5.0</spotbugs.bug-pattern.version>
-        <spotbugs.version>4.2.0</spotbugs.version>
-        <swagger-codegen-maven-plugin.version>3.0.18</swagger-codegen-maven-plugin.version>
-        <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
 
         <jacoco.reportDirectory.aggregate>${project.reporting.outputDirectory}/jacoco-aggregate</jacoco.reportDirectory.aggregate>
         <sonar.coverage.jacoco.xmlReportPaths>
@@ -61,26 +48,17 @@
             ../cps-service/target/site/jacoco-aggregate/jacoco.xml,
             ../cps-rest/target/site/jacoco-ut/jacoco.xml,
             ../cps-rest/target/site/jacoco-aggregate/jacoco.xml,
+            ../cps-ncmp-service/target/site/jacoco-ut/jacoco.xml,
+            ../cps-ncmp-service/target/site/jacoco-aggregate/jacoco.xml,
             ../cps-ncmp-rest/target/site/jacoco-ut/jacoco.xml,
             ../cps-ncmp-rest/target/site/jacoco-aggregate/jacoco.xml,
+            ../cps-path-parser/target/site/jacoco-ut/jacoco.xml,
+            ../cps-path-parser/target/site/jacoco-aggregate/jacoco.xml,
             ../cps-application/target/site/jacoco-ut/jacoco.xml,
             ../cps-application/target/site/jacoco-aggregate/jacoco.xml
         </sonar.coverage.jacoco.xmlReportPaths>
     </properties>
 
-    <distributionManagement>
-        <repository>
-            <id>ecomp-releases</id>
-            <name>ECOMP Release Repository</name>
-            <url>${nexusproxy}${releaseNexusPath}</url>
-        </repository>
-        <snapshotRepository>
-            <id>ecomp-snapshots</id>
-            <name>ECOMP Snapshot Repository</name>
-            <url>${nexusproxy}${snapshotNexusPath}</url>
-        </snapshotRepository>
-    </distributionManagement>
-
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -125,7 +103,7 @@
                 <plugin>
                     <groupId>org.springframework.boot</groupId>
                     <artifactId>spring-boot-maven-plugin</artifactId>
-                    <version>${spring-boot-maven-plugin.version}</version>
+                    <version>2.3.3.RELEASE</version>
                     <executions>
                         <execution>
                             <goals>
@@ -135,21 +113,26 @@
                         </execution>
                     </executions>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>3.0.0-M5</version>
+                </plugin>
                 <!-- Swagger code generation. -->
                 <plugin>
                     <groupId>io.swagger.codegen.v3</groupId>
                     <artifactId>swagger-codegen-maven-plugin</artifactId>
-                    <version>${swagger-codegen-maven-plugin.version}</version>
+                    <version>3.0.27</version>
                 </plugin>
                 <plugin>
                     <groupId>com.github.spotbugs</groupId>
                     <artifactId>spotbugs-maven-plugin</artifactId>
-                    <version>${spotbugs-maven-plugin.version}</version>
+                    <version>4.1.3</version>
                     <dependencies>
                         <dependency>
                             <groupId>com.github.spotbugs</groupId>
                             <artifactId>spotbugs</artifactId>
-                            <version>${spotbugs.version}</version>
+                            <version>4.2.0</version>
                         </dependency>
                         <dependency>
                             <groupId>${project.groupId}</groupId>
@@ -160,7 +143,7 @@
                             <!-- The SpotBugs Maven plugin uses SLF4J 1.8 beta 2 -->
                             <groupId>org.slf4j</groupId>
                             <artifactId>slf4j-simple</artifactId>
-                            <version>${spotbugs.slf4j.version}</version>
+                            <version>1.8.0-beta4</version>
                         </dependency>
                     </dependencies>
                     <configuration>
@@ -176,6 +159,7 @@
                           If you run out of memory, changes the value of the effort element
                           to 'Low'.
                         -->
+                        <addSourceDirs>true</addSourceDirs>
                         <effort>Max</effort>
                         <!-- Reports all bugs (other values are medium and max) -->
                         <threshold>Low</threshold>
@@ -201,6 +185,21 @@
                         </execution>
                     </executions>
                 </plugin>
+                <plugin>
+                    <groupId>org.jsonschema2pojo</groupId>
+                    <artifactId>jsonschema2pojo-maven-plugin</artifactId>
+                    <version>1.1.1</version>
+                    <configuration>
+                        <targetVersion>${java.version}</targetVersion>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>generate</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
@@ -278,7 +277,7 @@
                     <dependency>
                         <groupId>org.onap.oparent</groupId>
                         <artifactId>checkstyle</artifactId>
-                        <version>${oparent.version}</version>
+                        <version>3.1.0</version>
                     </dependency>
                     <dependency>
                         <groupId>${project.groupId}</groupId>
@@ -325,13 +324,20 @@
                             see https://www.testcontainers.org/features/configuration/#disabling-ryuk
                          -->
                         <TESTCONTAINERS_RYUK_DISABLED>true</TESTCONTAINERS_RYUK_DISABLED>
-                        <TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX>${docker.repository.pull}library/</TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX>
+                        <TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX>${docker.pull.registry}/</TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX>
                     </environmentVariables>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>org/onap/cps/rest/model/*</exclude>
+                        <exclude>org/onap/cps/cpspath/parser/antlr4/*</exclude>
+                        <exclude>org/onap/cps/ncmp/rest/model/*</exclude>
+                    </excludes>
+                </configuration>
                 <executions>
                     <execution>
                         <id>default-prepare-agent</id>
@@ -345,9 +351,6 @@
                             <goal>check</goal>
                         </goals>
                         <configuration>
-                            <excludes>
-                                <exclude>org/onap/cps/rest/model/*</exclude>
-                            </excludes>
                             <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
                             <rules>
                                 <rule>