X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=79cf2a98240af5b11fee8ea22e3ee164b53ff333;hb=5976c17b09b82db4d5dbce7cb7fe3b1b27891104;hp=b2952621a680c4136d1ba1451097bc2d143bfdc1;hpb=43f0b01f68e145b74993e31adf7ef41379c72be1;p=clamp.git

diff --git a/pom.xml b/pom.xml
index b2952621..79cf2a98 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.0</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>
@@ -162,9 +160,15 @@
 
 		<repositories>
 				<repository>
-						<id>central</id>
-						<name>Maven 2 repository 2</name>
-						<url>http://repo2.maven.org/maven2/</url>
+					<id>onap-public</id>
+					<name>onap-public</name>
+					<url>https://nexus.onap.org/content/repositories/public/</url>
+					<releases>
+						<enabled>true</enabled>
+					</releases>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
 				</repository>
 				<repository>
 						<id>ecomp-releases</id>
@@ -188,16 +192,27 @@
 						</releases>
 				</repository>
 				<repository>
-						<id>spring-repo</id>
-						<name>Spring repo</name>
-						<url>https://artifacts.alfresco.com/nexus/content/repositories/public/</url>
-				</repository>
-				<repository>
-						<id>repository.jboss.org-public</id>
-						<name>JBoss.org Maven repository</name>
-						<url>https://repository.jboss.org/nexus/content/groups/public</url>
+					<id>central</id>
+					<url>http://repo1.maven.org/maven2/</url>
 				</repository>
 		</repositories>
+		<pluginRepositories>
+			<pluginRepository>
+				<id>onap-public</id>
+				<name>onap-public</name>
+				<url>https://nexus.onap.org/content/repositories/public/</url>
+				<releases>
+					<enabled>true</enabled>
+				</releases>
+				<snapshots>
+					<enabled>false</enabled>
+				</snapshots>
+			</pluginRepository>
+			<pluginRepository>
+				<id>central</id>
+				<url>http://repo1.maven.org/maven2/</url>
+			</pluginRepository>
+		</pluginRepositories>
 
 		<dependencyManagement>
 				<dependencies>
@@ -267,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>
@@ -357,7 +376,7 @@
 				<dependency>
 					<groupId>org.onap.aaf.authz</groupId>
 					<artifactId>aaf-cadi-aaf</artifactId>
-					<version>2.1.1</version>
+					<version>2.1.10</version>
 					<exclusions>
 						<exclusion>
 							<groupId>javax.servlet</groupId>
@@ -388,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>
@@ -583,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>
@@ -599,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>
@@ -615,21 +636,7 @@
 					<scope>test</scope>
 				</dependency>
 		</dependencies>
-		<pluginRepositories>
-				<pluginRepository>
-						<id>central-for-plugins</id>
-						<name>Maven 2 repository 2</name>
-						<url>http://repo2.maven.org/maven2/</url>
-				</pluginRepository>
-				<pluginRepository>
-						<snapshots>
-								<enabled>false</enabled>
-						</snapshots>
-						<id>jcenter-releases-for-plugins</id>
-						<name>jcenter</name>
-						<url>http://jcenter.bintray.com</url>
-				</pluginRepository>
-		</pluginRepositories>
+
 		<build>
 				<finalName>clamp</finalName>
 
@@ -706,6 +713,13 @@
 							<groupId>de.jpdigital</groupId>
 							<artifactId>hibernate52-ddl-maven-plugin</artifactId>
 							<version>2.2.0</version>
+							<dependencies>
+								<dependency>
+									<groupId>javax.xml.bind</groupId>
+									<artifactId>jaxb-api</artifactId>
+									<version>2.3.0</version>
+								</dependency>
+							</dependencies>
 							<executions>
 								<execution>
 									<phase>process-classes</phase>
@@ -722,7 +736,7 @@
 									</configuration>
 								</execution>
 							</executions>
-					
+
 						</plugin>
 						<!-- Read the swagger.json file and the definition from SwaggerConfig.java;
 							generate a list of .adoc files containing the APIs info in more structured
@@ -765,18 +779,13 @@
 						<plugin>
 								<groupId>org.asciidoctor</groupId>
 								<artifactId>asciidoctor-maven-plugin</artifactId>
-								<version>1.5.6</version>
+								<version>1.5.7.1</version>
 								<dependencies>
 										<dependency>
 												<groupId>org.asciidoctor</groupId>
 												<artifactId>asciidoctorj-pdf</artifactId>
 												<version>1.5.0-alpha.10.1</version>
 										</dependency>
-										<dependency>
-												<groupId>org.jruby</groupId>
-												<artifactId>jruby-complete</artifactId>
-												<version>1.7.21</version>
-										</dependency>
 								</dependencies>
 								<configuration>
 										<sourceDirectory>${project.basedir}/src/main/resources/asciidoc</sourceDirectory>
@@ -909,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>
@@ -1029,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>
@@ -1043,10 +1061,10 @@
 																</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>
@@ -1063,7 +1081,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>
@@ -1079,7 +1097,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>