Merge "Fix the docker push"

[clamp.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index e1c652a..d849473 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
                <modelVersion>4.0.0</modelVersion>
                <groupId>org.onap.clamp</groupId>
                <artifactId>clds</artifactId>
-               <version>2.0.1-SNAPSHOT</version>
+               <version>3.0.0-SNAPSHOT</version>
                <name>clamp</name>
 
                <parent>
@@ -87,6 +87,7 @@
                                <docker.skip.tag>true</docker.skip.tag>
                                <skip.staging.artifacts>false</skip.staging.artifacts>
                                <python.http.proxy.param></python.http.proxy.param>
+                               <tomcat.version>8.5.28</tomcat.version>
                </properties>
 
                <distributionManagement>
@@ -180,6 +181,26 @@
                                                <artifactId>eelf-core</artifactId>
                                                <version>${eelf.core.version}</version>
                                </dependency>
+                               <dependency>
+                                               <groupId>org.apache.tomcat.embed</groupId>
+                                               <artifactId>tomcat-embed-core</artifactId>
+                                               <version>${tomcat.version}</version>
+                               </dependency>
+                               <dependency>
+                                               <groupId>org.apache.tomcat.embed</groupId>
+                                               <artifactId>tomcat-embed-el</artifactId>
+                                               <version>${tomcat.version}</version>
+                               </dependency>
+                               <dependency>
+                                               <groupId>org.apache.tomcat.embed</groupId>
+                                               <artifactId>tomcat-embed-websocket</artifactId>
+                                               <version>${tomcat.version}</version>
+                               </dependency>
+                               <dependency>
+                                               <groupId>org.apache.tomcat</groupId>
+                                               <artifactId>tomcat-annotations-api</artifactId>
+                                               <version>${tomcat.version}</version>
+                               </dependency>
                                <!-- For CAMEL -->
                                <dependency>
                                                <groupId>org.apache.camel</groupId>
@@ -236,6 +257,17 @@
                                                </exclusions>
                                </dependency>
                                <!-- Others dependencies -->
+                               <dependency>
+                                       <groupId>org.onap.aaf.authz</groupId>
+                                       <artifactId>aaf-cadi-aaf</artifactId>
+                                       <version>2.1.1</version>
+                                       <exclusions>
+                                               <exclusion>
+                                                       <groupId>javax.servlet</groupId>
+                                                       <artifactId>servlet-api</artifactId>
+                                               </exclusion>
+                                       </exclusions>
+                               </dependency>
                                <dependency>
                                                <groupId>ch.qos.logback</groupId>
                                                <artifactId>logback-core</artifactId>
@@ -886,9 +918,6 @@
                                                                                                <goals>
                                                                                                                <goal>build</goal>
                                                                                                </goals>
-                                                                                               <configuration>
-                                                                                                               <image>onap/clamp</image>
-                                                                                               </configuration>
                                                                                </execution>
                                                                                <execution>
                                                                                                <id>push-images</id>
@@ -896,9 +925,6 @@
                                                                                                <goals>
                                                                                                                <goal>push</goal>
                                                                                                </goals>
-                                                                                               <configuration>
-                                                                                                               <image>onap/clamp</image>
-                                                                                               </configuration>
                                                                                </execution>
                                                                                <execution>
                                                                                                <id>docker-start-for-it</id>