MEECROWAVE-324 MEECROWAVE-325 MEECROWAVE-326 various version upgrades

* Apache parent 29 * CXF-3.5.5 * log4j2-2.19.0
apache · Dec 22, 2022 · 26708af · 26708af
1 parent 710b8d0
commit 26708af
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 15 deletions.
diff --git a/meecrowave-core/src/main/java/org/apache/meecrowave/tomcat/MeecrowaveContextConfig.java b/meecrowave-core/src/main/java/org/apache/meecrowave/tomcat/MeecrowaveContextConfig.java
@@ -22,13 +22,11 @@
 import static java.util.Collections.singleton;
 import static java.util.Optional.ofNullable;
 
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Modifier;
 import java.net.URL;
-import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -60,16 +58,13 @@
 import org.apache.webbeans.corespi.scanner.xbean.CdiArchive;
 import org.apache.webbeans.corespi.scanner.xbean.OwbAnnotationFinder;
 import org.apache.webbeans.spi.ScannerService;
-import org.xml.sax.InputSource;
 
 public class MeecrowaveContextConfig extends ContextConfig {
-    private static final byte[] DEFAULT_WEB_XML = "<web-app version=\"3.1\" />".getBytes(StandardCharsets.UTF_8);
-
     private final Configuration configuration;
     private final Map<String, Collection<Class<?>>> webClasses = new HashMap<>();
     private final boolean fixDocBase;
     private final ServletContainerInitializer intializer;
-	private final Consumer<Context> redeployCallback;
+    private final Consumer<Context> redeployCallback;
     private OwbAnnotationFinder finder;
     private ReloadOnChangeController watcher;
 
@@ -182,11 +177,6 @@ public void lifecycleEvent(final LifecycleEvent event) {
         }
     }
 
-    @Override  // just to avoid an info log pretty useless for us
-    protected InputSource getGlobalWebXmlSource() {
-        return ofNullable(super.getGlobalWebXmlSource()).orElse(new InputSource(new ByteArrayInputStream(DEFAULT_WEB_XML)));
-    }
-
     @Override
     protected void processServletContainerInitializers() { // use our finder
         if (!configuration.isTomcatScanning()) {

diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>23</version>
+    <version>29</version>
   </parent>
 
   <groupId>org.apache.meecrowave</groupId>
@@ -51,11 +51,11 @@
     <meecrowave.build.name>${project.groupId}.${project.artifactId}</meecrowave.build.name>
 
     <junit.version>4.13.2</junit.version>
-    <tomcat.version>9.0.62</tomcat.version>
+    <tomcat.version>9.0.70</tomcat.version>
     <openwebbeans.version>2.0.27</openwebbeans.version>
-    <cxf.version>3.5.2</cxf.version>
+    <cxf.version>3.5.5</cxf.version>
     <johnzon.version>1.2.19</johnzon.version>
-    <log4j2.version>2.17.2</log4j2.version>
+    <log4j2.version>2.19.0</log4j2.version>
     <deltaspike.version>1.9.5</deltaspike.version>
     <jaxb.version>2.2.11</jaxb.version>
     <openjpa.version>3.2.0</openjpa.version>