Skip to content

Commit

Permalink
- draft version focusing on dbunit integration mostly, align to jakar…
Browse files Browse the repository at this point in the history 
…ta 10

- align to modified arquillian-extensions-transaction 1.0.6.a
- 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
  • Loading branch information
@abregar
abregar committed Feb 19, 2023
1 parent 845a894 commit 9511f22
Show file tree
Hide file tree
Showing 44 changed files with 56 additions and 65 deletions.
2 changes: 1 addition & 1 deletion arquillian-ape-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion arquillian-ape-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion arquillian-ape-junit-rule/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion arquillian-ape-nosql/core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion arquillian-ape-nosql/couchbase-ftest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion arquillian-ape-nosql/couchbase/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion arquillian-ape-nosql/couchdb-ftest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion arquillian-ape-nosql/couchdb/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion arquillian-ape-nosql/infinispan-ftest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion arquillian-ape-nosql/infinispan/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion arquillian-ape-nosql/mongodb-ftest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion arquillian-ape-nosql/mongodb/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion arquillian-ape-nosql/polyglot-nosql-ftest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion arquillian-ape-nosql/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion arquillian-ape-nosql/redis-declarative-rule-ftest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion arquillian-ape-nosql/redis-ftest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion arquillian-ape-nosql/redis/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion arquillian-ape-nosql/vault-ftest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion arquillian-ape-nosql/vault/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion arquillian-ape-rest/core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion arquillian-ape-rest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion arquillian-ape-rest/postman-ftest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion arquillian-ape-rest/postman/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion arquillian-ape-spi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion arquillian-ape-sql/container/api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion arquillian-ape-sql/container/core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion arquillian-ape-sql/container/dbunit/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down
2 changes: 1 addition & 1 deletion arquillian-ape-sql/container/int-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion arquillian-ape-sql/container/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions arquillian-ape-sql/core-dbunit/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>

Expand Down Expand Up @@ -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>
Expand Down
9 changes: 4 additions & 5 deletions ...unit/src/test/java/org/arquillian/ape/rdbms/core/dbunit/dataset/json/JsonDataSetTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion ...bunit/src/test/java/org/arquillian/ape/rdbms/core/dbunit/dataset/xml/DtdResolverTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
9 changes: 4 additions & 5 deletions ...unit/src/test/java/org/arquillian/ape/rdbms/core/dbunit/dataset/yaml/YamlDataSetTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion arquillian-ape-sql/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion arquillian-ape-sql/standalone/core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion arquillian-ape-sql/standalone/dbunit-flyway-ftest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion arquillian-ape-sql/standalone/dbunit-ftest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion arquillian-ape-sql/standalone/dbunit-junit-rule-ftest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading

0 comments on commit 9511f22

Please sign in to comment.