You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rz...@apache.org on 2022/03/24 06:37:35 UTC
[tomee] 03/05: Minor: Adjusts JUnit5 Simple Websockets with Arquillian for EE9
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit ea44e85b90491699d8de366ebbd30d4a5a12bcc2
Author: Richard Zowalla <rz...@apache.org>
AuthorDate: Thu Mar 24 07:32:34 2022 +0100
Minor: Adjusts JUnit5 Simple Websockets with Arquillian for EE9
---
.../README.adoc | 2 +-
.../junit5-arquillian-simple-websockets/pom.xml | 26 +++++-----------------
.../src/main/resources/META-INF/beans.xml | 5 +++--
.../src/main/webapp/WEB-INF/web.xml | 5 +++--
4 files changed, 12 insertions(+), 26 deletions(-)
diff --git a/examples/junit5-arquillian-simple-websockets/README.adoc b/examples/junit5-arquillian-simple-websockets/README.adoc
index d4e66c4..e00afba 100644
--- a/examples/junit5-arquillian-simple-websockets/README.adoc
+++ b/examples/junit5-arquillian-simple-websockets/README.adoc
@@ -8,7 +8,7 @@
A simple Websocket example project.
-This was originally created for TomEE 8.0.7 using Jave EE 8 and Websocket
+This was originally created for TomEE 9.0.0-SNAPSHOT using Jakarta EE 9 and Websocket
API 1.1.
The example was created with a server to server typo of connection in
diff --git a/examples/junit5-arquillian-simple-websockets/pom.xml b/examples/junit5-arquillian-simple-websockets/pom.xml
index 68c0fed..bfae662 100644
--- a/examples/junit5-arquillian-simple-websockets/pom.xml
+++ b/examples/junit5-arquillian-simple-websockets/pom.xml
@@ -26,11 +26,11 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
- <tomcat.version>9.0.43</tomcat.version>
+ <tomcat.version>10.0.16</tomcat.version>
- <junit.jupiter.version>5.8.0-M1</junit.jupiter.version>
+ <junit.jupiter.version>5.8.2</junit.jupiter.version>
<!-- version >= 1.7.0.Alpha5 is required for JUnit5 -->
- <arquillian.version>1.7.0.Alpha9</arquillian.version>
+ <arquillian.version>1.7.0.Alpha10</arquillian.version>
</properties>
<build>
@@ -47,8 +47,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>11</source>
+ <target>11</target>
</configuration>
</plugin>
<plugin>
@@ -56,22 +56,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
</plugin>
- <plugin>
- <groupId>org.tomitribe.transformer</groupId>
- <artifactId>org.eclipse.transformer.maven</artifactId>
- <version>0.1.1a</version>
- <configuration>
- <classifier>jakartaee9</classifier>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
<repositories>
diff --git a/examples/junit5-arquillian-simple-websockets/src/main/resources/META-INF/beans.xml b/examples/junit5-arquillian-simple-websockets/src/main/resources/META-INF/beans.xml
index 1729372..91cf16b 100644
--- a/examples/junit5-arquillian-simple-websockets/src/main/resources/META-INF/beans.xml
+++ b/examples/junit5-arquillian-simple-websockets/src/main/resources/META-INF/beans.xml
@@ -16,6 +16,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<beans xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"
+ bean-discovery-mode="annotated">
</beans>
\ No newline at end of file
diff --git a/examples/junit5-arquillian-simple-websockets/src/main/webapp/WEB-INF/web.xml b/examples/junit5-arquillian-simple-websockets/src/main/webapp/WEB-INF/web.xml
index 72612f9..264dee1 100644
--- a/examples/junit5-arquillian-simple-websockets/src/main/webapp/WEB-INF/web.xml
+++ b/examples/junit5-arquillian-simple-websockets/src/main/webapp/WEB-INF/web.xml
@@ -16,9 +16,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
+<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"
+ version="5.0">
<display-name>TomEE :: Examples :: JUnit5 :: Simple Websockets with Arquillian</display-name>