X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=841917b3d0bb2b1bff5e265cc7a8088bfb2a57b9;hb=refs%2Fchanges%2F82%2F91682%2F1;hp=71c9f29826ba83550081e81c7c48478872f4bba0;hpb=989f40665366b23937d06ebddc5d7c42b2e75f9f;p=clamp.git

diff --git a/pom.xml b/pom.xml
index 71c9f298..841917b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,13 +24,14 @@
 		<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>
@@ -60,12 +61,9 @@
 				<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.22.1</camel.version>
-				<springboot.version>2.0.6.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>
@@ -88,7 +86,7 @@
 				<docker.skip.tag>true</docker.skip.tag>
 				<skip.staging.artifacts>false</skip.staging.artifacts>
 				<python.http.proxy.param/>
-				<tomcat.version>8.5.34</tomcat.version>
+				<tomcat.version>9.0.20</tomcat.version>
 		</properties>
 
 		<profiles>
@@ -284,6 +282,10 @@
 						<version>${tomcat.version}</version>
 				</dependency>
 				<!-- For CAMEL -->
+				<dependency>
+					<groupId>org.apache.camel</groupId>
+					<artifactId>camel-http4-starter</artifactId>
+				</dependency>
 				<dependency>
 						<groupId>org.apache.camel</groupId>
 						<artifactId>camel-spring-boot-starter</artifactId>
@@ -405,6 +407,7 @@
 				<dependency>
 						<groupId>com.googlecode.json-simple</groupId>
 						<artifactId>json-simple</artifactId>
+						<version>1.1.1</version>
 				</dependency>
 				<dependency>
 						<groupId>org.apache.commons</groupId>
@@ -600,6 +603,7 @@
 				<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>
@@ -616,7 +620,7 @@
 				<dependency>
 						<groupId>org.onap.sdc.sdc-tosca</groupId>
 						<artifactId>sdc-tosca</artifactId>
-						<version>1.5.0</version>
+						<version>1.5.1</version>
 				</dependency>
 				<!-- TESTING -->
 				<dependency>
@@ -914,19 +918,6 @@
 										</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>
@@ -1034,8 +1025,30 @@
 														</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>
@@ -1048,13 +1061,29 @@
 																</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>
@@ -1068,7 +1097,7 @@
 																		<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>
@@ -1084,7 +1113,7 @@
 																		<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>