From 05b68839ee9ea2f00ab066eac0c2128513cab270 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 7 Apr 2022 12:25:31 +0200
Subject: [PATCH] Fix UT with JDK17

Powermock is accessing java.base internals, make sure to open them
during surefire invocation.

Change-Id: Ia6d8c4747ff27bcb09b2fb2d1e7327fb91f5d5e1
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 mappingservice/dsbackend/pom.xml      | 17 +++++++++++++++++
 mappingservice/implementation/pom.xml | 19 +++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/mappingservice/dsbackend/pom.xml b/mappingservice/dsbackend/pom.xml
index 932b5005c..336e2562a 100644
--- a/mappingservice/dsbackend/pom.xml
+++ b/mappingservice/dsbackend/pom.xml
@@ -63,4 +63,21 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration combine.children="append">
+          <!-- FIXME: remove this declaration once powermock is gone -->
+          <argLine>
+            @{argLine}
+            --add-opens java.base/java.lang=ALL-UNNAMED
+            --add-opens java.base/java.util=ALL-UNNAMED
+            --add-opens java.base/java.util.concurrent=ALL-UNNAMED
+          </argLine>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/mappingservice/implementation/pom.xml b/mappingservice/implementation/pom.xml
index 1078cff5e..b66a3e806 100644
--- a/mappingservice/implementation/pom.xml
+++ b/mappingservice/implementation/pom.xml
@@ -84,4 +84,23 @@
       <artifactId>mdsal-singleton-dom-impl</artifactId>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration combine.children="append">
+          <!-- FIXME: remove this declaration once powermock is gone -->
+          <argLine>
+            @{argLine}
+            --add-opens java.base/java.lang=ALL-UNNAMED
+            --add-opens java.base/java.lang.reflect=ALL-UNNAMED
+            --add-opens java.base/java.net=ALL-UNNAMED
+            --add-opens java.base/java.util=ALL-UNNAMED
+            --add-opens java.base/java.util.concurrent=ALL-UNNAMED
+          </argLine>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
-- 
2.36.6