Fixed merge of PR #3946 from eclipse/jetty-9.4.x-3804-Decoration-rename

Removed cdi2 module from #3946 for Issue #3804 in jetty-10 Signed-off-by: Greg Wilkins <[email protected]>
jetty · Aug 12, 2019 · e08d421 · e08d421
1 parent b0da446
commit e08d421
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 64 deletions.
diff --git a/jetty-cdi/src/main/config/etc/cdi/jetty-cdi2.xml b/jetty-cdi/src/main/config/etc/cdi/jetty-cdi2.xml
diff --git a/jetty-cdi/src/main/config/etc/cdi/jetty-web-cdi2.xml b/jetty-cdi/src/main/config/etc/cdi/jetty-web-cdi2.xml
diff --git a/jetty-cdi/src/main/config/modules/cdi2.mod b/jetty-cdi/src/main/config/modules/cdi2.mod
diff --git a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/CDITests.java b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/CDITests.java
@@ -57,14 +57,12 @@ public static Stream<Arguments> tests()
 
         return Stream.of(
             // -- Weld --
-            Arguments.of("weld", "cdi2", null),
             Arguments.of("weld", "cdi-spi", null), // Weld >= 3.1.2
             Arguments.of("weld", "decorate", null), // Weld >= 3.1.2
             // TODO Arguments.of("weld", "cdi-decorate", null), // Weld >= 3.1.3
 
             // -- Apache OpenWebBeans --
-            Arguments.of("owb", "cdi-spi", removeJettyWebXml),
-            Arguments.of("owb", "cdi2", null)
+            Arguments.of("owb", "cdi-spi", removeJettyWebXml)
             // Arguments.of("owb", "decorate", null), // Not supported
             // Arguments.of("owb", "cdi-decorate", null) // Not supported
         );