re-enable tests for sdo databinding plugin

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
eclipse-ee4j · May 15, 2020 · 6e0d3b2 · 6e0d3b2
1 parent 21c48c3
commit 6e0d3b2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 24 deletions.
diff --git a/jaxws-ri/extras/eclipselink_sdo/pom.xml b/jaxws-ri/extras/eclipselink_sdo/pom.xml
@@ -30,6 +30,7 @@
 
     <properties>
         <spotbugs.exclude>${project.basedir}/exclude.xml</spotbugs.exclude>
+        <argLine/>
     </properties>
 
     <dependencies>
@@ -58,24 +59,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-dependencies</id>
-                        <phase>process-sources</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
-                            <excludeScope>provided</excludeScope>
-                            <stripVersion>true</stripVersion>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -96,11 +79,16 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <!--TODO tests are skipped due to
-                        Modules commonj.sdo and org.eclipse.persistence.sdo export package commonj.sdo.impl to module ha.api
-                        remove after Eclipselink split package resolution.
-                    -->
-                    <skip>true</skip>
+                    <argLine>
+                        --add-exports com.sun.xml.ws.sdo/com.sun.xml.ws.sdo.test=ALL-UNNAMED
+                        --add-exports com.sun.xml.ws.sdo/com.sun.xml.ws.sdo.test.add=ALL-UNNAMED
+                        --add-exports com.sun.xml.ws.sdo/com.sun.xml.ws.sdo.test.helloSDO=ALL-UNNAMED
+                        --add-exports com.sun.xml.ws.sdo/com.sun.xml.ws.sdo.sample.service=ALL-UNNAMED
+                        --add-exports com.sun.xml.ws.sdo/com.sun.xml.ws.sdo.sample.service=com.sun.xml.ws
+                        --add-exports com.sun.xml.ws.sdo/com.sun.xml.ws.sdo.sample.service.types=ALL-UNNAMED
+                        @{argLine}
+                    </argLine>
+                    <forkCount>1</forkCount>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/jaxws-ri/extras/eclipselink_sdo/src/main/java/module-info.java b/jaxws-ri/extras/eclipselink_sdo/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -10,6 +10,7 @@
 
 module com.sun.xml.ws.sdo {
 
+    requires java.logging;
     requires com.sun.xml.ws;
 
     exports com.sun.xml.ws.db.sdo;