TOMEE-2808 update to Johnzon 1.2.4
diff --git a/pom.xml b/pom.xml
index 70c527e..de592d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,7 +117,7 @@
<openjpa.version>3.1.0</openjpa.version>
<openwebbeans.version>2.0.12</openwebbeans.version>
<jcs.version>2.1</jcs.version>
- <johnzon.version>1.1.13</johnzon.version>
+ <johnzon.version>1.2.4</johnzon.version>
<!-- Maven module versions -->
<maven-bundle-plugin.version>3.3.0</maven-bundle-plugin.version>
@@ -225,8 +225,8 @@
<microprofile.metrics.impl.version>1.0.2</microprofile.metrics.impl.version>
<microprofile.rest-client.version>1.3.3</microprofile.rest-client.version>
<microprofile.rest-client.impl.version>${cxf.version}</microprofile.rest-client.impl.version>
- <microprofile.openapi.version>1.0.1</microprofile.openapi.version>
- <microprofile.openapi.impl.version>1.0.6</microprofile.openapi.impl.version>
+ <microprofile.openapi.version>1.1.2</microprofile.openapi.version>
+ <microprofile.openapi.impl.version>1.0.12</microprofile.openapi.impl.version>
<microprofile.opentracing.version>1.1.2</microprofile.opentracing.version>
<microprofile.opentracing.impl.version>1.0.0</microprofile.opentracing.impl.version>
<opentracing.api>0.31.0</opentracing.api>
diff --git a/tck/microprofile-tck/openapi/src/test/resources/arquillian.xml b/tck/microprofile-tck/openapi/src/test/resources/arquillian.xml
index 6b3b59a..669ed09 100644
--- a/tck/microprofile-tck/openapi/src/test/resources/arquillian.xml
+++ b/tck/microprofile-tck/openapi/src/test/resources/arquillian.xml
@@ -31,6 +31,9 @@
<property name="dir">target/tomee</property>
<property name="appWorkingDir">target/workdir</property>
<property name="cleanOnStartUp">true</property>
+ <property name="properties">
+ geronimo.openapi.application.append-context-path = false
+ </property>
</configuration>
</container>
<container qualifier="tomee-plus">
@@ -45,6 +48,7 @@
<property name="cleanOnStartUp">true</property>
<property name="properties">
tomee.mp.scan = all
+ geronimo.openapi.application.append-context-path = false
</property>
</configuration>
</container>
@@ -60,6 +64,7 @@
<property name="cleanOnStartUp">true</property>
<property name="properties">
tomee.mp.scan = all
+ geronimo.openapi.application.append-context-path = false
</property>
</configuration>
</container>
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
index 493cb90..f5da4f9 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
@@ -36,6 +36,7 @@
import org.apache.catalina.WebResourceRoot;
import org.apache.catalina.WebResourceSet;
import org.apache.catalina.Wrapper;
+import org.apache.catalina.connector.Request;
import org.apache.catalina.core.ContainerBase;
import org.apache.catalina.core.NamingContextListener;
import org.apache.catalina.core.StandardContext;
@@ -1780,10 +1781,18 @@
for (final WebAppInfo webAppInfo : contextInfo.appInfo.webApps) {
final String wId = getId(webAppInfo.host, webAppInfo.contextRoot, contextInfo.version);
if (id.equals(wId)) {
+ // Allow any post-deployment to happen without the RequestContext of a call to /tomee/ejb
+ final Request request = OpenEJBSecurityListener.requests.get();
+ OpenEJBSecurityListener.requests.remove();
+
SystemInstance.get().fireEvent(
new AfterApplicationCreated(contextInfo.appInfo,
webAppInfo,
standardContext.getServletContext()));
+
+ if (request != null) {
+ OpenEJBSecurityListener.requests.set(request);
+ }
break;
}
}
