This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a commit to branch java11-take2 in repository https://gitbox.apache.org/repos/asf/tomee.git
commit eeb7fd11a8bcd9118bff915b745ab10f8ef869da Author: Jean-Louis Monteiro <[email protected]> AuthorDate: Thu Jul 25 15:13:56 2019 +0200 attempt to fix arquillian tests by adding missing libraries to tomee distro --- .../src/test/resources/arquillian.xml | 3 ++ .../arquillian-tomee-jaxrs-tests/pom.xml | 62 ++++++++++++++++++++++ .../src/test/resources/arquillian.xml | 9 ++++ .../arquillian-tomee-jaxws-tests/pom.xml | 59 ++++++++++++++++++++ .../src/test/resources/arquillian.xml | 9 ++++ .../arquillian-tomee-webprofile-tests/pom.xml | 59 ++++++++++++++++++++ .../src/test/resources/arquillian.xml | 12 +++++ pom.xml | 16 ++++-- tomee/apache-tomee/pom.xml | 4 +- 9 files changed, 228 insertions(+), 5 deletions(-) diff --git a/arquillian/arquillian-tomee-moviefun-example/src/test/resources/arquillian.xml b/arquillian/arquillian-tomee-moviefun-example/src/test/resources/arquillian.xml index 31635f4..95c7a90 100644 --- a/arquillian/arquillian-tomee-moviefun-example/src/test/resources/arquillian.xml +++ b/arquillian/arquillian-tomee-moviefun-example/src/test/resources/arquillian.xml @@ -28,6 +28,9 @@ <property name="openejbVersion">${tomee.version}</property> <property name="dir">target/apache-tomee-remote</property> <property name="appWorkingDir">target/arquillian-test-working-dir</property> + <property name="additionalLibs"> + ${java11.additionalLibs} + </property> </configuration> </container> diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/pom.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/pom.xml index f4e1480..eaba8f1 100644 --- a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/pom.xml +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/pom.xml @@ -45,4 +45,66 @@ <properties> <profile-under-test>webprofile</profile-under-test> </properties> + + <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + </testResource> + </testResources> + </build> + + <profiles> + <profile> + <id>active-on-jdk-11</id> + <activation> + <jdk>11</jdk> + </activation> + <dependencies> + <!-- CXF does not support 4.1 that comes with Sun WS implementation --> + <dependency> + <groupId>org.codehaus.woodstox</groupId> + <artifactId>stax2-api</artifactId> + <!--<version>4.1</version>--> + <version>3.1.4</version> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jaxb_2.2_spec</artifactId> + <version>1.0.1</version> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <version>2.3.2</version> + <exclusions> + <exclusion> <!-- Is already included in java-ee-api --> + <groupId>jakarta.activation</groupId> + <artifactId>jakarta.activation-api</artifactId> + </exclusion> + <exclusion> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.glassfish.corba</groupId> + <artifactId>glassfish-corba-omgapi</artifactId> + <version>4.2.1</version> + </dependency> + <dependency> + <groupId>com.sun.xml.ws</groupId> + <artifactId>jaxws-rt</artifactId> + <version>2.3.2</version> + </dependency> + <dependency> + <groupId>com.sun.xml.messaging.saaj</groupId> + <artifactId>saaj-impl</artifactId> + <version>1.4.0-b03</version> + </dependency> + </dependencies> + </profile> + </profiles> </project> diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/resources/arquillian.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/resources/arquillian.xml index 71e9ba0..887216b 100644 --- a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/resources/arquillian.xml +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/resources/arquillian.xml @@ -39,6 +39,9 @@ <property name="stopPort">-1</property> <property name="dir">target/apache-tomee-remote</property> <property name="appWorkingDir">target/arquillian-test-working-dir</property> + <property name="additionalLibs"> + ${java11.additionalLibs} + </property> <property name="properties"> My\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb @@ -53,6 +56,9 @@ <property name="stopPort">-1</property> <property name="dir">target/apache-tomee-remote</property> <property name="appWorkingDir">target/arquillian-test-working-dir</property> + <property name="additionalLibs"> + ${java11.additionalLibs} + </property> <property name="properties"> My\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb @@ -68,6 +74,9 @@ <property name="stopPort">-1</property> <property name="dir">target/apache-tomee-remote</property> <property name="appWorkingDir">target/arquillian-test-working-dir</property> + <property name="additionalLibs"> + ${java11.additionalLibs} + </property> <property name="properties"> My\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/pom.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/pom.xml index 6659860..9f0b172 100644 --- a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/pom.xml +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/pom.xml @@ -41,6 +41,12 @@ </properties> <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + </testResource> + </testResources> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -67,4 +73,57 @@ </plugin> </plugins> </build> + + <profiles> + <profile> + <id>active-on-jdk-11</id> + <activation> + <jdk>11</jdk> + </activation> + <dependencies> + <!-- CXF does not support 4.1 that comes with Sun WS implementation --> + <dependency> + <groupId>org.codehaus.woodstox</groupId> + <artifactId>stax2-api</artifactId> + <!--<version>4.1</version>--> + <version>3.1.4</version> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jaxb_2.2_spec</artifactId> + <version>1.0.1</version> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <version>2.3.2</version> + <exclusions> + <exclusion> <!-- Is already included in java-ee-api --> + <groupId>jakarta.activation</groupId> + <artifactId>jakarta.activation-api</artifactId> + </exclusion> + <exclusion> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.glassfish.corba</groupId> + <artifactId>glassfish-corba-omgapi</artifactId> + <version>4.2.1</version> + </dependency> + <dependency> + <groupId>com.sun.xml.ws</groupId> + <artifactId>jaxws-rt</artifactId> + <version>2.3.2</version> + </dependency> + <dependency> + <groupId>com.sun.xml.messaging.saaj</groupId> + <artifactId>saaj-impl</artifactId> + <version>1.4.0-b03</version> + </dependency> + </dependencies> + </profile> + </profiles> </project> diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/resources/arquillian.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/resources/arquillian.xml index bac5665..3e95c88 100644 --- a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/resources/arquillian.xml +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/resources/arquillian.xml @@ -39,6 +39,9 @@ <property name="stopPort">-1</property> <property name="dir">target/apache-tomee-remote</property> <property name="appWorkingDir">target/arquillian-test-working-dir</property> + <property name="additionalLibs"> + ${java11.additionalLibs} + </property> <property name="properties"> My\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb @@ -53,6 +56,9 @@ <property name="stopPort">-1</property> <property name="dir">target/apache-tomee-remote</property> <property name="appWorkingDir">target/arquillian-test-working-dir</property> + <property name="additionalLibs"> + ${java11.additionalLibs} + </property> <property name="properties"> My\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb @@ -68,6 +74,9 @@ <property name="stopPort">-1</property> <property name="dir">target/apache-tomee-remote</property> <property name="appWorkingDir">target/arquillian-test-working-dir</property> + <property name="additionalLibs"> + ${java11.additionalLibs} + </property> <property name="properties"> My\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml index cf92e2e..4278463 100644 --- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml @@ -48,6 +48,12 @@ </dependencies> <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + </testResource> + </testResources> <plugins> <plugin> <groupId>org.apache.openjpa</groupId> @@ -94,4 +100,57 @@ </plugin> </plugins> </build> + + <profiles> + <profile> + <id>active-on-jdk-11</id> + <activation> + <jdk>11</jdk> + </activation> + <dependencies> + <!-- CXF does not support 4.1 that comes with Sun WS implementation --> + <dependency> + <groupId>org.codehaus.woodstox</groupId> + <artifactId>stax2-api</artifactId> + <!--<version>4.1</version>--> + <version>3.1.4</version> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jaxb_2.2_spec</artifactId> + <version>1.0.1</version> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <version>2.3.2</version> + <exclusions> + <exclusion> <!-- Is already included in java-ee-api --> + <groupId>jakarta.activation</groupId> + <artifactId>jakarta.activation-api</artifactId> + </exclusion> + <exclusion> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.glassfish.corba</groupId> + <artifactId>glassfish-corba-omgapi</artifactId> + <version>4.2.1</version> + </dependency> + <dependency> + <groupId>com.sun.xml.ws</groupId> + <artifactId>jaxws-rt</artifactId> + <version>2.3.2</version> + </dependency> + <dependency> + <groupId>com.sun.xml.messaging.saaj</groupId> + <artifactId>saaj-impl</artifactId> + <version>1.4.0-b03</version> + </dependency> + </dependencies> + </profile> + </profiles> </project> \ No newline at end of file diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/arquillian.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/arquillian.xml index eb1807a..10607d8 100644 --- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/arquillian.xml +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/arquillian.xml @@ -100,6 +100,9 @@ <property name="appWorkingDir">target/arquillian-remote-working-dir</property> <property name="portRange">33001-36000</property> <property name="cleanOnStartUp">true</property> + <property name="additionalLibs"> + ${java11.additionalLibs} + </property> <property name="properties"> My\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb @@ -122,6 +125,9 @@ <property name="appWorkingDir">target/arquillian-remote-working-dir</property> <property name="portRange">33001-36000</property> <property name="cleanOnStartUp">true</property> + <property name="additionalLibs"> + ${java11.additionalLibs} + </property> <property name="properties"> My\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb @@ -144,6 +150,9 @@ <property name="appWorkingDir">target/arquillian-remote-working-dir</property> <property name="portRange">33001-36000</property> <property name="cleanOnStartUp">true</property> + <property name="additionalLibs"> + ${java11.additionalLibs} + </property> <property name="properties"> My\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb @@ -166,6 +175,9 @@ <property name="dir">target/tomee-webapp</property> <property name="appWorkingDir">target/arquillian-webapp-working-dir</property> <property name="portRange">36001-40000</property> + <property name="additionalLibs"> + ${java11.additionalLibs} + </property> <property name="properties"> My\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb diff --git a/pom.xml b/pom.xml index 211570a..138b0d0 100644 --- a/pom.xml +++ b/pom.xml @@ -225,6 +225,9 @@ <javadoc.version>3.0.1</javadoc.version> <asciidoclet.version>1.5.0</asciidoclet.version> + <!-- by default it's fine, see profile bellow --> + <java11.additionalLibs/> + </properties> <build> @@ -564,9 +567,16 @@ <activation> <jdk>11</jdk> </activation> - <!--<properties>--> - <!--<surefire.argline>-Duser.language=en -Duser.region=US --add-opens java.base/jdk.internal.loader=ALL-UNNAMED</surefire.argline>--> - <!--</properties>--> + <properties> + <java11.additionalLibs> + mvn:org.codehaus.woodstox:stax-api:4.1.4 + mvn:org.apache.geronimo.specs:geronimo-jaxb_2.2_spec:1.0.1 + mvn:org.glassfish.jaxb:jaxb-runtime:2.3.2 + mvn:org.glassfish.corba:glassfish-corba-omgapi:4.2.1 + mvn:com.sun.xml.ws:jaxws-rt:2.3.2 + mvn:com.sun.xml.messaging.saaj:saaj-impl:1.4.0-b03 + </java11.additionalLibs> + </properties> </profile> <profile> <id>main</id> diff --git a/tomee/apache-tomee/pom.xml b/tomee/apache-tomee/pom.xml index bcb4ac1..34c23dd 100644 --- a/tomee/apache-tomee/pom.xml +++ b/tomee/apache-tomee/pom.xml @@ -292,8 +292,8 @@ <version>2.3.2</version> <exclusions> <exclusion> <!-- Is already included in java-ee-api --> - <artifactId>jakarta.activation</artifactId> - <groupId>jakarta.activation-api</groupId> + <groupId>jakarta.activation</groupId> + <artifactId>jakarta.activation-api</artifactId> </exclusion> </exclusions> </dependency>
