Author: rmannibucau
Date: Wed May 15 09:33:03 2019
New Revision: 1859281
URL: http://svn.apache.org/viewvc?rev=1859281&view=rev
Log:
MEECROWAVE-192 tomcat upgrade to 9.0.20
Modified:
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
openwebbeans/meecrowave/trunk/pom.xml
Modified:
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
URL:
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java?rev=1859281&r1=1859280&r2=1859281&view=diff
==============================================================================
---
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
(original)
+++
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
Wed May 15 09:33:03 2019
@@ -119,7 +119,6 @@ import org.apache.meecrowave.service.Val
import org.apache.meecrowave.tomcat.CDIInstanceManager;
import org.apache.meecrowave.tomcat.LoggingAccessLogPattern;
import org.apache.meecrowave.tomcat.MeecrowaveContextConfig;
-import org.apache.meecrowave.tomcat.NoDescriptorRegistry;
import org.apache.meecrowave.tomcat.OWBJarScanner;
import org.apache.meecrowave.tomcat.ProvidedLoader;
import org.apache.meecrowave.tomcat.TomcatAutoInitializer;
@@ -868,12 +867,8 @@ public class Meecrowave implements AutoC
}
private void setupJmx(final boolean skip) {
- try {
- final Field registry = Registry.class.getDeclaredField("registry");
- registry.setAccessible(true);
- registry.set(null, skip ? new NoDescriptorRegistry() : new
Registry());
- } catch (final Exception e) {
- throw new IllegalStateException(e);
+ if (skip) {
+ Registry.disableRegistry();
}
}
Modified: openwebbeans/meecrowave/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/pom.xml?rev=1859281&r1=1859280&r2=1859281&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/pom.xml (original)
+++ openwebbeans/meecrowave/trunk/pom.xml Wed May 15 09:33:03 2019
@@ -50,7 +50,7 @@
<meecrowave.build.name>${project.groupId}.${project.artifactId}</meecrowave.build.name>
<junit.version>4.12</junit.version>
- <tomcat.version>9.0.19</tomcat.version>
+ <tomcat.version>9.0.20</tomcat.version>
<openwebbeans.version>2.0.10</openwebbeans.version>
<cxf.version>3.3.2</cxf.version>
<johnzon.version>1.1.10</johnzon.version>
