<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>
<guava.version>20.0</guava.version>
<eelf.core.version>1.0.0</eelf.core.version>
<camel.version>2.20.1</camel.version>
- <springboot.version>1.5.12.RELEASE</springboot.version>
+ <springboot.version>1.5.14.RELEASE</springboot.version>
<sonar.language>java</sonar.language>
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
<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>
<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>
</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>
<artifactId>commons-io</artifactId>
</exclusion>
<exclusion>
- <artifactId>grizzly-http</artifactId>
+ <artifactId>grizzly-http-server</artifactId>
<groupId>org.glassfish.grizzly</groupId>
</exclusion>
</exclusions>
<groupId>com.att.nsa</groupId>
<artifactId>dmaapClient</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <version>${springboot.version}</version>
+ <!-- Temporary fix -->
+ <version>1.5.13.RELEASE</version>
+ <!-- <version>${springboot.version}</version> -->
<executions>
<execution>
<goals>
<goals>
<goal>build</goal>
</goals>
- <configuration>
- <image>onap/clamp</image>
- </configuration>
</execution>
<execution>
<id>push-images</id>
<goals>
<goal>push</goal>
</goals>
- <configuration>
- <image>onap/clamp</image>
- </configuration>
</execution>
<execution>
<id>docker-start-for-it</id>