You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2018/10/14 16:37:19 UTC
svn commit: r1843849 - in /webservices/axiom/trunk: ./ apidocs/ axiom-api/
axiom-compat/ axiom-jaxb/ samples/ systests/eclipse-tests/
systests/osgi-tests/ systests/osgi-tests/src/test/java/org/apache/axiom/test/
testing/axiom-testsuite/ testing/spring-...
Author: veithen
Date: Sun Oct 14 16:37:19 2018
New Revision: 1843849
URL: http://svn.apache.org/viewvc?rev=1843849&view=rev
Log:
Don't rely on the java.se.ee module which is going away in Java 11.
Modified:
webservices/axiom/trunk/apidocs/pom.xml
webservices/axiom/trunk/axiom-api/pom.xml
webservices/axiom/trunk/axiom-compat/pom.xml
webservices/axiom/trunk/axiom-jaxb/pom.xml
webservices/axiom/trunk/pom.xml
webservices/axiom/trunk/samples/pom.xml
webservices/axiom/trunk/systests/eclipse-tests/pom.xml
webservices/axiom/trunk/systests/osgi-tests/pom.xml
webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/BlueprintTest.java
webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/FactoryTest.java
webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/JAXBTest.java
webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/SJSXPTest.java
webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/SystemDepsTest.java
webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/UsesConstraintsTest.java
webservices/axiom/trunk/testing/axiom-testsuite/pom.xml
webservices/axiom/trunk/testing/spring-ws-testsuite/pom.xml
webservices/axiom/trunk/testing/testutils/pom.xml
Modified: webservices/axiom/trunk/apidocs/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/apidocs/pom.xml?rev=1843849&r1=1843848&r2=1843849&view=diff
==============================================================================
--- webservices/axiom/trunk/apidocs/pom.xml (original)
+++ webservices/axiom/trunk/apidocs/pom.xml Sun Oct 14 16:37:19 2018
@@ -96,9 +96,6 @@
</execution>
</executions>
<configuration>
- <additionalOptions>
- <additionalOption>${jigsawArgs}</additionalOption>
- </additionalOptions>
<includeDependencySources>true</includeDependencySources>
<dependencySourceIncludes>
<dependencySourceInclude>${project.groupId}:*</dependencySourceInclude>
Modified: webservices/axiom/trunk/axiom-api/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/pom.xml?rev=1843849&r1=1843848&r2=1843849&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/pom.xml (original)
+++ webservices/axiom/trunk/axiom-api/pom.xml Sun Oct 14 16:37:19 2018
@@ -53,6 +53,10 @@
<artifactId>apache-mime4j-core</artifactId>
</dependency>
<dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
@@ -123,6 +127,11 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Modified: webservices/axiom/trunk/axiom-compat/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-compat/pom.xml?rev=1843849&r1=1843848&r2=1843849&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-compat/pom.xml (original)
+++ webservices/axiom/trunk/axiom-compat/pom.xml Sun Oct 14 16:37:19 2018
@@ -90,6 +90,11 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Modified: webservices/axiom/trunk/axiom-jaxb/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-jaxb/pom.xml?rev=1843849&r1=1843848&r2=1843849&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-jaxb/pom.xml (original)
+++ webservices/axiom/trunk/axiom-jaxb/pom.xml Sun Oct 14 16:37:19 2018
@@ -39,6 +39,10 @@
<artifactId>axiom-api</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
</dependencies>
<build>
Modified: webservices/axiom/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/pom.xml?rev=1843849&r1=1843848&r2=1843849&view=diff
==============================================================================
--- webservices/axiom/trunk/pom.xml (original)
+++ webservices/axiom/trunk/pom.xml Sun Oct 14 16:37:19 2018
@@ -458,12 +458,6 @@
<groupId>com.sun.xml.messaging.saaj</groupId>
<artifactId>saaj-impl</artifactId>
<version>1.3.10</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.soap</groupId>
- <artifactId>saaj-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
@@ -515,6 +509,41 @@
<artifactId>asm</artifactId>
<version>5.2</version>
</dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ <version>1.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
+ <version>1.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.jws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ <version>1.0-MR1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>2.3.1</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -551,7 +580,7 @@
the data instead of loading it into memory). Obviously, the execution time of
these tests also are proportional to the heap size. To accelerate the execution
of the tests, we should use a heap size as small as possible. -->
- <argLine>-Xms16m -Xmx48m ${jacoco.surefireArgLine} ${securityManagerArgs} ${jigsawArgs}</argLine>
+ <argLine>-Xms16m -Xmx48m ${jacoco.surefireArgLine} ${securityManagerArgs}</argLine>
<trimStackTrace>false</trimStackTrace>
<systemProperties>
<property>
@@ -905,9 +934,6 @@
println 'Disabling JaCoCo because tests are skipped'
project.properties['skipJacoco'] = 'true'
}
-
-
- project.properties['jigsawArgs'] = System.properties['java.specification.version'].startsWith('1.') ? '' : '--add-modules java.se.ee'
]]></script>
</scripts>
</configuration>
@@ -1262,7 +1288,6 @@
</goals>
<configuration>
<additionalOptions>
- <additionalOption>${jigsawArgs}</additionalOption>
<additionalOption>-Xdoclint:none</additionalOption>
</additionalOptions>
</configuration>
Modified: webservices/axiom/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/samples/pom.xml?rev=1843849&r1=1843848&r2=1843849&view=diff
==============================================================================
--- webservices/axiom/trunk/samples/pom.xml (original)
+++ webservices/axiom/trunk/samples/pom.xml Sun Oct 14 16:37:19 2018
@@ -66,10 +66,31 @@
<scope>test</scope>
</dependency>
- <!-- We could use the JAX-WS implementation in the JRE. However, in some
- Java versions the MTOM support seems to be broken (or at least to have
- to behave differently). To avoid that problem, we use CXF as the JAX-WS
- implementation. -->
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.jws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
Modified: webservices/axiom/trunk/systests/eclipse-tests/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/eclipse-tests/pom.xml?rev=1843849&r1=1843848&r2=1843849&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/eclipse-tests/pom.xml (original)
+++ webservices/axiom/trunk/systests/eclipse-tests/pom.xml Sun Oct 14 16:37:19 2018
@@ -67,6 +67,11 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>osgi.bundle</groupId>
Modified: webservices/axiom/trunk/systests/osgi-tests/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/osgi-tests/pom.xml?rev=1843849&r1=1843848&r2=1843849&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/osgi-tests/pom.xml (original)
+++ webservices/axiom/trunk/systests/osgi-tests/pom.xml Sun Oct 14 16:37:19 2018
@@ -56,6 +56,11 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -135,6 +140,16 @@
<artifactId>org.apache.servicemix.bundles.jaxp-ri</artifactId>
<version>1.4.5_1</version>
</artifact>
+ <artifact>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
+ <version>2.0.0</version>
+ </artifact>
+ <artifact>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
+ <version>2.1.13_2</version>
+ </artifact>
</artifacts>
</configuration>
</execution>
Modified: webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/BlueprintTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/BlueprintTest.java?rev=1843849&r1=1843848&r2=1843849&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/BlueprintTest.java (original)
+++ webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/BlueprintTest.java Sun Oct 14 16:37:19 2018
@@ -42,6 +42,7 @@ public class BlueprintTest {
url("link:classpath:org.apache.aries.proxy.api.link"),
url("link:classpath:org.apache.aries.proxy.link"),
url("link:classpath:org.apache.aries.blueprint.core.link"),
+ url("link:classpath:com.sun.activation.javax.activation.link"),
url("link:classpath:org.apache.james.apache-mime4j-core.link"),
url("link:classpath:org.apache.ws.commons.axiom.axiom-api.link"),
url("link:classpath:org.apache.ws.commons.axiom.axiom-dom.link"),
Modified: webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/FactoryTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/FactoryTest.java?rev=1843849&r1=1843848&r2=1843849&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/FactoryTest.java (original)
+++ webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/FactoryTest.java Sun Oct 14 16:37:19 2018
@@ -51,6 +51,7 @@ public class FactoryTest {
url("link:classpath:org.apache.servicemix.specs.stax-api-1.0.link"),
url("link:classpath:stax2-api.link"),
url("link:classpath:woodstox-core-asl.link"),
+ url("link:classpath:com.sun.activation.javax.activation.link"),
url("link:classpath:org.apache.james.apache-mime4j-core.link"),
url("link:classpath:org.apache.ws.commons.axiom.axiom-api.link"),
url("link:classpath:org.apache.ws.commons.axiom.axiom-impl.link"),
Modified: webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/JAXBTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/JAXBTest.java?rev=1843849&r1=1843848&r2=1843849&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/JAXBTest.java (original)
+++ webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/JAXBTest.java Sun Oct 14 16:37:19 2018
@@ -18,6 +18,7 @@
*/
package org.apache.axiom.test;
+import static org.apache.axiom.test.Utils.filteredSystemPackages;
import static org.ops4j.pax.exam.CoreOptions.junitBundles;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.url;
@@ -47,10 +48,17 @@ public class JAXBTest {
@Configuration
public static Option[] configuration() {
return options(
+ url("link:classpath:com.sun.activation.javax.activation.link"),
+ url("link:classpath:org.apache.servicemix.specs.stax-api-1.0.link"),
+ url("link:classpath:stax2-api.link"),
+ url("link:classpath:woodstox-core-asl.link"),
url("link:classpath:org.apache.james.apache-mime4j-core.link"),
url("link:classpath:org.apache.ws.commons.axiom.axiom-api.link"),
url("link:classpath:org.apache.ws.commons.axiom.axiom-impl.link"),
+ url("link:classpath:org.apache.servicemix.specs.jaxb-api-2.1.link"),
+ url("link:classpath:org.apache.servicemix.bundles.jaxb-impl.link"),
url("link:classpath:org.apache.ws.commons.axiom.axiom-jaxb.link"),
+ filteredSystemPackages("javax.xml.stream"),
junitBundles());
}
Modified: webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/SJSXPTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/SJSXPTest.java?rev=1843849&r1=1843848&r2=1843849&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/SJSXPTest.java (original)
+++ webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/SJSXPTest.java Sun Oct 14 16:37:19 2018
@@ -51,6 +51,7 @@ public class SJSXPTest {
return options(
url("link:classpath:org.apache.servicemix.specs.stax-api-1.0.link"),
url("link:classpath:org.apache.servicemix.bundles.jaxp-ri.link"),
+ url("link:classpath:com.sun.activation.javax.activation.link"),
url("link:classpath:org.apache.james.apache-mime4j-core.link"),
url("link:classpath:org.apache.ws.commons.axiom.axiom-api.link"),
url("link:classpath:org.apache.ws.commons.axiom.axiom-impl.link"),
Modified: webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/SystemDepsTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/SystemDepsTest.java?rev=1843849&r1=1843848&r2=1843849&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/SystemDepsTest.java (original)
+++ webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/SystemDepsTest.java Sun Oct 14 16:37:19 2018
@@ -44,6 +44,7 @@ public class SystemDepsTest {
@Configuration
public static Option[] configuration() {
return options(
+ url("link:classpath:com.sun.activation.javax.activation.link"),
url("link:classpath:org.apache.james.apache-mime4j-core.link"),
url("link:classpath:org.apache.ws.commons.axiom.axiom-api.link"),
url("link:classpath:org.apache.ws.commons.axiom.axiom-impl.link"),
Modified: webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/UsesConstraintsTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/UsesConstraintsTest.java?rev=1843849&r1=1843848&r2=1843849&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/UsesConstraintsTest.java (original)
+++ webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/UsesConstraintsTest.java Sun Oct 14 16:37:19 2018
@@ -105,6 +105,7 @@ public class UsesConstraintsTest {
bundles.add(context.installBundle("link:classpath:org.apache.servicemix.specs.stax-api-1.0.link"));
bundles.add(context.installBundle("link:classpath:stax2-api.link"));
bundles.add(context.installBundle("link:classpath:woodstox-core-asl.link"));
+ bundles.add(context.installBundle("link:classpath:com.sun.activation.javax.activation.link"));
bundles.add(context.installBundle("link:classpath:org.apache.james.apache-mime4j-core.link"));
bundles.add(context.installBundle("link:classpath:org.apache.ws.commons.axiom.axiom-api.link"));
// This bundle will be wired to the javax.xml.stream package exported by the ServiceMix stax-api bundle.
Modified: webservices/axiom/trunk/testing/axiom-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/pom.xml?rev=1843849&r1=1843848&r2=1843849&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/pom.xml (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/pom.xml Sun Oct 14 16:37:19 2018
@@ -106,6 +106,18 @@
<artifactId>core-streams</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ </dependency>
</dependencies>
<build>
Modified: webservices/axiom/trunk/testing/spring-ws-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/spring-ws-testsuite/pom.xml?rev=1843849&r1=1843848&r2=1843849&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/spring-ws-testsuite/pom.xml (original)
+++ webservices/axiom/trunk/testing/spring-ws-testsuite/pom.xml Sun Oct 14 16:37:19 2018
@@ -94,11 +94,24 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>org.springframework.ws</groupId>
<artifactId>spring-ws-security</artifactId>
</dependency>
<dependency>
- <!-- Need this because the SAAJ implementation in Java 1.6 has an issue (probably SAAJ-37). -->
<groupId>com.sun.xml.messaging.saaj</groupId>
<artifactId>saaj-impl</artifactId>
</dependency>
Modified: webservices/axiom/trunk/testing/testutils/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/testutils/pom.xml?rev=1843849&r1=1843848&r2=1843849&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/testutils/pom.xml (original)
+++ webservices/axiom/trunk/testing/testutils/pom.xml Sun Oct 14 16:37:19 2018
@@ -52,5 +52,9 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ </dependency>
</dependencies>
</project>