Fixed karaf4 failing on java11 (#756)

DozerMapper · Jun 16, 2019 · f730cec · f730cec
1 parent b1a23e7
commit f730cec
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/tests/dozer-osgi-tests/pom.xml b/tests/dozer-osgi-tests/pom.xml
@@ -34,7 +34,7 @@
     <properties>
         <osgi.Export-Package>com.github.dozermapper.osgitests.*</osgi.Export-Package>
 
-        <karaf4-version>4.2.2</karaf4-version>
+        <karaf4-version>4.2.6</karaf4-version>
     </properties>
 
     <dependencies>

diff --git a/...ts/src/test/java/com/github/dozermapper/osgitests/AbstractDozerCoreOsgiContainerTest.java b/...ts/src/test/java/com/github/dozermapper/osgitests/AbstractDozerCoreOsgiContainerTest.java
@@ -54,7 +54,8 @@ public void canGetBundleFromDozerCore() {
 
             //Ignore any Karaf bundles
             if (current.getSymbolicName().startsWith("org.apache.karaf")
-                || current.getSymbolicName().startsWith("org.jline")) {
+                    || current.getSymbolicName().startsWith("org.apache.aries.blueprint.core.compatibility")
+                    || current.getSymbolicName().startsWith("org.jline")) {
                 continue;
             }
 

diff --git a/...osgi-tests/src/test/java/com/github/dozermapper/osgitests/support/PaxExamTestSupport.java b/...osgi-tests/src/test/java/com/github/dozermapper/osgitests/support/PaxExamTestSupport.java
@@ -117,8 +117,16 @@ protected Option karafContainerConfigOptions(String version) {
     }
 
     private Option getJavaModuleOptions() {
-        if (JavaVersionUtil.getMajorVersion() >= 9 && JavaVersionUtil.getMajorVersion() <= 10) {
+        if (JavaVersionUtil.getMajorVersion() >= 9) {
             return composite(
+                    vmOption("--add-reads=java.xml=java.logging"),
+                    vmOption("--add-exports=java.base/org.apache.karaf.specs.locator=java.xml,ALL-UNNAMED"),
+
+                    vmOption("--patch-module"),
+                    vmOption("java.base=lib/endorsed/org.apache.karaf.specs.locator-" + System.getProperty("karaf.version") + ".jar"),
+                    vmOption("--patch-module"),
+                    vmOption("java.xml=lib/endorsed/org.apache.karaf.specs.java.xml-" + System.getProperty("karaf.version") + ".jar"),
+
                     vmOption("--add-opens"),
                     vmOption("java.base/java.security=ALL-UNNAMED"),
                     vmOption("--add-opens"),
@@ -134,13 +142,10 @@ private Option getJavaModuleOptions() {
 
                     vmOption("--add-exports=java.base/sun.net.www.protocol.http=ALL-UNNAMED"),
                     vmOption("--add-exports=java.base/sun.net.www.protocol.https=ALL-UNNAMED"),
-                    vmOption("--add-exports=java.xml.bind/com.sun.xml.internal.bind.v2.runtime=ALL-UNNAMED"),
-                    vmOption("--add-exports=jdk.xml.dom/org.w3c.dom.html=ALL-UNNAMED"),
+                    vmOption("--add-exports=java.base/sun.net.www.protocol.jar=ALL-UNNAMED"),
                     vmOption("--add-exports=jdk.naming.rmi/com.sun.jndi.url.rmi=ALL-UNNAMED"),
-                    vmOption("--add-exports=java.xml.ws/com.sun.xml.internal.messaging.saaj.soap.impl=ALL-UNNAMED"),
-
-                    vmOption("--add-modules"),
-                    vmOption("java.xml.ws.annotation,java.corba,java.transaction,java.xml.bind,java.xml.ws,jdk.xml.bind")
+                    vmOption("-classpath"),
+                    vmOption("lib/jdk9plus/*" + File.pathSeparator + "lib/boot/*")
             );
         } else {
             return composite();