X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fdatarouter.git;a=blobdiff_plain;f=pom.xml;h=9846d273fc01f8559e78ea97423263b8bb0c5e8f;hp=ec0aedfc7d29d06a7eb061c8f660de5f67c378dd;hb=HEAD;hpb=e49f6d600a6bdc828a2cd8a8e04b1182586a5e19

diff --git a/pom.xml b/pom.xml
index ec0aedfc..91c9dac0 100755
--- a/pom.xml
+++ b/pom.xml
@@ -4,6 +4,8 @@
   * ===========================================================================
   * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
   * Modifications Copyright (C) 2018 Nokia. All rights reserved.
+  * Copyright (d) 2023 J. F. Lucas.  All rights reserved.
+  * Copyright © 2023 Nordix Foundation Property. All rights reserved.
   * ===========================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -17,10 +19,7 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END====================================================
-  *
-  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
-  *
--->
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.dmaap.datarouter</groupId>
@@ -32,14 +31,14 @@
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>3.0.0</version>
+        <version>3.3.3</version>
     </parent>
     <properties>
         <!--revision must also be set in the version.properties file at project root-->
-        <revision>2.1.11-SNAPSHOT</revision>
+        <revision>2.1.15-SNAPSHOT</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
 
         <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
         <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
@@ -59,14 +58,14 @@
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
 
         <!--dependency version across all modules-->
-        <jetty.version>9.4.41.v20210516</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.7</qos.logback.version>
         <qos.logback.classic.version>1.2.3</qos.logback.classic.version>
-        <aaf-cadi-aaf.version>2.1.15</aaf-cadi-aaf.version>
         <commons-codec.version>1.15</commons-codec.version>
-        <gmaven-plugin.version>1.5</gmaven-plugin.version>
+        <gmavenplus-plugin.version>3.0.0</gmavenplus-plugin.version>
+        <groovy.version>4.0.13</groovy.version>
         <io.fabric8.version>0.33.0</io.fabric8.version>
         <docker.apiVersion>2.2.54</docker.apiVersion>
         <commons-lang.version>2.4</commons-lang.version>
@@ -87,6 +86,7 @@
     </properties>
     <modules>
         <module>datarouter-prov</module>
+        <module>datarouter-prov-client</module>
         <module>datarouter-node</module>
         <module>datarouter-subscriber</module>
         <module>datarouter-docker-compose</module>
@@ -154,7 +154,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>
@@ -169,7 +169,7 @@
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-http</artifactId>
-                <version>9.4.43.v20210629</version>
+                <version>${jetty.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
@@ -181,11 +181,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>
@@ -301,7 +296,17 @@
                         <exclude>IntegrationSuite.java</exclude>
                     </excludes>
                     <argLine>
-                        ${surefireArgLine} --illegal-access=permit
+                        --add-opens=java.base/java.util.concurrent=ALL-UNNAMED
+                        --add-opens=java.base/sun.security.util=ALL-UNNAMED
+                        --add-opens=java.base/sun.security.jca=ALL-UNNAMED
+                        --add-opens=java.base/java.util.regex=ALL-UNNAMED
+                        --add-opens=java.base/java.nio.file=ALL-UNNAMED
+                        --add-opens java.base/java.lang=ALL-UNNAMED
+                        --add-opens=java.base/java.util=ALL-UNNAMED
+                        --add-opens=java.base/java.text=ALL-UNNAMED
+                        --add-opens=java.base/java.net=ALL-UNNAMED
+                        --add-opens=java.base/java.nio=ALL-UNNAMED
+                        --add-opens=java.base/java.io=ALL-UNNAMED
                     </argLine>
                 </configuration>
             </plugin>
@@ -310,7 +315,17 @@
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <configuration>
                     <argLine>
-                        --illegal-access=permit
+                        --add-opens=java.base/java.util.concurrent=ALL-UNNAMED
+                        --add-opens=java.base/sun.security.util=ALL-UNNAMED
+                        --add-opens=java.base/sun.security.jca=ALL-UNNAMED
+                        --add-opens=java.base/java.util.regex=ALL-UNNAMED
+                        --add-opens=java.base/java.nio.file=ALL-UNNAMED
+                        --add-opens java.base/java.lang=ALL-UNNAMED
+                        --add-opens=java.base/java.util=ALL-UNNAMED
+                        --add-opens=java.base/java.text=ALL-UNNAMED
+                        --add-opens=java.base/java.net=ALL-UNNAMED
+                        --add-opens=java.base/java.nio=ALL-UNNAMED
+                        --add-opens=java.base/java.io=ALL-UNNAMED
                     </argLine>
                 </configuration>
             </plugin>
@@ -414,9 +429,17 @@
                     </configuration>
                 </plugin>
                 <plugin>
-                    <groupId>org.codehaus.gmaven</groupId>
-                    <artifactId>gmaven-plugin</artifactId>
-                    <version>${gmaven-plugin.version}</version>
+                    <groupId>org.codehaus.gmavenplus</groupId>
+                    <artifactId>gmavenplus-plugin</artifactId>
+                    <version>${gmavenplus-plugin.version}</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.groovy</groupId>
+                            <artifactId>groovy-all</artifactId>
+                            <version>${groovy.version}</version>
+                            <type>pom</type>
+                        </dependency>
+                    </dependencies>
                     <executions>
                         <execution>
                             <phase>validate</phase>
@@ -428,18 +451,20 @@
                                     <ver>${project.version}</ver>
                                 </properties>
                                 <!-- Setup image tags per https://wiki.onap.org/display/DW/Independent+Versioning+and+Release+Process#IndependentVersioningandReleaseProcess-StandardizedDockerTagging -->
-                                <source>
-                                    println 'ver: ' + project.properties['ver'];
-                                    if ( project.properties['ver'].endsWith("-SNAPSHOT") ) {
-                                        project.properties['dockertag1']=project.properties['ver'] + "-latest";
-                                        project.properties['dockertag2']=project.properties['ver'] + "-" + project.properties['timestamp'];
-                                    } else {
-                                        project.properties['dockertag1']=project.properties['ver'] + "-STAGING-latest";
-                                        project.properties['dockertag2']=project.properties['ver'] + "-STAGING-" + project.properties['timestamp'];
-                                    }
-                                    println 'docker tag 1: ' + project.properties['dockertag1'];
-                                    println 'docker tag 2: ' + project.properties['dockertag2'];
-                                </source>
+                                <scripts>
+                                    <script>
+                                        println 'ver: ' + project.properties['revision'];
+                                        if ( project.properties['revision'].endsWith("-SNAPSHOT") ) {
+                                            project.properties['dockertag1']=project.properties['revision'] + "-latest";
+                                            project.properties['dockertag2']=project.properties['revision'] + "-" + project.properties['timestamp'];
+                                        } else {
+                                            project.properties['dockertag1']=project.properties['revision'] + "-STAGING-latest";
+                                            project.properties['dockertag2']=project.properties['revision'] + "-STAGING-" + project.properties['timestamp'];
+                                        }
+                                        println 'docker tag 1: ' + project.properties['dockertag1'];
+                                        println 'docker tag 2: ' + project.properties['dockertag2'];
+                                    </script>
+                                </scripts>
                             </configuration>
                         </execution>
                     </executions>
@@ -448,6 +473,7 @@
                     <groupId>io.fabric8</groupId>
                     <artifactId>docker-maven-plugin</artifactId>
                     <version>${io.fabric8.version}</version>
+                    <extensions>true</extensions>
                     <configuration>
                         <skipBuild>${docker.skip.build}</skipBuild>
                         <verbose>${docker.verbose}</verbose>