X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=pom.xml;h=68b80ab8ddd1595fda892e5987ef4e3005763120;hb=07401e84086dea28a0c6d7cb3a1fd7f0b94011c3;hp=95be6766af19708c846205402180309c1d6080c9;hpb=c2af4a578fb3e13af7a00778d9fec78ca67a1506;p=clamp.git

diff --git a/pom.xml b/pom.xml
index 95be6766..68b80ab8 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>
@@ -67,11 +65,9 @@
 				<project.scm.id>git-server</project.scm.id>
 				<java.version>1.8</java.version>
 
-				<swagger.jaxrs2.version>2.0.0-rc4</swagger.jaxrs2.version>
-				<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>
+				<camel.version>2.22.0</camel.version>
+				<springboot.version>2.0.3.RELEASE</springboot.version>
 
 				<sonar.language>java</sonar.language>
 				<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -87,8 +83,8 @@
 				<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>
-				<tomcat.version>8.5.28</tomcat.version>
+				<python.http.proxy.param/>
+				<tomcat.version>8.5.32</tomcat.version>
 		</properties>
 
 		<profiles>
@@ -102,6 +98,7 @@
 						</activation>
 						<properties>
 							<docker.skip.run>true</docker.skip.run>
+							<docker.skip>true</docker.skip>
 						</properties>
 				</profile>
 				<profile>
@@ -114,6 +111,7 @@
 						</activation>
 						<properties>
 							<docker.skip.run>true</docker.skip.run>
+							<docker.skip>true</docker.skip>
 						</properties>
 				</profile>
 				<profile>
@@ -126,6 +124,7 @@
 						</activation>
 						<properties>
 							<docker.skip.run>true</docker.skip.run>
+							<docker.skip>true</docker.skip>
 						</properties>
 				</profile>
 				<profile>
@@ -135,6 +134,7 @@
 								<docker.skip.build>false</docker.skip.build>
 								<docker.skip.tag>false</docker.skip.tag>
 								<docker.skip.push>false</docker.skip.push>
+								<docker.skip>false</docker.skip>
 						</properties>
 				</profile>
 		</profiles>
@@ -193,14 +193,6 @@
 						<name>JBoss.org Maven repository</name>
 						<url>https://repository.jboss.org/nexus/content/groups/public</url>
 				</repository>
-				<repository>
-						<id>jcentral</id>
-						<name>bintray</name>
-						<url>http://jcenter.bintray.com</url>
-						<snapshots>
-								<enabled>false</enabled>
-						</snapshots>
-				</repository>
 		</repositories>
 
 		<dependencyManagement>
@@ -230,6 +222,11 @@
 						<artifactId>eelf-core</artifactId>
 						<version>${eelf.core.version}</version>
 				</dependency>
+				<dependency>
+						<groupId>org.codehaus.janino</groupId>
+						<artifactId>janino</artifactId>
+						<version>3.0.8</version>
+				</dependency>
 				<dependency>
 						<groupId>org.apache.tomcat.embed</groupId>
 						<artifactId>tomcat-embed-core</artifactId>
@@ -263,11 +260,34 @@
 						<groupId>org.apache.camel</groupId>
 						<artifactId>camel-servlet-starter</artifactId>
 				</dependency>
+				<dependency>
+					<groupId>org.apache.camel</groupId> 
+					<artifactId>camel-jackson-starter</artifactId>
+				</dependency>
+				<dependency>
+					<groupId>org.apache.camel</groupId>
+					<artifactId>camel-swagger-java-starter</artifactId>
+					<exclusions>
+						<exclusion>
+							<groupId>javax.ws.rs</groupId>
+							<artifactId>jsr311-api</artifactId>
+						</exclusion>
+						<exclusion>
+							<groupId>org.slf4j</groupId>
+							<artifactId>slf4j-ext</artifactId>
+						</exclusion>
+					</exclusions>
+				</dependency>
 				<dependency>
 						<groupId>javax.xml.bind</groupId>
 						<artifactId>jaxb-api</artifactId>
 						<version>2.3.0</version>
 				</dependency>
+				<dependency>
+					<groupId>org.glassfish.jersey.core</groupId>
+					<artifactId>jersey-common</artifactId>
+					<version>2.27</version>
+				</dependency>
 				<!-- Spring famework -->
 				<dependency>
 						<groupId>org.springframework.boot</groupId>
@@ -277,11 +297,6 @@
 						<groupId>org.springframework.boot</groupId>
 						<artifactId>spring-boot-starter-tomcat</artifactId>
 				</dependency>
-				<dependency>
-						<groupId>com.paypal.springboot</groupId>
-						<artifactId>resteasy-spring-boot-starter</artifactId>
-						<version>2.3.4-RELEASE</version>
-				</dependency>
 				<dependency>
 						<groupId>org.springframework</groupId>
 						<artifactId>spring-jdbc</artifactId>
@@ -292,7 +307,7 @@
 				</dependency>
 				<dependency>
 						<groupId>org.springframework.boot</groupId>
-						<artifactId>spring-boot-starter-actuator</artifactId>
+					<artifactId>spring-boot-autoconfigure</artifactId>
 				</dependency>
 				<dependency>
 						<groupId>org.springframework.boot</groupId>
@@ -373,20 +388,10 @@
 						<artifactId>persistence-api</artifactId>
 						<version>1.0.2</version>
 				</dependency>
-				<dependency>
-						<groupId>org.hibernate</groupId>
-						<artifactId>hibernate-annotations</artifactId>
-						<version>3.5.6-Final</version>
-				</dependency>
-				<dependency>
-						<groupId>dom4j</groupId>
-						<artifactId>dom4j</artifactId>
-				</dependency>
-
 				<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>
@@ -413,34 +418,35 @@
 										<artifactId>commons-io</artifactId>
 								</exclusion>
 								<exclusion>
-										<artifactId>grizzly-http</artifactId>
+										<artifactId>grizzly-http-server</artifactId>
 										<groupId>org.glassfish.grizzly</groupId>
 								</exclusion>
-						</exclusions>
-				</dependency>
-				<dependency>
-						<groupId>org.onap.policy.common</groupId>
-						<artifactId>ONAP-Logging</artifactId>
-						<version>1.1.3</version>
-						<exclusions>
 								<exclusion>
-										<artifactId>log4j</artifactId>
-										<groupId>log4j</groupId>
+										<groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>
+										<artifactId>dmaapClient</artifactId>
 								</exclusion>
 								<exclusion>
-										<groupId>org.slf4j</groupId>
-										<artifactId>slf4j-log4j12</artifactId>
+										<groupId>org.onap.policy.common</groupId>
+										<artifactId>integrity-monitor</artifactId>
 								</exclusion>
 								<exclusion>
-										<artifactId>apache-log4j-extras</artifactId>
-										<groupId>log4j</groupId>
+										<groupId>org.onap.policy.common</groupId>
+										<artifactId>integrity-audit</artifactId>
+								</exclusion>
+								<exclusion>
+										<groupId>org.onap.aaf.cadi</groupId>
+										<artifactId>cadi-aaf</artifactId>
+								</exclusion>
+								<exclusion>
+										<groupId>javax.jms</groupId>
+										<artifactId>jms</artifactId>
 								</exclusion>
 						</exclusions>
 				</dependency>
 				<dependency>
-						<groupId>org.onap.policy.engine</groupId>
-						<artifactId>PolicyEngineUtils</artifactId>
-						<version>1.1.3</version>
+						<groupId>org.onap.policy.common</groupId>
+						<artifactId>ONAP-Logging</artifactId>
+						<version>1.2.3</version>
 						<exclusions>
 								<exclusion>
 										<artifactId>log4j</artifactId>
@@ -454,28 +460,12 @@
 										<artifactId>apache-log4j-extras</artifactId>
 										<groupId>log4j</groupId>
 								</exclusion>
-								<exclusion>
-										<groupId>mysql</groupId>
-										<artifactId>mysql-connector-java</artifactId>
-								</exclusion>
-								<exclusion>
-										<groupId>org.mariadb.jdbc</groupId>
-										<artifactId>mariadb-java-client</artifactId>
-								</exclusion>
-								<exclusion>
-										<groupId>com.att.nsa</groupId>
-										<artifactId>dmaapClient</artifactId>
-								</exclusion>
-								<exclusion>
-										<groupId>com.h2database</groupId>
-										<artifactId>h2</artifactId>
-								</exclusion>
 						</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>
@@ -492,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>
@@ -511,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>
@@ -534,16 +524,6 @@
 						<artifactId>commons-csv</artifactId>
 						<version>1.3</version>
 				</dependency>
-				<dependency>
-						<groupId>com.sun.faces</groupId>
-						<artifactId>jsf-api</artifactId>
-						<version>2.1.7</version>
-				</dependency>
-				<dependency>
-						<groupId>com.sun.faces</groupId>
-						<artifactId>jsf-impl</artifactId>
-						<version>2.1.7</version>
-				</dependency>
 				<!-- Other dependencies to fix nexus IQ reported vulnerabilities -->
 				<dependency>
 						<groupId>org.codehaus.plexus</groupId>
@@ -560,6 +540,11 @@
 						<artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
 						<version>1.0.1.Final</version>
 				</dependency>
+				<dependency>
+						<groupId>com.google.guava</groupId>
+						<artifactId>guava</artifactId>
+
+				</dependency>
 				<!-- Remove the MYSQL connector and replace it by Mariadb -->
 				<dependency>
 						<groupId>org.mariadb.jdbc</groupId>
@@ -575,34 +560,33 @@
 				<dependency>
 						<groupId>org.onap.sdc.sdc-tosca</groupId>
 						<artifactId>sdc-tosca</artifactId>
-						<version>1.3.0</version>
+						<version>1.4.1</version>
 				</dependency>
-				<!-- To generate Swagger.json, swagger.html and swagger.pdf -->
+				<!-- TESTING -->
 				<dependency>
-						<groupId>io.springfox</groupId>
-						<artifactId>springfox-swagger2</artifactId>
-						<version>2.4.0</version>
+						<groupId>org.assertj</groupId>
+						<artifactId>assertj-core</artifactId>
+						<version>3.10.0</version>
 						<scope>test</scope>
 				</dependency>
 				<dependency>
-						<groupId>io.github.robwin</groupId>
-						<artifactId>assertj-swagger</artifactId>
-						<version>0.2.0</version>
-						<scope>test</scope>
-				</dependency>
-				<dependency>
-						<groupId>io.github.swagger2markup</groupId>
-						<artifactId>swagger2markup-spring-restdocs-ext</artifactId>
-						<version>1.2.0</version>
-						<scope>test</scope>
+					<groupId>org.mockito</groupId>
+					<artifactId>mockito-core</artifactId>
+					<version>1.10.19</version>
+					<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</id>
+						<id>jcenter-releases-for-plugins</id>
 						<name>jcenter</name>
 						<url>http://jcenter.bintray.com</url>
 				</pluginRepository>
@@ -637,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>
@@ -651,43 +648,23 @@
 				</resources>
 
 				<plugins>
-						<!-- Scan Clamp code and generate the swagger.json file with all the 
-								APIs -->
-						<plugin>
-								<groupId>com.sebastian-daschner</groupId>
-								<artifactId>jaxrs-analyzer-maven-plugin</artifactId>
-								<version>0.14</version>
-								<executions>
-										<execution>
-												<phase>test</phase>
-												<goals>
-														<goal>analyze-jaxrs</goal>
-												</goals>
-												<configuration>
-														<backend>swagger</backend>
-														<resourcesDir>../docs/swagger/</resourcesDir>
-												</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 
-								way -->
+							generate a list of .adoc files containing the APIs info in more structured 
+							way -->
 						<plugin>
 								<groupId>io.github.swagger2markup</groupId>
 								<artifactId>swagger2markup-maven-plugin</artifactId>
-								<version>1.3.1</version>
+								<version>1.3.3</version>
 								<dependencies>
 										<dependency>
 												<groupId>io.github.swagger2markup</groupId>
 												<artifactId>swagger2markup-import-files-ext</artifactId>
-												<version>1.3.1</version>
+												<version>1.3.3</version>
 										</dependency>
 										<dependency>
 												<groupId>io.github.swagger2markup</groupId>
 												<artifactId>swagger2markup-spring-restdocs-ext</artifactId>
-												<version>1.3.1</version>
+												<version>1.3.3</version>
 										</dependency>
 								</dependencies>
 								<configuration>
@@ -699,7 +676,7 @@
 								</configuration>
 								<executions>
 										<execution>
-												<phase>test</phase>
+												<phase>post-integration-test</phase>
 												<goals>
 														<goal>convertSwagger2markup</goal>
 												</goals>
@@ -712,7 +689,7 @@
 						<plugin>
 								<groupId>org.asciidoctor</groupId>
 								<artifactId>asciidoctor-maven-plugin</artifactId>
-								<version>1.5.3</version>
+								<version>1.5.6</version>
 								<dependencies>
 										<dependency>
 												<groupId>org.asciidoctor</groupId>
@@ -732,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>
@@ -743,7 +720,7 @@
 								<executions>
 										<execution>
 												<id>output-html</id>
-												<phase>test</phase>
+												<phase>post-integration-test</phase>
 												<goals>
 														<goal>process-asciidoc</goal>
 												</goals>
@@ -755,7 +732,7 @@
 										</execution>
 										<execution>
 												<id>output-pdf</id>
-												<phase>test</phase>
+												<phase>post-integration-test</phase>
 												<goals>
 														<goal>process-asciidoc</goal>
 												</goals>
@@ -828,7 +805,9 @@
 						<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>
@@ -882,6 +861,7 @@
 												</configuration>
 										</execution>
 								</executions>
+
 						</plugin>
 						<plugin>
 								<groupId>io.fabric8</groupId>
@@ -946,6 +926,9 @@
 												<image>
 														<name>onap/clamp</name>
 														<alias>onap-clamp</alias>
+														<run>
+															<skip>true</skip>
+														</run>
 														<build>
 																<cleanup>true</cleanup>
 																<tags>
@@ -964,6 +947,7 @@
 												</image>
 										</images>
 								</configuration>
+
 								<executions>
 										<execution>
 												<id>generate-images</id>