============LICENSE_START=======================================================
ONAP CLAMP
================================================================================
- Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
+ Copyright (C) 2017-2019 AT&T Intellectual Property. All rights
reserved.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.clamp</groupId>
<artifactId>clds</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
<name>clamp</name>
+
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
- <version>1.2.3</version>
+ <version>2.0.0</version>
</parent>
<description>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <project.scm.id>git-server</project.scm.id>
- <java.version>1.8</java.version>
-
<eelf.core.version>1.0.0</eelf.core.version>
- <camel.version>2.23.2</camel.version>
- <springboot.version>2.1.4.RELEASE</springboot.version>
+ <camel.version>2.24.0</camel.version>
+ <springboot.version>2.1.5.RELEASE</springboot.version>
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
<docker.skip.tag>true</docker.skip.tag>
<skip.staging.artifacts>false</skip.staging.artifacts>
<python.http.proxy.param/>
- <tomcat.version>9.0.16</tomcat.version>
+ <tomcat.version>9.0.20</tomcat.version>
+ <ui.react.src>ui-react</ui.react.src>
+ <npm.publish.url>https://nexus3.onap.org/repository/npm.snapshot/</npm.publish.url>
</properties>
<profiles>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
+ <version>27.0-jre</version>
</dependency>
<!-- Remove the MYSQL connector and replace it by Mariadb -->
<dependency>
</includes>
</resource>
<resource>
- <directory>src/main/docker</directory>
- <includes>
- <include>**/*</include>
- </includes>
- <filtering>true</filtering>
+ <directory>${ui.react.src}</directory>
+ <includes>
+ <include>src/**</include>
+ <include>public/**</include>
+ <include>package.json</include>
+ <include>package-lock.json</include>
+ </includes>
+ <filtering>false</filtering>
+ <targetPath>${project.build.directory}/${ui.react.src}</targetPath>
</resource>
</resources>
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>nexus-staging-maven-plugin</artifactId>
- <version>1.6.7</version>
- <extensions>true</extensions>
- <configuration>
- <nexusUrl>https://nexus.onap.org</nexusUrl>
- <stagingProfileId>176c31dfe190a</stagingProfileId>
- <serverId>ecomp-staging</serverId>
- <skipNexusStagingDeployMojo>${skip.staging.artifacts}</skipNexusStagingDeployMojo>
- </configuration>
- </plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</run>
</image>
<image>
- <name>onap/clamp</name>
- <alias>onap-clamp</alias>
+ <name>onap/clamp-backend</name>
+ <alias>onap-clamp-backend</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>
+ <!-- A relative path is looked up in ${project.basedir}/src/main/docker
+ by default -->
+ <dockerFile>backend/Dockerfile</dockerFile>
+ <assembly>
+ <descriptor>backend/backend-files.xml</descriptor>
+ <name>onap-clamp-backend</name>
+ </assembly>
+ </build>
+ </image>
+ <image>
+ <name>onap/clamp-frontend</name>
+ <alias>onap-clamp-frontend</alias>
<run>
<skip>true</skip>
</run>
</tags>
<!-- A relative path is looked up in ${project.basedir}/src/main/docker
by default -->
- <dockerFile>Dockerfile</dockerFile>
+ <dockerFile>frontend/Dockerfile</dockerFile>
<assembly>
- <descriptor>assembly/clamp-files.xml</descriptor>
- <name>onap-clamp</name>
+ <descriptor>frontend/frontend-files.xml</descriptor>
+ <name>onap-clamp-frontend</name>
</assembly>
</build>
</image>
+ <image>
+ <name>onap/clamp-dashboard-elasticsearch</name>
+ <alias>onap-clamp-dashboard-elasticsearch</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>elasticsearch/Dockerfile</dockerFile>
+ </build>
+ </image>
<image>
<name>onap/clamp-dashboard-logstash</name>
<alias>onap-clamp-dashboard-logstash</alias>
<tag>${project.docker.latesttagtimestamp.version}</tag>
<tag>${project.docker.latesttag.version}</tag>
</tags>
- <dockerFile>logstash/Dockerfile.logstash</dockerFile>
+ <dockerFile>logstash/Dockerfile</dockerFile>
</build>
</image>
<image>
<tag>${project.docker.latesttagtimestamp.version}</tag>
<tag>${project.docker.latesttag.version}</tag>
</tags>
- <dockerFile>kibana/Dockerfile.kibana</dockerFile>
+ <dockerFile>kibana/Dockerfile</dockerFile>
</build>
</image>
</images>
<artifactId>frontend-maven-plugin</artifactId>
<version>1.6</version>
<configuration>
- <installDirectory>${project.build.directory}/clamp-ui</installDirectory>
- <workingDirectory>${project.build.directory}/clamp-ui</workingDirectory>
- <skip>${maven.test.skip}</skip>
+ <installDirectory>${project.build.directory}/${ui.react.src}</installDirectory>
+ <workingDirectory>${project.build.directory}/${ui.react.src}</workingDirectory>
</configuration>
-
<executions>
<execution>
<id>install_node_and_npm</id>
<goals>
<goal>install-node-and-npm</goal>
</goals>
- <phase>test</phase>
+ <phase>generate-sources</phase>
<configuration>
<nodeVersion>v8.11.1</nodeVersion>
<npmVersion>5.6.0</npmVersion>
<goals>
<goal>npm</goal>
</goals>
- <phase>test</phase>
+ <phase>compile</phase>
<configuration>
<arguments>install</arguments>
</configuration>
</goals>
<phase>test</phase>
<configuration>
- <arguments>run-script test:coverage</arguments>
+ <arguments>run-script test</arguments>
</configuration>
</execution>
-
+ <execution>
+ <id>npm_publish</id>
+ <goals>
+ <goal>npm</goal>
+ </goals>
+ <phase>deploy</phase>
+ <configuration>
+ <arguments>publish --registry ${npm.publish.url}</arguments>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
Code Review / clamp.git / blobdiff