<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.clamp</groupId>
<artifactId>clds</artifactId>
- <version>4.2.0-SNAPSHOT</version>
+ <version>5.1.0-SNAPSHOT</version>
<name>clamp</name>
- 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
<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.6.RELEASE</springboot.version>
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
<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>
<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>
</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>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<version>1.3</version>
</dependency>
<!-- Other dependencies to fix nexus IQ reported vulnerabilities -->
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-web</artifactId>
+ <version>5.2.3.RELEASE</version>
+ </dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<artifactId>sdc-tosca</artifactId>
<version>1.5.1</version>
</dependency>
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>1.26</version>
+ </dependency>
+ <dependency>
+ <groupId>org.dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>2.1.3</version>
+ </dependency>
+
<!-- TESTING -->
<dependency>
<groupId>org.assertj</groupId>
<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>
<version>1.0</version>
<executions>
<execution>
+ <id>docker-tags</id>
<phase>validate</phase>
<goals>
<goal>execute</goal>
<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>
<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>
</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>
</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>
</goals>
<phase>deploy</phase>
<configuration>
+ <skip>true</skip>
<workingDirectory>${project.build.directory}/${ui.react.lib.src}</workingDirectory>
<arguments>publish</arguments>
</configuration>