Merge branch 'master' of github.com:apache/tomee-tck
diff --git a/pom.xml b/pom.xml
index 0bab037..382aea7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -870,6 +870,7 @@
<include name="openejb-loader*.jar"/>
<include name="openejb-javaagent*.jar"/>
<include name="openejb-jee*.jar"/>
+ <include name="openejb-cxf*.jar"/>
<include name="jaxb-runtime*.jar"/>
<include name="jakarta.xml.bind-api*.jar"/>
<include name="jakarta.activation*.jar"/>
@@ -890,6 +891,7 @@
<include name="jackson-databind*.jar"/>
<include name="jackson-annotations*.jar"/>
<include name="jackson-core*.jar"/>
+ <include name="johnzon*.jar"/>
<include name="geronimo-javamail*.jar"/>
<include name="xbean-asm*.jar"/>
<include name="xbean-finder*.jar"/>
diff --git a/src/test/tomee-plume/conf/tomcat-users.xml b/src/test/tomee-plume/conf/tomcat-users.xml
index 3bc8788..7de2b4f 100644
--- a/src/test/tomee-plume/conf/tomcat-users.xml
+++ b/src/test/tomee-plume/conf/tomcat-users.xml
@@ -23,7 +23,7 @@
<user name="javee_vi" password="javaee_vi" roles="staff"/>
<user name="javajoe" password="javajoe" roles="Manager,Employee,guest"/>
<user name="javaee" password="javaee" roles="Administrator,Employee,mgr,asadmin"/>
- <user name="j2ee" password="j2ee" roles="Administrator,Employee,mgr,asadmin"/>
+ <user name="j2ee" password="j2ee" roles="Administrator,Employee,mgr,asadmin,staff"/>
<user name="CN=CTS, OU=Java Software, O=Sun Microsystems Inc., L=Burlington, ST=MA, C=US" roles="Administrator"/>
</tomcat-users>
