[tomee] branch master updated: TOMEE-3865 Upgrade Arquillian default configuration to use Servlet 5.0 protocol

[jlmonteiro]

This is an automated email from the ASF dual-hosted git repository.

jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git


The following commit(s) were added to refs/heads/master by this push:
     new 0125401  TOMEE-3865 Upgrade Arquillian default configuration to use 
Servlet 5.0 protocol
0125401 is described below

commit 0125401b011824b87921cfb92ba71b57cbd7f767
Author: Jean-Louis Monteiro <jlmonte...@tomitribe.com>
AuthorDate: Thu Mar 24 07:04:29 2022 +0100

    TOMEE-3865 Upgrade Arquillian default configuration to use Servlet 5.0 
protocol
---
 .../java/org/apache/openejb/arquillian/common/TomEEConfiguration.java   | 2 +-
 tck/bval-tomee/src/test/resources/arquillian.xml                        | 1 -
 tck/cdi-tomee/src/test/resources/arquillian.xml                         | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git 
a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
 
b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
index 6a2464a..9e87c9f 100644
--- 
a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
+++ 
b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
@@ -53,7 +53,7 @@ public class TomEEConfiguration implements 
ContainerConfiguration {
     protected boolean keepServerXmlAsThis;
     protected boolean singleDumpByArchiveName;
     protected Collection<String> singleDeploymentByArchiveName = 
Collections.emptyList();
-    private String arquillianProtocol = "Servlet 2.5";
+    private String arquillianProtocol = "Servlet 5.0";
 
     public String getArquillianProtocol() {
         return arquillianProtocol;
diff --git a/tck/bval-tomee/src/test/resources/arquillian.xml 
b/tck/bval-tomee/src/test/resources/arquillian.xml
index 3e26eec..1f4c463 100644
--- a/tck/bval-tomee/src/test/resources/arquillian.xml
+++ b/tck/bval-tomee/src/test/resources/arquillian.xml
@@ -29,7 +29,6 @@
       <property name="stopPort">-1</property>
       <property name="ajpPort">-1</property>
       <property name="dir">target/tomee-tck</property>
-      <property name="arquillianProtocol">Servlet 5.0</property>
       <property name="appWorkingDir">target/tck-workdir</property>
       <property name="simpleLog">true</property>
       <property name="properties">
diff --git a/tck/cdi-tomee/src/test/resources/arquillian.xml 
b/tck/cdi-tomee/src/test/resources/arquillian.xml
index d791381..0374251 100644
--- a/tck/cdi-tomee/src/test/resources/arquillian.xml
+++ b/tck/cdi-tomee/src/test/resources/arquillian.xml
@@ -29,7 +29,6 @@
       <property name="classifier">plus</property>
       <property name="conf">src/test/conf</property>
       <property name="dir">target/tomee</property>
-      <property name="arquillianProtocol">Servlet 5.0</property>
       <property name="appWorkingDir">target/workdir</property>
       <property name="cleanOnStartUp">true</property>
       <property name="catalina_opts">${tomee.opts}</property>