[DMAAP-DR] Remove more AAF junk

[dmaap/datarouter.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index f465695..40357b0 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -32,11 +32,11 @@
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>3.0.0</version>
+        <version>3.3.2</version>
     </parent>
     <properties>
         <!--revision must also be set in the version.properties file at project root-->
-        <revision>2.1.9-SNAPSHOT</revision>
+        <revision>2.1.13-SNAPSHOT</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
@@ -59,11 +59,11 @@
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
 
         <!--dependency version across all modules-->
-        <jetty.version>9.4.20.v20190813</jetty.version>
+        <jetty.version>11.0.12</jetty.version>
         <javax.mail-api.version>1.5.5</javax.mail-api.version>
         <javax.servlet-api.version>4.0.1</javax.servlet-api.version>
-        <qos.logback.version>1.2.3</qos.logback.version>
-        <aaf-cadi-aaf.version>2.1.15</aaf-cadi-aaf.version>
+        <qos.logback.version>1.2.7</qos.logback.version>
+        <qos.logback.classic.version>1.2.3</qos.logback.classic.version>
         <commons-codec.version>1.15</commons-codec.version>
         <gmaven-plugin.version>1.5</gmaven-plugin.version>
         <io.fabric8.version>0.33.0</io.fabric8.version>
@@ -79,7 +79,7 @@
         <powermock.version>2.0.7</powermock.version>
         <commons-lang3.version>3.0</commons-lang3.version>
         <eelf-core.version>1.0.0</eelf-core.version>
-        <json.version>20160810</json.version>
+        <json.version>20210307</json.version>
         <sl4j-api.version>1.7.25</sl4j-api.version>
         <hamcrest-lib.version>1.3</hamcrest-lib.version>
         <annotations.version>12.0</annotations.version>
@@ -120,7 +120,7 @@
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-classic</artifactId>
-                <version>${qos.logback.version}</version>
+                <version>${qos.logback.classic.version}</version>
                 <scope>compile</scope>
             </dependency>
             <dependency>
@@ -153,7 +153,7 @@
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-continuation</artifactId>
-                <version>${jetty.version}</version>
+                <version>9.4.49.v20220914</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
@@ -180,11 +180,6 @@
                 <artifactId>cdi-websocket</artifactId>
                 <version>${jetty.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.onap.aaf.authz</groupId>
-                <artifactId>aaf-cadi-core</artifactId>
-                <version>${aaf-cadi-aaf.version}</version>
-            </dependency>
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
@@ -374,7 +369,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.3.1</version>
                     <configuration>
                         <failOnError>false</failOnError>
                     </configuration>