summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pom.xml57
1 files changed, 22 insertions, 35 deletions
diff --git a/pom.xml b/pom.xml
index 227a47a59..1ce86b58e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -415,30 +415,27 @@
<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>
</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>
@@ -453,22 +450,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>
@@ -652,7 +633,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>
@@ -672,8 +653,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>
@@ -708,7 +689,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>
@@ -885,6 +866,7 @@
</configuration>
</execution>
</executions>
+
</plugin>
<plugin>
<groupId>io.fabric8</groupId>
@@ -949,7 +931,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>
@@ -967,6 +953,7 @@
</image>
</images>
</configuration>
+
<executions>
<execution>
<id>generate-images</id>