You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by rm...@apache.org on 2020/03/17 14:22:39 UTC
[openwebbeans-meecrowave] branch master updated: MEECROWAVE-236
MEECROWAVE-237 Tomcat 9.0.33 and Log4j2 2.13.1
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwebbeans-meecrowave.git
The following commit(s) were added to refs/heads/master by this push:
new 2da97e1 MEECROWAVE-236 MEECROWAVE-237 Tomcat 9.0.33 and Log4j2 2.13.1
2da97e1 is described below
commit 2da97e168fa40084f43c8d258f01a615f708bf8d
Author: Romain Manni-Bucau <rm...@gmail.com>
AuthorDate: Tue Mar 17 15:22:34 2020 +0100
MEECROWAVE-236 MEECROWAVE-237 Tomcat 9.0.33 and Log4j2 2.13.1
---
.../src/main/java/org/apache/meecrowave/Meecrowave.java | 13 +------------
meecrowave-gradle-plugin/pom.xml | 2 +-
pom.xml | 4 ++--
3 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java b/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
index 683e44f..450cd79 100644
--- a/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
+++ b/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
@@ -378,18 +378,7 @@ public class Meecrowave implements AutoCloseable {
ctx.setSessionTimeout(configuration.getWebSessionTimeout() != null ? configuration.getWebSessionTimeout() : 30);
ctx.addWelcomeFile("index.html");
ctx.addWelcomeFile("index.htm");
- try {
- final Field mimesField = Tomcat.class.getDeclaredField("DEFAULT_MIME_MAPPINGS");
- if (!mimesField.isAccessible()) {
- mimesField.setAccessible(true);
- }
- final String[] defaultMimes = String[].class.cast(mimesField.get(null));
- for (int i = 0; i < defaultMimes.length; ) {
- ctx.addMimeMapping(defaultMimes[i++], defaultMimes[i++]);
- }
- } catch (final NoSuchFieldException | IllegalAccessException e) {
- throw new IllegalStateException("Incompatible Tomcat", e);
- }
+ Tomcat.addDefaultMimeTypeMappings(ctx);
} else if (configuration.getWebSessionTimeout() != null) {
ctx.setSessionTimeout(configuration.getWebSessionTimeout());
}
diff --git a/meecrowave-gradle-plugin/pom.xml b/meecrowave-gradle-plugin/pom.xml
index a97cb67..3042f39 100644
--- a/meecrowave-gradle-plugin/pom.xml
+++ b/meecrowave-gradle-plugin/pom.xml
@@ -52,7 +52,7 @@
<repositories>
<repository>
<id>gradle-libs-releases-local</id>
- <url>http://repo.gradle.org/gradle/libs-releases-local/</url>
+ <url>https://repo.gradle.org/gradle/libs-releases-local/</url>
</repository>
</repositories>
</project>
diff --git a/pom.xml b/pom.xml
index 98106b8..2a25ddb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,11 +51,11 @@
<meecrowave.build.name>${project.groupId}.${project.artifactId}</meecrowave.build.name>
<junit.version>4.13</junit.version>
- <tomcat.version>9.0.31</tomcat.version>
+ <tomcat.version>9.0.33</tomcat.version>
<openwebbeans.version>2.0.15</openwebbeans.version>
<cxf.version>3.3.5</cxf.version>
<johnzon.version>1.2.2</johnzon.version>
- <log4j2.version>2.13.0</log4j2.version>
+ <log4j2.version>2.13.1</log4j2.version>
<deltaspike.version>1.8.2</deltaspike.version>
<jaxb.version>2.2.11</jaxb.version>
<openjpa.version>3.0.0</openjpa.version>