[DMAAP-BC] Upgrade packages for London rel

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

diff --git a/dmaap-bc/pom.xml b/dmaap-bc/pom.xml
index bd0eda0..b6d4351 100644 (file)
--- a/dmaap-bc/pom.xml
+++ b/dmaap-bc/pom.xml
@@ -42,11 +42,11 @@
     </sitePath>
     <eelf.version>1.0.0</eelf.version>
     <dmaapbc.image.name>${docker.image.root}${project.artifactId}</dmaapbc.image.name>
-    <swagger.version>1.5.19</swagger.version>
-    <jackson.version>2.9.5</jackson.version>
-    <jersey.version>2.29</jersey.version>
+    <swagger.version>1.6.8</swagger.version>
+    <jackson.version>2.14.2</jackson.version>
+    <jersey.version>3.1.1</jersey.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <jettyVersion>9.4.40.v20210413</jettyVersion>
+    <jettyVersion>11.0.14</jettyVersion>
     <eelf.version>1.0.0</eelf.version>
     <junit.version>4.12</junit.version>
     <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
@@ -69,14 +69,17 @@
     <dependency>
       <groupId>org.glassfish.jersey.media</groupId>
       <artifactId>jersey-media-json-jackson</artifactId>
+      <version>${jersey.version}</version>
     </dependency>
     <dependency>
       <groupId>org.glassfish.jersey.containers</groupId>
       <artifactId>jersey-container-servlet-core</artifactId>
+      <version>${jersey.version}</version>
     </dependency>
     <dependency>
       <groupId>org.glassfish.jersey.media</groupId>
       <artifactId>jersey-media-moxy</artifactId>
+      <version>${jersey.version}</version>
     </dependency>
     <dependency>
       <groupId>org.glassfish.jersey.test-framework.providers</groupId>
@@ -85,18 +88,24 @@
           <version>${jersey.version}</version>
       -->
       <artifactId>jersey-test-framework-provider-jdk-http</artifactId>
-      <version>2.29.1</version>
+      <version>${jersey.version}</version>
     </dependency>
     <dependency>
       <groupId>org.glassfish.jersey.inject</groupId>
       <artifactId>jersey-hk2</artifactId>
-      <version>2.29.1</version>
+      <version>${jersey.version}</version>
     </dependency>
     <dependency>
       <groupId>org.onap.aaf.authz</groupId>
       <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,11 +116,17 @@
       <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>
       <artifactId>logback-core</artifactId>
-      <version>1.2.3</version>
+      <version>1.2.7</version>
     </dependency>
     <dependency>
       <groupId>ch.qos.logback</groupId>
@@ -142,6 +157,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>
@@ -187,7 +208,7 @@
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>42.2.14</version>
+      <version>42.5.4</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -198,7 +219,7 @@
       <!-- use 2.3.1 to avoid this issue: https://github.com/eclipse-ee4j/jaxb-ri/issues/1222 -->
       <groupId>javax.xml.bind</groupId>
       <artifactId>jaxb-api</artifactId>
-      <version>2.3.1</version>
+      <version>2.4.0-b180830.0359</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -223,6 +244,32 @@
       <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>
+        <exclusion>
+          <artifactId>maven-core</artifactId>
+          <groupId>org.apache.maven</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.att.eelf</groupId>
@@ -420,25 +467,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>