DMAAP-BC - Version updates - issue fix

[dmaap/buscontroller.git] / dmaap-bc / pom.xml

diff --git a/dmaap-bc/pom.xml b/dmaap-bc/pom.xml
index bd0eda0..2c34e8d 100644 (file)
--- a/dmaap-bc/pom.xml
+++ b/dmaap-bc/pom.xml
@@ -97,6 +97,12 @@
       <artifactId>aaf-cadi-aaf</artifactId>
       <version>2.1.7</version>
       <classifier>full</classifier>
+      <exclusions>
+        <exclusion>
+          <artifactId>log4j</artifactId>
+          <groupId>log4j</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
@@ -107,6 +113,12 @@
       <groupId>com.fasterxml.jackson.dataformat</groupId>
       <artifactId>jackson-dataformat-yaml</artifactId>
       <version>${jackson.version}</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>snakeyaml</artifactId>
+          <groupId>org.yaml</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>ch.qos.logback</groupId>
@@ -142,6 +154,12 @@
       <groupId>io.swagger</groupId>
       <artifactId>swagger-jersey2-jaxrs</artifactId>
       <version>${swagger.version}</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>jersey-common</artifactId>
+          <groupId>org.glassfish.jersey.core</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>io.swagger</groupId>
@@ -163,7 +181,7 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlets</artifactId>
-      <version>${jettyVersion}</version>
+      <version>9.4.41.v20210516</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -223,6 +241,28 @@
       <groupId>org.apache.maven.plugins</groupId>
       <artifactId>maven-enforcer-plugin</artifactId>
       <version>3.0.0-M3</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>commons-io</artifactId>
+          <groupId>commons-io</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>maven-compat</artifactId>
+          <groupId>org.apache.maven</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>maven-settings</artifactId>
+          <groupId>org.apache.maven</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>maven-shared-utils</artifactId>
+          <groupId>org.apache.maven.shared</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>bsh</artifactId>
+          <groupId>org.beanshell</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.att.eelf</groupId>
@@ -420,25 +460,26 @@
       <id>docker</id>
       <properties>
         <skipDockerBuild>${skip.docker.build}</skipDockerBuild>
-        <skipDockerTag>${skip.docker.tag}</skipDockerTag>
         <skipTests>false</skipTests>
       </properties>
       <build>
         <plugins>
+          <plugin>
+            <groupId>org.codehaus.gmaven</groupId>
+            <artifactId>gmaven-plugin</artifactId>
+          </plugin>
           <plugin>
             <groupId>io.fabric8</groupId>
             <artifactId>docker-maven-plugin</artifactId>
             <configuration>
-              <verbose>${docker.verbose}</verbose>
-              <apiVersion>${docker.apiVersion}</apiVersion>
-              <pullRegistry>${docker.pull.registry}</pullRegistry>
-              <pushRegistry>${docker.push.registry}</pushRegistry>
               <images>
                 <image>
                   <name>${dmaapbc.image.name}</name>
                   <build>
                     <cleanup>try</cleanup>
-                    <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
+                    <noCache>true</noCache>
+                    <optimise>true</optimise>
+                    <contextDir>${basedir}/target/docker-stage</contextDir>
                     <dockerFile>Dockerfile</dockerFile>
                     <tags>
                       <tag>${dockertag1}</tag>