X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=bb5b5244e45271b5b7d8e64e956b7380c36097ac;hb=3f719e23ecfd2e42831e862d239714202b8b7654;hp=7c54086719e6bceb79d77a7e948e1e862d2be8b1;hpb=13e80f1b27a0a86de516594b502be51c7ae59258;p=clamp.git

diff --git a/pom.xml b/pom.xml
index 7c540867..bb5b5244 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,6 @@
 				<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.14.RELEASE</springboot.version>
@@ -102,6 +101,7 @@
 						</activation>
 						<properties>
 							<docker.skip.run>true</docker.skip.run>
+							<docker.skip>true</docker.skip>
 						</properties>
 				</profile>
 				<profile>
@@ -114,6 +114,7 @@
 						</activation>
 						<properties>
 							<docker.skip.run>true</docker.skip.run>
+							<docker.skip>true</docker.skip>
 						</properties>
 				</profile>
 				<profile>
@@ -126,6 +127,7 @@
 						</activation>
 						<properties>
 							<docker.skip.run>true</docker.skip.run>
+							<docker.skip>true</docker.skip>
 						</properties>
 				</profile>
 				<profile>
@@ -135,6 +137,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>
@@ -373,16 +376,6 @@
 						<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>
@@ -416,30 +409,31 @@
 										<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>
+						<groupId>org.onap.policy.common</groupId>
+						<artifactId>ONAP-Logging</artifactId>
 						<version>1.1.3</version>
 						<exclusions>
 								<exclusion>
@@ -454,22 +448,6 @@
 										<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>
@@ -534,16 +512,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 +528,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>
+						<version>25.1-jre</version>
+				</dependency>
 				<!-- Remove the MYSQL connector and replace it by Mariadb -->
 				<dependency>
 						<groupId>org.mariadb.jdbc</groupId>
@@ -658,7 +631,7 @@
 				</resources>
 
 				<plugins>
-						<!-- Scan Clamp code and generate the swagger.json file with all the
+						<!-- Scan Clamp code and generate the swagger.json file with all the 
 								APIs -->
 						<plugin>
 								<groupId>com.sebastian-daschner</groupId>
@@ -678,8 +651,8 @@
 								</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
+						<!-- 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 -->
 						<plugin>
 								<groupId>io.github.swagger2markup</groupId>
@@ -714,7 +687,7 @@
 								</executions>
 						</plugin>
 
-						<!-- Run the generated asciidoc through Asciidoctor to generate other
+						<!-- Run the generated asciidoc through Asciidoctor to generate other 
 								documentation types, such as PDFs or HTML5 -->
 						<plugin>
 								<groupId>org.asciidoctor</groupId>
@@ -891,6 +864,7 @@
 												</configuration>
 										</execution>
 								</executions>
+
 						</plugin>
 						<plugin>
 								<groupId>io.fabric8</groupId>
@@ -955,7 +929,11 @@
 												<image>
 														<name>onap/clamp</name>
 														<alias>onap-clamp</alias>
+														<run>
+															<skip>true</skip>
+														</run>
 														<build>
+																<imagePullPolicy>never</imagePullPolicy>
 																<cleanup>true</cleanup>
 																<tags>
 																		<tag>latest</tag>
@@ -973,6 +951,7 @@
 												</image>
 										</images>
 								</configuration>
+
 								<executions>
 										<execution>
 												<id>generate-images</id>