From bd549ff0dcd9eb4efa535a2e7658c3a4807a6fe4 Mon Sep 17 00:00:00 2001
From: Vicente Rossello <vrossello@travelcompositor.com>
Date: Mon, 24 Dec 2018 09:17:57 +0100
Subject: [PATCH 1/2] ApplicationComposerExtension. Problem: When I add
 junit-jupiter dependencies test-testng tasks executes all the tests

---
 container/openejb-core/pom.xml                | 20 +++++++++++
 .../jupiter/ApplicationComposerExtension.java | 26 ++++++++++++++
 .../ApplicationComposerExtensionTest.java     | 36 +++++++++++++++++++
 pom.xml                                       |  2 +-
 4 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 container/openejb-core/src/main/java/org/apache/openejb/junit/jupiter/ApplicationComposerExtension.java
 create mode 100644 container/openejb-core/src/test/java/org/apache/openejb/junit/jupiter/ApplicationComposerExtensionTest.java

diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml
index 88f57007788..3c858799def 100644
--- a/container/openejb-core/pom.xml
+++ b/container/openejb-core/pom.xml
@@ -227,6 +227,8 @@
       org.apache.openejb*;version=${openejb.osgi.export.version},
       org.apache.openejb;version=${openejb.osgi.export.version}
     </openejb.osgi.export>
+    <junit.jupiter.version>5.3.2</junit.jupiter.version>
+
   </properties>
 
   <build>
@@ -583,6 +585,24 @@
       <artifactId>junit</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>${junit.jupiter.version}</version>
+      <scope>provided</scope>
+    </dependency>
+      <dependency>
+          <groupId>org.junit.jupiter</groupId>
+          <artifactId>junit-jupiter-engine</artifactId>
+          <version>${junit.jupiter.version}</version>
+          <scope>provided</scope>
+      </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <version>${junit.jupiter.version}</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/junit/jupiter/ApplicationComposerExtension.java b/container/openejb-core/src/main/java/org/apache/openejb/junit/jupiter/ApplicationComposerExtension.java
new file mode 100644
index 00000000000..9ef6dc9ef27
--- /dev/null
+++ b/container/openejb-core/src/main/java/org/apache/openejb/junit/jupiter/ApplicationComposerExtension.java
@@ -0,0 +1,26 @@
+package org.apache.openejb.junit.jupiter;
+
+import org.apache.openejb.testing.ApplicationComposers;
+
+
+import org.apache.openejb.testing.ApplicationComposers;
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+
+public class ApplicationComposerExtension implements BeforeEachCallback, AfterEachCallback {
+
+    private ApplicationComposers delegate;
+
+    @Override
+    public void beforeEach(ExtensionContext context) throws Exception {
+        delegate = new ApplicationComposers(context.getRequiredTestInstance());
+        delegate.before(context.getRequiredTestInstance());
+    }
+
+    @Override
+    public void afterEach(ExtensionContext context) throws Exception {
+        delegate.after();
+    }
+
+}
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/junit/jupiter/ApplicationComposerExtensionTest.java b/container/openejb-core/src/test/java/org/apache/openejb/junit/jupiter/ApplicationComposerExtensionTest.java
new file mode 100644
index 00000000000..0097759b6c8
--- /dev/null
+++ b/container/openejb-core/src/test/java/org/apache/openejb/junit/jupiter/ApplicationComposerExtensionTest.java
@@ -0,0 +1,36 @@
+package org.apache.openejb.junit.jupiter;
+
+import org.apache.openejb.jee.EjbJar;
+import org.apache.openejb.testing.Module;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+
+@ExtendWith(ApplicationComposerExtension.class)
+public class ApplicationComposerExtensionTest {
+
+    @Module
+    @org.apache.openejb.testing.Classes(cdi = true, value = SomeCDIClass.class)
+    public EjbJar classes() {
+        return new EjbJar();
+    }
+
+    @Inject
+    private SomeCDIClass someCDIClass;
+
+    @Test
+    public void checkInjection() {
+        assertNotNull(someCDIClass);
+    }
+
+    @ApplicationScoped
+    public static class SomeCDIClass {
+
+    }
+
+}
diff --git a/pom.xml b/pom.xml
index d431bf9705e..dba90a684ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,7 +96,7 @@
     <tomee.version>${project.version}</tomee.version>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
-    <surefire.version>2.21.0</surefire.version>
+    <surefire.version>2.22.1</surefire.version>
 
     <!-- for the default name of the module. Needs to be overridden -->
     <tomee.build.name>${project.groupId}.${project.artifactId}</tomee.build.name>

From 99e933163b4d43180c6c7dce030f2c9762f524e3 Mon Sep 17 00:00:00 2001
From: Vicente Rossello <vrossello@travelcompositor.com>
Date: Mon, 24 Dec 2018 17:45:04 +0100
Subject: [PATCH 2/2] excluded junit-jupiter dependencies for surefire's testng
 execution

---
 container/openejb-core/pom.xml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml
index 3c858799def..c9940d5db20 100644
--- a/container/openejb-core/pom.xml
+++ b/container/openejb-core/pom.xml
@@ -357,6 +357,10 @@
               <goal>test</goal>
             </goals>
             <configuration>
+              <classpathDependencyExcludes>
+                  <classpathDependencyExcludes>org.junit.jupiter:junit-jupiter-engine</classpathDependencyExcludes>
+                  <classpathDependencyExcludes>org.junit.vintage:junit-vintage-engine</classpathDependencyExcludes>
+              </classpathDependencyExcludes>
               <junitArtifactName>none:none</junitArtifactName>
               <excludes>
                 <exclude>**</exclude>
@@ -591,12 +595,12 @@
       <version>${junit.jupiter.version}</version>
       <scope>provided</scope>
     </dependency>
-      <dependency>
-          <groupId>org.junit.jupiter</groupId>
-          <artifactId>junit-jupiter-engine</artifactId>
-          <version>${junit.jupiter.version}</version>
-          <scope>provided</scope>
-      </dependency>
+    <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-engine</artifactId>
+        <version>${junit.jupiter.version}</version>
+        <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.junit.vintage</groupId>
       <artifactId>junit-vintage-engine</artifactId>