Bump OpenWebBeans from 2.0.11 to 2.0.18

+ Brings in ServletContainerInitializer fix from 2.0.12

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/CDITests.java

@@ -58,12 +58,14 @@ public class CDITests extends AbstractDistributionTest
 
         return Stream.of(
             // -- Weld --
+            // Uses test-weld-cdi-webapp
             Arguments.of("weld", "cdi2", null),
             Arguments.of("weld", "cdi-spi", null), // Weld >= 3.1.2
             Arguments.of("weld", "decorate", null), // Weld >= 3.1.2
             Arguments.of("weld", "cdi-decorate", null), // Weld >= 3.1.3
 
             // -- Apache OpenWebBeans --
+            // Uses test-owb-cdi-webapp
             Arguments.of("owb", "cdi-spi", null),
             Arguments.of("owb", "jsp", renameJettyWebOwbXml)
             // Arguments.of("owb", "decorate", null), // Not supported

tests/test-webapps/test-owb-cdi-webapp/pom.xml

@@ -13,6 +13,7 @@
 
   <properties>
     <bundle-symbolic-name>${project.groupId}.cdi.owb</bundle-symbolic-name>
+    <openwebbeans.version>2.0.18</openwebbeans.version>
   </properties>
 
   <build>
@@ -60,12 +61,12 @@
       <groupId>org.apache.openwebbeans</groupId>
       <artifactId>openwebbeans-web</artifactId>
       <!-- TODO remove OwbServletContainerInitializer when updated to a version with https://issues.apache.org/jira/browse/OWB-1296 -->
-      <version>2.0.11</version>
+      <version>${openwebbeans.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.openwebbeans</groupId>
       <artifactId>openwebbeans-jetty9</artifactId>
-      <version>2.0.11</version>
+      <version>${openwebbeans.version}</version>
     </dependency>
   </dependencies>
 </project>

tests/test-webapps/test-owb-cdi-webapp/src/main/java/org/eclipse/jetty/cdi/owb/OwbServletContainerInitializer.java

@@ -1,55 +0,0 @@
-//
-//  ========================================================================
-//  Copyright (c) 1995-2020 Mort Bay Consulting Pty Ltd and others.
-//  ------------------------------------------------------------------------
-//  All rights reserved. This program and the accompanying materials
-//  are made available under the terms of the Eclipse Public License v1.0
-//  and Apache License v2.0 which accompanies this distribution.
-//
-//      The Eclipse Public License is available at
-//      http://www.eclipse.org/legal/epl-v10.html
-//
-//      The Apache License v2.0 is available at
-//      http://www.opensource.org/licenses/apache2.0.php
-//
-//  You may elect to redistribute this code under either of these licenses.
-//  ========================================================================
-//
-
-package org.eclipse.jetty.cdi.owb;
-
-import java.util.Set;
-import javax.servlet.ServletContainerInitializer;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletException;
-
-import org.apache.webbeans.servlet.WebBeansConfigurationListener;
-
-/**
- * @deprecated This class will not be required once https://issues.apache.org/jira/browse/OWB-1296 is available
- */
-@Deprecated
-public class OwbServletContainerInitializer implements ServletContainerInitializer
-{
-    @Override
-    public void onStartup(Set<Class<?>> c, ServletContext ctx) throws ServletException
-    {
-        Listener listener = new Listener();
-        listener.preInitialize(new ServletContextEvent(ctx));
-        ctx.addListener(listener);
-    }
-
-    public static class Listener extends WebBeansConfigurationListener
-    {
-        void preInitialize(ServletContextEvent event)
-        {
-            super.contextInitialized(event);
-        }
-
-        @Override
-        public void contextInitialized(ServletContextEvent event)
-        {
-        }
-    }
-}

tests/test-webapps/test-owb-cdi-webapp/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer

@@ -1 +0,0 @@
-org.eclipse.jetty.cdi.owb.OwbServletContainerInitializer

tests/test-webapps/test-owb-cdi-webapp/src/main/webapp/WEB-INF/web.xml

@@ -1,11 +1,15 @@
 <?xml version="1.0"?>
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" 
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" 
-   version="3.1">
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+  version="3.1">
   <display-name>OWB CDI Integration Test WebApp</display-name>
 
-  <!-- OWB Listener is added by OwbServletContainerInitializer -->
+  <!-- Required by org.apache.webbeans.servlet.WebBeansConfigurationListener$Auto -->
+  <context-param>
+    <param-name>openwebbeans.web.sci.active</param-name>
+    <param-value>true</param-value>
+  </context-param>
 
   <resource-env-ref>
     <description>Object factory for the CDI Bean Manager</description>