diff options
| -rw-r--r-- | datarouter-node/src/main/resources/docker/Dockerfile | 2 | ||||
| -rw-r--r-- | datarouter-prov/src/main/resources/docker/Dockerfile | 2 | ||||
| -rw-r--r-- | datarouter-subscriber/src/main/resources/docker/Dockerfile | 2 | ||||
| -rwxr-xr-x | pom.xml | 31 | ||||
| -rw-r--r-- | version.properties | 18 |
5 files changed, 38 insertions, 17 deletions
diff --git a/datarouter-node/src/main/resources/docker/Dockerfile b/datarouter-node/src/main/resources/docker/Dockerfile index 38ea3b9e..7c2cf3f5 100644 --- a/datarouter-node/src/main/resources/docker/Dockerfile +++ b/datarouter-node/src/main/resources/docker/Dockerfile @@ -19,7 +19,7 @@ # limitations under the License. # ============LICENSE_END==================================================== # -FROM nexus3.onap.org:10001/onap/integration-java11:10.0.0 +FROM nexus3.onap.org:10001/onap/integration-java17:12.0.0 COPY /opt /opt diff --git a/datarouter-prov/src/main/resources/docker/Dockerfile b/datarouter-prov/src/main/resources/docker/Dockerfile index 38ea3b9e..7c2cf3f5 100644 --- a/datarouter-prov/src/main/resources/docker/Dockerfile +++ b/datarouter-prov/src/main/resources/docker/Dockerfile @@ -19,7 +19,7 @@ # limitations under the License. # ============LICENSE_END==================================================== # -FROM nexus3.onap.org:10001/onap/integration-java11:10.0.0 +FROM nexus3.onap.org:10001/onap/integration-java17:12.0.0 COPY /opt /opt diff --git a/datarouter-subscriber/src/main/resources/docker/Dockerfile b/datarouter-subscriber/src/main/resources/docker/Dockerfile index f3ad036e..a3016c44 100644 --- a/datarouter-subscriber/src/main/resources/docker/Dockerfile +++ b/datarouter-subscriber/src/main/resources/docker/Dockerfile @@ -19,7 +19,7 @@ # limitations under the License. # ============LICENSE_END==================================================== # -FROM nexus3.onap.org:10001/onap/integration-java11:10.0.0 +FROM nexus3.onap.org:10001/onap/integration-java17:12.0.0 COPY /opt /opt @@ -5,6 +5,7 @@ * 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. @@ -34,10 +35,10 @@ </parent> <properties> <!--revision must also be set in the version.properties file at project root--> - <revision>2.1.14-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> @@ -294,7 +295,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> @@ -303,7 +314,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> diff --git a/version.properties b/version.properties index 7ec099f7..eaa9ae1a 100644 --- a/version.properties +++ b/version.properties @@ -5,16 +5,16 @@ # Copyright (C) 2017 AT&T Intellectual 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.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
# limitations under the License.
# ============LICENSE_END============================================
# ===================================================================
@@ -27,7 +27,7 @@ major=2
minor=1
-patch=14
+patch=15
base_version=${major}.${minor}.${patch}
|