X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=e522573db5cf7d2e356eacafa5b09f1a56cacf15;hb=a9cdc79ba7e928b38ed132d38426b6c8b70635bf;hp=6c37666d633b39f1779376446e1815d29633ca25;hpb=00fd66d0e738d6396527ae8c0eb1d8a8fe5c88a4;p=clamp.git

diff --git a/pom.xml b/pom.xml
index 6c37666d..e522573d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,9 +20,7 @@
   ============LICENSE_END============================================
   ===================================================================
 -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 		<modelVersion>4.0.0</modelVersion>
 		<groupId>org.onap.clamp</groupId>
 		<artifactId>clds</artifactId>
@@ -32,7 +30,7 @@
 		<parent>
 				<groupId>org.onap.oparent</groupId>
 				<artifactId>oparent</artifactId>
-				<version>1.1.0</version>
+				<version>1.2.0</version>
 		</parent>
 
 		<description>
@@ -68,9 +66,8 @@
 				<java.version>1.8</java.version>
 
 				<eelf.core.version>1.0.0</eelf.core.version>
-				<logging.analytics.version>1.2.2-SNAPSHOT</logging.analytics.version>
 				<camel.version>2.22.0</camel.version>
-				<springboot.version>2.0.2.RELEASE</springboot.version>
+				<springboot.version>2.0.3.RELEASE</springboot.version>
 
 				<sonar.language>java</sonar.language>
 				<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -86,7 +83,7 @@
 				<docker.skip.push>true</docker.skip.push>
 				<docker.skip.tag>true</docker.skip.tag>
 				<skip.staging.artifacts>false</skip.staging.artifacts>
-				<python.http.proxy.param></python.http.proxy.param>
+				<python.http.proxy.param/>
 				<tomcat.version>8.5.32</tomcat.version>
 		</properties>
 
@@ -225,11 +222,6 @@
 						<artifactId>eelf-core</artifactId>
 						<version>${eelf.core.version}</version>
 				</dependency>
-				<dependency>
-						<groupId>org.onap.logging-analytics</groupId>
-						<artifactId>logging-library</artifactId>
-						<version>${logging.analytics.version}</version>
-				</dependency>
 				<dependency>
 						<groupId>org.codehaus.janino</groupId>
 						<artifactId>janino</artifactId>
@@ -313,10 +305,6 @@
 						<groupId>org.springframework.boot</groupId>
 						<artifactId>spring-boot-starter-security</artifactId>
 				</dependency>
-				<dependency>
-						<groupId>org.springframework.boot</groupId>
-						<artifactId>spring-boot-starter-actuator</artifactId>
-				</dependency>
 				<dependency>
 						<groupId>org.springframework.boot</groupId>
 					<artifactId>spring-boot-autoconfigure</artifactId>
@@ -403,7 +391,7 @@
 				<dependency>
 						<groupId>org.onap.policy.engine</groupId>
 						<artifactId>PolicyEngineAPI</artifactId>
-						<version>1.2.0</version>
+						<version>1.2.3</version>
 						<exclusions>
 								<exclusion>
 										<groupId>com.google.guava</groupId>
@@ -458,7 +446,7 @@
 				<dependency>
 						<groupId>org.onap.policy.common</groupId>
 						<artifactId>ONAP-Logging</artifactId>
-						<version>1.1.3</version>
+						<version>1.2.3</version>
 						<exclusions>
 								<exclusion>
 										<artifactId>log4j</artifactId>
@@ -475,9 +463,9 @@
 						</exclusions>
 				</dependency>
 				<dependency>
-						<groupId>org.onap.policy.drools-applications</groupId>
+						<groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
 						<artifactId>policy-yaml</artifactId>
-						<version>1.1.3</version>
+						<version>1.2.3</version>
 						<exclusions>
 								<exclusion>
 										<artifactId>log4j</artifactId>
@@ -494,9 +482,9 @@
 						</exclusions>
 				</dependency>
 				<dependency>
-						<groupId>org.onap.policy.drools-applications</groupId>
+						<groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
 						<artifactId>sdc</artifactId>
-						<version>1.1.3</version>
+						<version>1.2.3</version>
 						<exclusions>
 								<exclusion>
 										<artifactId>log4j</artifactId>
@@ -513,9 +501,9 @@
 						</exclusions>
 				</dependency>
 				<dependency>
-						<groupId>org.onap.policy.drools-applications</groupId>
+						<groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
 						<artifactId>aai</artifactId>
-						<version>1.1.3</version>
+						<version>1.2.3</version>
 						<exclusions>
 								<exclusion>
 										<artifactId>log4j</artifactId>
@@ -555,7 +543,7 @@
 				<dependency>
 						<groupId>com.google.guava</groupId>
 						<artifactId>guava</artifactId>
-						<version>25.1-jre</version>
+
 				</dependency>
 				<!-- Remove the MYSQL connector and replace it by Mariadb -->
 				<dependency>
@@ -572,7 +560,7 @@
 				<dependency>
 						<groupId>org.onap.sdc.sdc-tosca</groupId>
 						<artifactId>sdc-tosca</artifactId>
-						<version>1.3.0</version>
+						<version>1.4.1</version>
 				</dependency>
 				<!-- TESTING -->
 				<dependency>
@@ -633,9 +621,22 @@
 						</testResource>
 				</testResources>
 				<resources>
+						<!--  For AAF folder maven should not try to filter Keystores/Truststores ... 
+							  Otherwise they will be broken and unreadable
+						-->
 						<resource>
 								<directory>src/main/resources</directory>
 								<filtering>true</filtering>
+								<excludes>
+									<exclude>clds/aaf/**</exclude>
+								</excludes>
+						</resource>
+						<resource>
+								<directory>src/main/resources</directory>
+								<filtering>false</filtering>
+								<includes>
+									<include>clds/aaf/**</include>
+								</includes>
 						</resource>
 						<resource>
 								<directory>src/main/docker</directory>
@@ -708,10 +709,10 @@
 												<doctype>book</doctype>
 												<toc>left</toc>
 												<toclevels>3</toclevels>
-												<numbered></numbered>
-												<hardbreaks></hardbreaks>
-												<sectlinks></sectlinks>
-												<sectanchors></sectanchors>
+												<numbered/>
+												<hardbreaks/>
+												<sectlinks/>
+												<sectanchors/>
 												<generated>${project.build.directory}/asciidoc/generated</generated>
 										</attributes>
 								</configuration>
@@ -944,6 +945,22 @@
 																</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>Dockerfile.logstash</dockerFile>
+														</build>
+												</image>
 										</images>
 								</configuration>