* ===========================================================================
* 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.
* 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>
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
- <version>3.3.2</version>
+ <version>3.3.3</version>
</parent>
<properties>
<!--revision must also be set in the version.properties file at project root-->
- <revision>2.1.13-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>
<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>
</properties>
<modules>
<module>datarouter-prov</module>
+ <module>datarouter-prov-client</module>
<module>datarouter-node</module>
<module>datarouter-subscriber</module>
<module>datarouter-docker-compose</module>
<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>
<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>
<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>
</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>
<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>
<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>