Merge pull request #22 from tandraschko/master

remove deltaspike
apache · Mar 21, 2024 · 2103ff0 · 2103ff0
2 parents 3dd9ecd + 489c748
commit 2103ff0
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 63 deletions.
diff --git a/extensions/cdi/pom.xml b/extensions/cdi/pom.xml
@@ -48,15 +48,14 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.deltaspike.cdictrl</groupId>
-            <artifactId>deltaspike-cdictrl-owb</artifactId>
-            <version>${deltaspike.version}</version>
+            <groupId>org.apache.openwebbeans</groupId>
+            <artifactId>openwebbeans-impl</artifactId>
+            <version>${owb.version}</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans-impl</artifactId>
+            <artifactId>openwebbeans-se</artifactId>
             <version>${owb.version}</version>
             <scope>test</scope>
         </dependency>

diff --git a/extensions/cdi/src/test/java/org/apache/batchee/cdi/testng/CdiContainerLifecycle.java b/extensions/cdi/src/test/java/org/apache/batchee/cdi/testng/CdiContainerLifecycle.java
@@ -16,14 +16,14 @@
  */
 package org.apache.batchee.cdi.testng;
 
-import org.apache.deltaspike.cdise.api.CdiContainer;
-import org.apache.deltaspike.cdise.api.CdiContainerLoader;
+import jakarta.enterprise.inject.se.SeContainer;
+import jakarta.enterprise.inject.se.SeContainerInitializer;
 import org.testng.ITestContext;
 import org.testng.ITestListener;
 import org.testng.ITestResult;
 
 public class CdiContainerLifecycle implements ITestListener {
-    private CdiContainer container;
+    private SeContainer container;
 
     @Override
     public void onTestStart(final ITestResult iTestResult) {
@@ -52,18 +52,13 @@ public void onTestFailedButWithinSuccessPercentage(final ITestResult iTestResult
 
     @Override
     public void onStart(final ITestContext iTestContext) {
-        container = CdiContainerLoader.getCdiContainer();
-        try {
-            container.boot();
-        } catch (final Exception e) {
-            throw new RuntimeException(e);
-        }
+        container = SeContainerInitializer.newInstance().initialize();
     }
 
     @Override
     public void onFinish(final ITestContext iTestContext) {
         try {
-            container.shutdown();
+            container.close();
         } catch (final Exception e) {
             // no-op
         }

diff --git a/pom.xml b/pom.xml
@@ -63,7 +63,6 @@
         <tomee.version>10.0.0-M1-SNAPSHOT</tomee.version>
         <bval.version>3.0.0</bval.version>
         <xbean.version>4.24</xbean.version>
-        <deltaspike.version>2.0.0-SNAPSHOT</deltaspike.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <batchee.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/geronimo/content/batchee</batchee.scmPubUrl>
         <batchee.scmPubCheckoutDirectory>${basedir}/.site-content</batchee.scmPubCheckoutDirectory>

diff --git a/tools/cli/pom.xml b/tools/cli/pom.xml
@@ -100,13 +100,6 @@
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>org.apache.deltaspike.cdictrl</groupId>
-      <artifactId>deltaspike-cdictrl-api</artifactId>
-      <version>${deltaspike.version}</version>
-      <scope>provided</scope>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
@@ -203,7 +196,6 @@
                 <excludes>
                   <exclude>org.springframework:*</exclude>
                   <exclude>org.apache.geronimo.specs:geronimo-ejb_3.1_spec</exclude>
-                  <exclude>org.apache.deltaspike.cdictrl:deltaspike-cdictrl-api</exclude>
                   <exclude>org.testng:*</exclude>
                   <exclude>org.junit:*</exclude>
                   <exclude>org.hamcrest:*</exclude>

diff --git a/tools/cli/src/main/java/org/apache/batchee/cli/command/JobOperatorCommand.java b/tools/cli/src/main/java/org/apache/batchee/cli/command/JobOperatorCommand.java
@@ -217,11 +217,9 @@ private Lifecycle<Object> createLifecycle(final ClassLoader loader) {
         // some shortcuts are nicer to use from CLI
         if ("openejb".equalsIgnoreCase(lifecycle)) {
             lifecycle = "org.apache.batchee.cli.lifecycle.impl.OpenEJBLifecycle";
-        } else if ("cdi".equalsIgnoreCase(lifecycle)) {
-            lifecycle = "org.apache.batchee.cli.lifecycle.impl.CdiCtrlLifecycle";
         } else if ("spring".equalsIgnoreCase(lifecycle)) {
             lifecycle = "org.apache.batchee.cli.lifecycle.impl.SpringLifecycle";
-        } else if ("cdise".equalsIgnoreCase(lifecycle)) {
+        } else if ("cdise".equalsIgnoreCase(lifecycle) || "cdi".equalsIgnoreCase(lifecycle)) {
             lifecycle = "org.apache.batchee.cli.lifecycle.impl.CdiSeLifecycle";
         }
 

diff --git a/tools/cli/src/main/java/org/apache/batchee/cli/lifecycle/impl/CdiCtrlLifecycle.java b/tools/cli/src/main/java/org/apache/batchee/cli/lifecycle/impl/CdiCtrlLifecycle.java