[incubator-plc4x] branch master updated: - Fine tuned the Junit 5 support

[cd...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

cdutz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git


The following commit(s) were added to refs/heads/master by this push:
     new 98ad8e9  - Fine tuned the Junit 5 support
98ad8e9 is described below

commit 98ad8e99993cfc2c1cf59d40b3637133b993c7ac
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Thu Jan 25 23:18:22 2018 +0100

    - Fine tuned the Junit 5 support
---
 integrations/apache-camel/pom.xml |  7 -------
 pom.xml                           | 27 +++++++++++++++++++++++++--
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/integrations/apache-camel/pom.xml b/integrations/apache-camel/pom.xml
index 977ecfc..abb5637 100644
--- a/integrations/apache-camel/pom.xml
+++ b/integrations/apache-camel/pom.xml
@@ -86,13 +86,6 @@
       <!-- TODO: version temporary defined due to PLC4X-22-->
       <version>${camel.version}</version>
       <scope>test</scope>
-      <!-- TODO: Seems camel test requires JUnit 4 classes ... we should keep an eye on this -->
-      <!--exclusions>
-        <exclusion>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-        </exclusion>
-      </exclusions-->
     </dependency>
   </dependencies>
 
diff --git a/pom.xml b/pom.xml
index f15b21c..4b57746 100644
--- a/pom.xml
+++ b/pom.xml
@@ -895,6 +895,30 @@
           <version>${junit-jupiter.version}</version>
           <scope>test</scope>
         </dependency>
+        <dependency>
+          <groupId>org.junit.jupiter</groupId>
+          <artifactId>junit-jupiter-engine</artifactId>
+          <version>${junit-jupiter.version}</version>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.junit.vintage</groupId>
+          <artifactId>junit-vintage-engine</artifactId>
+          <version>${junit-jupiter.version}</version>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.junit.platform</groupId>
+          <artifactId>junit-platform-launcher</artifactId>
+          <version>${junit-platform.version}</version>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.junit.platform</groupId>
+          <artifactId>junit-platform-runner</artifactId>
+          <version>${junit-platform.version}</version>
+          <scope>test</scope>
+        </dependency>
 
         <dependency>
           <groupId>org.junit.jupiter</groupId>
@@ -944,8 +968,7 @@
                   <failOnWarning>true</failOnWarning>
                   <ignoredDependencies>
                     <ignoredDependency>org.assertj:assertj-core</ignoredDependency>
-                    <ignoredDependency>org.junit.jupiter:junit-jupiter-api</ignoredDependency>
-                    <ignoredDependency>org.junit.jupiter:junit-jupiter-params</ignoredDependency>
+                    <ignoredDependency>org.junit.*:*</ignoredDependency>
                     <ignoredDependency>org.mockito:mockito-core</ignoredDependency>
                     <ignoredDependency>org.slf4j:slf4j-api</ignoredDependency>
                   </ignoredDependencies>

-- 
To stop receiving notification emails like this one, please contact
cdutz@apache.org.