Merge "Add plugin in logstash image"

[clamp.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 6c23309..e522573 100644 (file)
--- 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>
@@ -85,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>
 
@@ -393,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>
@@ -448,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>
@@ -465,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>
@@ -484,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>
@@ -503,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>
@@ -545,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>
@@ -562,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>
@@ -711,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>
@@ -947,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>