Release clamp

[clamp.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index bb22596..48b1cf7 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
        <modelVersion>4.0.0</modelVersion>
        <groupId>org.onap.clamp</groupId>
        <artifactId>clds</artifactId>
-       <version>4.2.0-SNAPSHOT</version>
+       <version>5.0.3</version>
        <name>clamp</name>
 
 
@@ -45,9 +45,6 @@
            - The DOCKER images for:
                 * CLAMP backend (Java Spring)
                 * CLAMP frontend (Javscript React)
-                * The dashboard - Elastic search
-                * The dashboard - Logstash
-                * The dashboard - Kibana
 
            It can test:
             - The CLAMP backend, JAVA unit testing
@@ -79,8 +76,8 @@
                <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
                <eelf.core.version>1.0.0</eelf.core.version>
-               <camel.version>2.24.0</camel.version>
-               <springboot.version>2.2.0.RELEASE</springboot.version>
+               <camel.version>2.25.0</camel.version>
+               <springboot.version>2.2.5.RELEASE</springboot.version>
 
                <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
                <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
@@ -94,7 +91,7 @@
                <sonar.exclusions>src/main/resources/**</sonar.exclusions>
                <sonar.scm.exclusions.disabled>true</sonar.scm.exclusions.disabled>
                <sonar.javascript.lcov.reportPaths>${project.build.directory}/${ui.react.src}/coverage/lcov.info</sonar.javascript.lcov.reportPaths>
-               <sonar.coverage.exclusions>src/main/resources/**,target/ui-react/src/**/*.test.js,target/ui-react/src/setupTests.js,src/main/docker/kibana/*.py</sonar.coverage.exclusions>
+               <sonar.coverage.exclusions>src/main/resources/**,target/ui-react/src/**/*.test.js,target/ui-react/src/setupTests.js</sonar.coverage.exclusions>
                <docker.push.registry>localhost:5000</docker.push.registry>
                <docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>
                <docker.skip.build>true</docker.skip.build>
@@ -102,10 +99,10 @@
                <docker.skip.tag>true</docker.skip.tag>
                <skip.staging.artifacts>false</skip.staging.artifacts>
                <python.http.proxy.param />
-               <tomcat.version>9.0.27</tomcat.version>
+               <tomcat.version>9.0.33</tomcat.version>
                <ui.react.src>ui-react</ui.react.src>
                <ui.react.lib.src>ui-react-lib</ui.react.lib.src>
-               <npm.publish.url>https://nexus3.onap.org/repository/npm.release/</npm.publish.url>
+               <npm.publish.url>https://nexus3.onap.org/repository/npm.snapshot/</npm.publish.url>
        </properties>
 
        <profiles>
@@ -369,6 +366,11 @@
                                </exclusion>
                        </exclusions>
                </dependency>
+               <dependency>
+                       <groupId>javax.xml.ws</groupId>
+                       <artifactId>jaxws-api</artifactId>
+                       <version>2.3.1</version>
+               </dependency>
                <dependency>
                        <groupId>javax.xml.bind</groupId>
                        <artifactId>jaxb-api</artifactId>
@@ -431,6 +433,10 @@
                                        <groupId>javax.servlet</groupId>
                                        <artifactId>servlet-api</artifactId>
                                </exclusion>
+                               <exclusion>
+                                       <groupId>log4j</groupId>
+                                       <artifactId>log4j</artifactId>
+                               </exclusion>
                        </exclusions>
                </dependency>
                <dependency>
@@ -533,6 +539,11 @@
                        <artifactId>sdc-tosca</artifactId>
                        <version>1.5.1</version>
                </dependency>
+               <dependency>
+                       <groupId>org.yaml</groupId>
+                       <artifactId>snakeyaml</artifactId>
+                       <version>1.26</version>
+               </dependency>
                <!-- TESTING -->
                <dependency>
                        <groupId>org.assertj</groupId>
@@ -564,6 +575,20 @@
                <finalName>clamp</finalName>
 
                <testResources>
+                       <testResource>
+                               <directory>src/main/resources</directory>
+                               <filtering>true</filtering>
+                               <excludes>
+                                       <exclude>clds/aaf/**</exclude>
+                               </excludes>
+                       </testResource>
+                       <testResource>
+                               <directory>src/main/resources</directory>
+                               <filtering>false</filtering>
+                               <includes>
+                                       <include>clds/aaf/**</include>
+                               </includes>
+                       </testResource>
                        <testResource>
                                <directory>src/test/resources</directory>
                                <excludes>
@@ -775,6 +800,7 @@
                                <version>1.0</version>
                                <executions>
                                        <execution>
+                                               <id>docker-tags</id>
                                                <phase>validate</phase>
                                                <goals>
                                                        <goal>execute</goal>
@@ -783,14 +809,8 @@
                                                        <source>${project.basedir}/src/main/script/TagVersion.groovy</source>
                                                </configuration>
                                        </execution>
-                               </executions>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.codehaus.groovy.maven</groupId>
-                               <artifactId>gmaven-plugin</artifactId>
-                               <version>1.0</version>
-                               <executions>
                                        <execution>
+                                               <id>npm-repos-selection</id>
                                                <phase>validate</phase>
                                                <goals>
                                                        <goal>execute</goal>
@@ -863,9 +883,7 @@
                        <plugin>
                                <groupId>org.springframework.boot</groupId>
                                <artifactId>spring-boot-maven-plugin</artifactId>
-                               <!-- Temporary fix -->
-                               <version>1.5.13.RELEASE</version>
-                               <!-- <version>${springboot.version}</version> -->
+                               <version>${springboot.version}</version>
                                <executions>
                                        <execution>
                                                <goals>
@@ -1034,38 +1052,6 @@
                                                                </assembly>
                                                        </build>
                                                </image>
-                                               <image>
-                                                       <name>onap/clamp-dashboard-logstash</name>
-                                                       <alias>onap-clamp-dashboard-logstash</alias>
-                                                       <run>
-                                                               <skip>true</skip>
-                                                       </run>
-                                                       <build>
-                                                               <cleanup>true</cleanup>
-                                                               <tags>
-                                                                       <tag>latest</tag>
-                                                                       <tag>${project.docker.latesttagtimestamp.version}</tag>
-                                                                       <tag>${project.docker.latesttag.version}</tag>
-                                                               </tags>
-                                                               <dockerFile>logstash/Dockerfile</dockerFile>
-                                                       </build>
-                                               </image>
-                                               <image>
-                                                       <name>onap/clamp-dashboard-kibana</name>
-                                                       <alias>onap-clamp-dashboard-kibana</alias>
-                                                       <run>
-                                                               <skip>true</skip>
-                                                       </run>
-                                                       <build>
-                                                               <cleanup>true</cleanup>
-                                                               <tags>
-                                                                       <tag>latest</tag>
-                                                                       <tag>${project.docker.latesttagtimestamp.version}</tag>
-                                                                       <tag>${project.docker.latesttag.version}</tag>
-                                                               </tags>
-                                                               <dockerFile>kibana/Dockerfile</dockerFile>
-                                                       </build>
-                                               </image>
                                        </images>
                                </configuration>
 
@@ -1212,6 +1198,7 @@
                                                </goals>
                                                <phase>test</phase>
                                                <configuration>
+                                                       <skip>${maven.test.skip}</skip>
                                                        <arguments>run-script test:coverage</arguments>
                                                        <workingDirectory>${project.build.directory}/${ui.react.src}</workingDirectory>
                                                </configuration>
@@ -1245,6 +1232,7 @@
                                                </goals>
                                                <phase>deploy</phase>
                                                <configuration>
+                                                       <skip>true</skip>
                                                        <workingDirectory>${project.build.directory}/${ui.react.lib.src}</workingDirectory>
                                                        <arguments>publish</arguments>
                                                </configuration>