- draft version focusing on dbunit integration mostly, align to jakar…

…ta 10 - align to modified arquillian-extensions-transaction 1.0.6.a2 with reverted arquillian#10 - update versions arquillian core - reverting junit5 experiments back to junit4 -> will need much more help from community to solve junit5 related mysteries, one day .. - until then, the answer to arquillian#195 is - staying with junit4 we can do something to 'undust' this project, while junit5 will require some major rewrite
abregar · Feb 19, 2023 · cefe880 · cefe880
1 parent 845a894
commit cefe880
Show file tree

Hide file tree

Showing 44 changed files with 56 additions and 65 deletions.
diff --git a/arquillian-ape-api/pom.xml b/arquillian-ape-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.arquillian.ape</groupId>
     <artifactId>arquillian-ape-parent</artifactId>
-    <version>2.0.0-alpha.7.a1</version>
+    <version>2.0.0-alpha.7.a2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/arquillian-ape-core/pom.xml b/arquillian-ape-core/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.arquillian.ape</groupId>
     <artifactId>arquillian-ape-parent</artifactId>
-    <version>2.0.0-alpha.7.a1</version>
+    <version>2.0.0-alpha.7.a2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/arquillian-ape-junit-rule/pom.xml b/arquillian-ape-junit-rule/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.arquillian.ape</groupId>
     <artifactId>arquillian-ape-parent</artifactId>
-    <version>2.0.0-alpha.7.a1</version>
+    <version>2.0.0-alpha.7.a2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/arquillian-ape-nosql/core/pom.xml b/arquillian-ape-nosql/core/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.arquillian.ape</groupId>
     <artifactId>arquillian-ape-nosql-parent</artifactId>
-    <version>2.0.0-alpha.7.a1</version>
+    <version>2.0.0-alpha.7.a2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/arquillian-ape-nosql/couchbase-ftest/pom.xml b/arquillian-ape-nosql/couchbase-ftest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.arquillian.ape</groupId>
     <artifactId>arquillian-ape-nosql-parent</artifactId>
-    <version>2.0.0-alpha.7.a1</version>
+    <version>2.0.0-alpha.7.a2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/arquillian-ape-nosql/couchbase/pom.xml b/arquillian-ape-nosql/couchbase/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.arquillian.ape</groupId>
     <artifactId>arquillian-ape-nosql-parent</artifactId>
-    <version>2.0.0-alpha.7.a1</version>
+    <version>2.0.0-alpha.7.a2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/arquillian-ape-nosql/couchdb-ftest/pom.xml b/arquillian-ape-nosql/couchdb-ftest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.arquillian.ape</groupId>
     <artifactId>arquillian-ape-nosql-parent</artifactId>
-    <version>2.0.0-alpha.7.a1</version>
+    <version>2.0.0-alpha.7.a2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/arquillian-ape-nosql/couchdb/pom.xml b/arquillian-ape-nosql/couchdb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.arquillian.ape</groupId>
     <artifactId>arquillian-ape-nosql-parent</artifactId>
-    <version>2.0.0-alpha.7.a1</version>
+    <version>2.0.0-alpha.7.a2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/arquillian-ape-nosql/infinispan-ftest/pom.xml b/arquillian-ape-nosql/infinispan-ftest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.arquillian.ape</groupId>
     <artifactId>arquillian-ape-nosql-parent</artifactId>
-    <version>2.0.0-alpha.7.a1</version>
+    <version>2.0.0-alpha.7.a2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/arquillian-ape-nosql/infinispan/pom.xml b/arquillian-ape-nosql/infinispan/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.arquillian.ape</groupId>
     <artifactId>arquillian-ape-nosql-parent</artifactId>
-    <version>2.0.0-alpha.7.a1</version>
+    <version>2.0.0-alpha.7.a2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/arquillian-ape-nosql/mongodb-ftest/pom.xml b/arquillian-ape-nosql/mongodb-ftest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.arquillian.ape</groupId>
     <artifactId>arquillian-ape-nosql-parent</artifactId>
-    <version>2.0.0-alpha.7.a1</version>
+    <version>2.0.0-alpha.7.a2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/arquillian-ape-nosql/mongodb/pom.xml b/arquillian-ape-nosql/mongodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.arquillian.ape</groupId>
     <artifactId>arquillian-ape-nosql-parent</artifactId>
-    <version>2.0.0-alpha.7.a1</version>
+    <version>2.0.0-alpha.7.a2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/arquillian-ape-nosql/polyglot-nosql-ftest/pom.xml b/arquillian-ape-nosql/polyglot-nosql-ftest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.arquillian.ape</groupId>
     <artifactId>arquillian-ape-nosql-parent</artifactId>
-    <version>2.0.0-alpha.7.a1</version>
+    <version>2.0.0-alpha.7.a2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/arquillian-ape-nosql/pom.xml b/arquillian-ape-nosql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.arquillian.ape</groupId>
     <artifactId>arquillian-ape-parent</artifactId>
-    <version>2.0.0-alpha.7.a1</version>
+    <version>2.0.0-alpha.7.a2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/arquillian-ape-nosql/redis-declarative-rule-ftest/pom.xml b/arquillian-ape-nosql/redis-declarative-rule-ftest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.arquillian.ape</groupId>
     <artifactId>arquillian-ape-nosql-parent</artifactId>
-    <version>2.0.0-alpha.7.a1</version>
+    <version>2.0.0-alpha.7.a2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/arquillian-ape-nosql/redis-ftest/pom.xml b/arquillian-ape-nosql/redis-ftest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.arquillian.ape</groupId>
     <artifactId>arquillian-ape-nosql-parent</artifactId>
-    <version>2.0.0-alpha.7.a1</version>
+    <version>2.0.0-alpha.7.a2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/arquillian-ape-nosql/redis/pom.xml b/arquillian-ape-nosql/redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.arquillian.ape</groupId>
     <artifactId>arquillian-ape-nosql-parent</artifactId>
-    <version>2.0.0-alpha.7.a1</version>
+    <version>2.0.0-alpha.7.a2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/arquillian-ape-nosql/vault-ftest/pom.xml b/arquillian-ape-nosql/vault-ftest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.arquillian.ape</groupId>
     <artifactId>arquillian-ape-nosql-parent</artifactId>
-    <version>2.0.0-alpha.7.a1</version>
+    <version>2.0.0-alpha.7.a2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/arquillian-ape-nosql/vault/pom.xml b/arquillian-ape-nosql/vault/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.arquillian.ape</groupId>
     <artifactId>arquillian-ape-nosql-parent</artifactId>
-    <version>2.0.0-alpha.7.a1</version>
+    <version>2.0.0-alpha.7.a2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/arquillian-ape-rest/core/pom.xml b/arquillian-ape-rest/core/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.arquillian.ape</groupId>
     <artifactId>arquillian-ape-rest-parent</artifactId>
-    <version>2.0.0-alpha.7.a1</version>
+    <version>2.0.0-alpha.7.a2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/arquillian-ape-rest/pom.xml b/arquillian-ape-rest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.arquillian.ape</groupId>
     <artifactId>arquillian-ape-parent</artifactId>
-    <version>2.0.0-alpha.7.a1</version>
+    <version>2.0.0-alpha.7.a2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/arquillian-ape-rest/postman-ftest/pom.xml b/arquillian-ape-rest/postman-ftest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.arquillian.ape</groupId>
     <artifactId>arquillian-ape-rest-parent</artifactId>
-    <version>2.0.0-alpha.7.a1</version>
+    <version>2.0.0-alpha.7.a2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/arquillian-ape-rest/postman/pom.xml b/arquillian-ape-rest/postman/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.arquillian.ape</groupId>
     <artifactId>arquillian-ape-rest-parent</artifactId>
-    <version>2.0.0-alpha.7.a1</version>
+    <version>2.0.0-alpha.7.a2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/arquillian-ape-spi/pom.xml b/arquillian-ape-spi/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.arquillian.ape</groupId>
     <artifactId>arquillian-ape-parent</artifactId>
-    <version>2.0.0-alpha.7.a1</version>
+    <version>2.0.0-alpha.7.a2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/arquillian-ape-sql/container/api/pom.xml b/arquillian-ape-sql/container/api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.arquillian.ape</groupId>
     <artifactId>arquillian-ape-sql-container-parent</artifactId>
-    <version>2.0.0-alpha.7.a1</version>
+    <version>2.0.0-alpha.7.a2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/arquillian-ape-sql/container/core/pom.xml b/arquillian-ape-sql/container/core/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.arquillian.ape</groupId>
     <artifactId>arquillian-ape-sql-container-parent</artifactId>
-    <version>2.0.0-alpha.7.a1</version>
+    <version>2.0.0-alpha.7.a2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/arquillian-ape-sql/container/dbunit/pom.xml b/arquillian-ape-sql/container/dbunit/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.arquillian.ape</groupId>
     <artifactId>arquillian-ape-sql-container-parent</artifactId>
-    <version>2.0.0-alpha.7.a1</version>
+    <version>2.0.0-alpha.7.a2</version>
   </parent>
 
   <!-- Model Version -->

diff --git a/arquillian-ape-sql/container/int-tests/pom.xml b/arquillian-ape-sql/container/int-tests/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.arquillian.ape</groupId>
     <artifactId>arquillian-ape-sql-container-parent</artifactId>
-    <version>2.0.0-alpha.7.a1</version>
+    <version>2.0.0-alpha.7.a2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/arquillian-ape-sql/container/pom.xml b/arquillian-ape-sql/container/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.arquillian.ape</groupId>
     <artifactId>arquillian-ape-sql-parent</artifactId>
-    <version>2.0.0-alpha.7.a1</version>
+    <version>2.0.0-alpha.7.a2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/arquillian-ape-sql/core-dbunit/pom.xml b/arquillian-ape-sql/core-dbunit/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.arquillian.ape</groupId>
     <artifactId>arquillian-ape-sql-parent</artifactId>
-    <version>2.0.0-alpha.7.a1</version>
+    <version>2.0.0-alpha.7.a2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -16,8 +16,8 @@
   <dependencies>
 
     <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
 
@@ -47,7 +47,7 @@
     <dependency>
       <groupId>org.arquillian.ape</groupId>
       <artifactId>arquillian-ape-sql-standalone-core</artifactId>
-      <version>2.0.0-alpha.7.a1</version>
+      <version>2.0.0-alpha.7.a2</version>
     </dependency>
 
   </dependencies>

diff --git a/...unit/src/test/java/org/arquillian/ape/rdbms/core/dbunit/dataset/json/JsonDataSetTest.java b/...unit/src/test/java/org/arquillian/ape/rdbms/core/dbunit/dataset/json/JsonDataSetTest.java
@@ -17,19 +17,18 @@
  */
 package org.arquillian.ape.rdbms.core.dbunit.dataset.json;
 
+import java.io.InputStream;
 import org.arquillian.ape.rdbms.core.testutils.DataSetAssert;
 import org.arquillian.ape.rdbms.core.testutils.FileLoader;
 import org.arquillian.ape.rdbms.core.testutils.TableAssert;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.Test;
-
-import java.io.InputStream;
+import org.junit.After;
+import org.junit.Test;
 
 public class JsonDataSetTest {
 
     private InputStream input;
 
-    @AfterAll
+    @After
     public void closeStream() {
         FileLoader.close(input);
     }

diff --git a/...bunit/src/test/java/org/arquillian/ape/rdbms/core/dbunit/dataset/xml/DtdResolverTest.java b/...bunit/src/test/java/org/arquillian/ape/rdbms/core/dbunit/dataset/xml/DtdResolverTest.java
@@ -17,7 +17,7 @@
  */
 package org.arquillian.ape.rdbms.core.dbunit.dataset.xml;
 
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/...unit/src/test/java/org/arquillian/ape/rdbms/core/dbunit/dataset/yaml/YamlDataSetTest.java b/...unit/src/test/java/org/arquillian/ape/rdbms/core/dbunit/dataset/yaml/YamlDataSetTest.java
@@ -17,19 +17,18 @@
  */
 package org.arquillian.ape.rdbms.core.dbunit.dataset.yaml;
 
+import java.io.InputStream;
 import org.arquillian.ape.rdbms.core.testutils.DataSetAssert;
 import org.arquillian.ape.rdbms.core.testutils.FileLoader;
 import org.arquillian.ape.rdbms.core.testutils.TableAssert;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.Test;
-
-import java.io.InputStream;
+import org.junit.After;
+import org.junit.Test;
 
 public class YamlDataSetTest {
 
     InputStream input;
 
-    @AfterAll
+    @After
     public void closeStream() {
         FileLoader.close(input);
     }

diff --git a/arquillian-ape-sql/pom.xml b/arquillian-ape-sql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.arquillian.ape</groupId>
     <artifactId>arquillian-ape-parent</artifactId>
-    <version>2.0.0-alpha.7.a1</version>
+    <version>2.0.0-alpha.7.a2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/arquillian-ape-sql/standalone/core/pom.xml b/arquillian-ape-sql/standalone/core/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.arquillian.ape</groupId>
     <artifactId>arquillian-ape-sql-standalone-parent</artifactId>
-    <version>2.0.0-alpha.7.a1</version>
+    <version>2.0.0-alpha.7.a2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/arquillian-ape-sql/standalone/dbunit-flyway-ftest/pom.xml b/arquillian-ape-sql/standalone/dbunit-flyway-ftest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.arquillian.ape</groupId>
     <artifactId>arquillian-ape-sql-standalone-parent</artifactId>
-    <version>2.0.0-alpha.7.a1</version>
+    <version>2.0.0-alpha.7.a2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/arquillian-ape-sql/standalone/dbunit-ftest/pom.xml b/arquillian-ape-sql/standalone/dbunit-ftest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.arquillian.ape</groupId>
     <artifactId>arquillian-ape-sql-standalone-parent</artifactId>
-    <version>2.0.0-alpha.7.a1</version>
+    <version>2.0.0-alpha.7.a2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/arquillian-ape-sql/standalone/dbunit-junit-rule-ftest/pom.xml b/arquillian-ape-sql/standalone/dbunit-junit-rule-ftest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.arquillian.ape</groupId>
     <artifactId>arquillian-ape-sql-standalone-parent</artifactId>
-    <version>2.0.0-alpha.7.a1</version>
+    <version>2.0.0-alpha.7.a2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>