diff --git a/core/pom.xml b/core/pom.xml index ca41af36..dc482956 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -18,9 +18,8 @@ Extension for controlling data sources - 1.0-SP1 1.1 - 1.0.4 + 1.1.0 diff --git a/core/src/test/java/org/jboss/arquillian/persistence/script/ScriptExecutorTest.java b/core/src/test/java/org/jboss/arquillian/persistence/script/ScriptExecutorTest.java index f1bf7dd7..818e8166 100644 --- a/core/src/test/java/org/jboss/arquillian/persistence/script/ScriptExecutorTest.java +++ b/core/src/test/java/org/jboss/arquillian/persistence/script/ScriptExecutorTest.java @@ -271,7 +271,7 @@ public void should_insert_special_entities_with_custom_end_line() throws Excepti verify(connection.createStatement(), times(1)).execute(statementsCaptor.capture()); assertThat(statementsCaptor.getAllValues()).containsSequence( "insert into useraccount (id, firstname, lastname, username, password)" + - " values (1, 'John', 'Smith & Company', 'doovde;;', '&test©')\nGO" + " values (1, 'John', 'Smith & Company', 'doovde;;', '&test©')" + System.lineSeparator() +"GO" ); } diff --git a/dbunit/pom.xml b/dbunit/pom.xml index dce6ca15..2e13e92e 100644 --- a/dbunit/pom.xml +++ b/dbunit/pom.xml @@ -21,10 +21,8 @@ 1.17 1.9.11 3.14 - 1.0-SP1 - 1.1 - 1.7.20 - 1.0.4 + 1.1 + 1.1.0 @@ -62,6 +60,10 @@ junit junit + + org.slf4j + slf4j-api + diff --git a/dbunit/src/main/java/org/jboss/arquillian/persistence/dbunit/DBUnitPersistenceTestLifecycleHandler.java b/dbunit/src/main/java/org/jboss/arquillian/persistence/dbunit/DBUnitPersistenceTestLifecycleHandler.java index 28bc80e7..801057f0 100644 --- a/dbunit/src/main/java/org/jboss/arquillian/persistence/dbunit/DBUnitPersistenceTestLifecycleHandler.java +++ b/dbunit/src/main/java/org/jboss/arquillian/persistence/dbunit/DBUnitPersistenceTestLifecycleHandler.java @@ -115,8 +115,12 @@ public void createDatasets(@Observes(precedence = 1000) EventContextDemonstrates usage of Arquillian Persistence extension. - 1.0-SP1 1.0.0.GA 6.0-5 1.0.0.Beta1 3.14 - 2.3 + 3.0 8.1.0.Final managed @@ -82,6 +81,13 @@ test + + org.apache.ant + ant + 1.10.1 + test + + org.jboss.arquillian.junit arquillian-junit-container @@ -94,6 +100,13 @@ test + + org.slf4j + slf4j-simple + 1.7.25 + test + + javax.enterprise cdi-api diff --git a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/example/DatabaseConnectionInjectionTest.java b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/example/DatabaseConnectionInjectionTest.java index 078dda61..a37a1df6 100644 --- a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/example/DatabaseConnectionInjectionTest.java +++ b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/example/DatabaseConnectionInjectionTest.java @@ -52,6 +52,7 @@ public static Archive createDeploymentPackage() { .addClass(Query.class) // required for remote containers in order to run tests with FEST-Asserts .addPackages(true, "org.assertj.core") + .addPackages(true, "org.apache.tools") .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") .addAsResource("test-persistence.xml", "META-INF/persistence.xml"); } diff --git a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/example/DatabaseConnectionVerificationTest.java b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/example/DatabaseConnectionVerificationTest.java index 725b5c34..d8ed6981 100644 --- a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/example/DatabaseConnectionVerificationTest.java +++ b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/example/DatabaseConnectionVerificationTest.java @@ -48,6 +48,7 @@ public static Archive createDeploymentPackage() { .addClass(Query.class) // required for remote containers in order to run tests with FEST-Asserts .addPackages(true, "org.assertj.core") + .addPackages(true, "org.apache.tools") .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") .addAsResource("test-persistence.xml", "META-INF/persistence.xml"); } diff --git a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/example/UserPersistenceTest.java b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/example/UserPersistenceTest.java index 605dbd6e..1913b777 100644 --- a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/example/UserPersistenceTest.java +++ b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/example/UserPersistenceTest.java @@ -54,6 +54,7 @@ public static Archive createDeploymentPackage() { .addClass(Query.class) // required for remote containers in order to run tests with FEST-Asserts .addPackages(true, "org.assertj.core") + .addPackages(true, "org.apache.tools") .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") .addAsResource("test-persistence.xml", "META-INF/persistence.xml"); } diff --git a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/example/deployments/UserPersistenceEarDeploymentTest.java b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/example/deployments/UserPersistenceEarDeploymentTest.java index f4cebc86..a82a93cd 100644 --- a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/example/deployments/UserPersistenceEarDeploymentTest.java +++ b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/example/deployments/UserPersistenceEarDeploymentTest.java @@ -39,6 +39,7 @@ public static Archive createDeploymentPackage() { .addClass(Query.class) // required for remote containers in order to run tests with FEST-Asserts .addPackages(true, "org.assertj.core") + .addPackages(true, "org.apache.tools") .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml") .addAsManifestResource("test-persistence.xml", "persistence.xml"); diff --git a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/example/deployments/UserPersistenceJarDeploymentTest.java b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/example/deployments/UserPersistenceJarDeploymentTest.java index 1d26f5a0..14d16958 100644 --- a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/example/deployments/UserPersistenceJarDeploymentTest.java +++ b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/example/deployments/UserPersistenceJarDeploymentTest.java @@ -37,6 +37,7 @@ public static Archive createDeploymentPackage() { .addPackage(UserAccount.class.getPackage()) .addClass(Query.class) .addPackages(true, "org.assertj.core") + .addPackages(true, "org.apache.tools") .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml") .addAsManifestResource("test-persistence.xml", "persistence.xml"); } diff --git a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/example/deployments/UserPersistenceWarDeploymentTest.java b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/example/deployments/UserPersistenceWarDeploymentTest.java index 009eb0b1..cc8f523b 100644 --- a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/example/deployments/UserPersistenceWarDeploymentTest.java +++ b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/example/deployments/UserPersistenceWarDeploymentTest.java @@ -38,6 +38,7 @@ public static Archive createDeploymentPackage() { .addClass(Query.class) // required for remote containers in order to run tests with FEST-Asserts .addPackages(true, "org.assertj.core") + .addPackages(true, "org.apache.tools") .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") .addAsResource("test-persistence.xml", "META-INF/persistence.xml"); } diff --git a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/TransactionalUserPersistenceTest.java b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/TransactionalUserPersistenceTest.java index 96f0f5d2..03d317f0 100644 --- a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/TransactionalUserPersistenceTest.java +++ b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/TransactionalUserPersistenceTest.java @@ -53,6 +53,7 @@ public static Archive createDeploymentPackage() { .addClass(Query.class) // required for remote containers in order to run tests with FEST-Asserts .addPackages(true, "org.assertj.core") + .addPackages(true, "org.apache.tools") .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") .addAsResource("test-persistence.xml", "META-INF/persistence.xml"); } diff --git a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/boundary/DataSetsWithDtdTest.java b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/boundary/DataSetsWithDtdTest.java index 1310ef7a..35f121d5 100644 --- a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/boundary/DataSetsWithDtdTest.java +++ b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/boundary/DataSetsWithDtdTest.java @@ -51,6 +51,7 @@ public static Archive createDeploymentPackage() { .addClass(Query.class) // required for remote containers in order to run tests with FEST-Asserts .addPackages(true, "org.assertj.core") + .addPackages(true, "org.apache.tools") .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") .addAsResource("test-persistence.xml", "META-INF/persistence.xml"); } diff --git a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/boundary/EmptyDataSetsTest.java b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/boundary/EmptyDataSetsTest.java index 793c7973..cdc8d9f3 100644 --- a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/boundary/EmptyDataSetsTest.java +++ b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/boundary/EmptyDataSetsTest.java @@ -56,6 +56,7 @@ public static Archive createDeploymentPackage() { .addClasses(Query.class, UserPersistenceAssertion.class) // required for remote containers in order to run tests with FEST-Asserts .addPackages(true, "org.assertj.core") + .addPackages(true, "org.apache.tools") .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") .addAsResource("test-persistence.xml", "META-INF/persistence.xml"); } diff --git a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/boundary/EmptyTablesJsonDataSetTest.java b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/boundary/EmptyTablesJsonDataSetTest.java index 982b0d80..99074155 100644 --- a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/boundary/EmptyTablesJsonDataSetTest.java +++ b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/boundary/EmptyTablesJsonDataSetTest.java @@ -32,6 +32,7 @@ public static Archive createDeploymentPackage() { .addClasses(Query.class, UserPersistenceAssertion.class) // required for remote containers in order to run tests with FEST-Asserts .addPackages(true, "org.assertj.core") + .addPackages(true, "org.apache.tools") .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") .addAsResource("test-persistence.xml", "META-INF/persistence.xml"); } diff --git a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/boundary/EmptyTablesYamlDataSetTest.java b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/boundary/EmptyTablesYamlDataSetTest.java index 19386e33..f2856824 100644 --- a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/boundary/EmptyTablesYamlDataSetTest.java +++ b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/boundary/EmptyTablesYamlDataSetTest.java @@ -35,6 +35,7 @@ public static Archive createDeploymentPackage() { .addClasses(Query.class, UserPersistenceAssertion.class) // required for remote containers in order to run tests with FEST-Asserts .addPackages(true, "org.assertj.core") + .addPackages(true, "org.apache.tools") .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") .addAsResource("test-persistence.xml", "META-INF/persistence.xml"); } diff --git a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/boundary/NonPersistenceExtensionTest.java b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/boundary/NonPersistenceExtensionTest.java index d71ce407..eb04ef01 100644 --- a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/boundary/NonPersistenceExtensionTest.java +++ b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/boundary/NonPersistenceExtensionTest.java @@ -43,6 +43,7 @@ public static Archive createDeploymentPackage() { .addPackage(UserAccount.class.getPackage()) // required for remote containers in order to run tests with FEST-Asserts .addPackages(true, "org.assertj.core") + .addPackages(true, "org.apache.tools") .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml") .addAsManifestResource("test-persistence.xml", "persistence.xml"); } diff --git a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/boundary/UsedRowsOnlyBuiltInCleanupStrategyTest.java b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/boundary/UsedRowsOnlyBuiltInCleanupStrategyTest.java index 786f1b0b..189a63a8 100644 --- a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/boundary/UsedRowsOnlyBuiltInCleanupStrategyTest.java +++ b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/boundary/UsedRowsOnlyBuiltInCleanupStrategyTest.java @@ -52,6 +52,7 @@ public static Archive createDeploymentPackage() { .addClass(Query.class) // required for remote containers in order to run tests with FEST-Asserts .addPackages(true, "org.assertj.core") + .addPackages(true, "org.apache.tools") .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml") .addAsManifestResource("test-persistence.xml", "persistence.xml"); } diff --git a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/cleanup/DataCleanupEventHandlingTest.java b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/cleanup/DataCleanupEventHandlingTest.java index d279472e..5bd37352 100644 --- a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/cleanup/DataCleanupEventHandlingTest.java +++ b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/cleanup/DataCleanupEventHandlingTest.java @@ -52,6 +52,7 @@ public static Archive createDeploymentPackage() { .addPackage(UserAccount.class.getPackage()) // required for remote containers in order to run tests with FEST-Asserts .addPackages(true, "org.assertj.core") + .addPackages(true, "org.apache.tools") .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") .addAsResource("test-persistence.xml", "META-INF/persistence.xml"); } diff --git a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/cleanup/DataCleanupStrategiesTest.java b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/cleanup/DataCleanupStrategiesTest.java index a84a6d6a..f21da0a7 100644 --- a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/cleanup/DataCleanupStrategiesTest.java +++ b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/cleanup/DataCleanupStrategiesTest.java @@ -17,9 +17,16 @@ */ package org.jboss.arquillian.integration.persistence.test.cleanup; +import static org.assertj.core.api.Assertions.assertThat; +import static org.jboss.arquillian.persistence.BuiltInCleanupStrategy.STRICT; +import static org.jboss.arquillian.persistence.BuiltInCleanupStrategy.USED_ROWS_ONLY; +import static org.jboss.arquillian.persistence.BuiltInCleanupStrategy.USED_TABLES_ONLY; + import java.util.List; + import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.integration.persistence.example.Address; import org.jboss.arquillian.integration.persistence.example.UserAccount; @@ -42,11 +49,6 @@ import org.junit.Test; import org.junit.runner.RunWith; -import static org.assertj.core.api.Assertions.assertThat; -import static org.jboss.arquillian.persistence.BuiltInCleanupStrategy.STRICT; -import static org.jboss.arquillian.persistence.BuiltInCleanupStrategy.USED_ROWS_ONLY; -import static org.jboss.arquillian.persistence.BuiltInCleanupStrategy.USED_TABLES_ONLY; - @RunWith(Arquillian.class) public class DataCleanupStrategiesTest { @@ -60,6 +62,7 @@ public static Archive createDeploymentPackage() { .addClass(Query.class) // required for remote containers in order to run tests with FEST-Asserts .addPackages(true, "org.assertj.core") + .addPackages(true, "org.apache.tools") .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml") .addAsManifestResource("test-persistence.xml", "persistence.xml"); } @@ -117,9 +120,8 @@ public void should_cleanup_all_tables_defined_in_data_set() { @DatabaseShouldContainAfterTest({"expected-address.yml"}) @ShouldBeEmptyAfterTest("useraccount") public void should_seed_using_both_custom_scripts_and_datasets_and_cleanup_all_tables_defined_in_data_set() { - final List users = - (List) em.createQuery(Query.selectAllInJPQL(UserAccount.class)).getResultList(); - final List
addresses = em.createQuery(Query.selectAllInJPQL(Address.class)).getResultList(); + final List users = em.createQuery(Query.selectAllInJPQL(UserAccount.class), UserAccount.class).getResultList(); + final List
addresses = em.createQuery(Query.selectAllInJPQL(Address.class), Address.class).getResultList(); assertThat(users).hasSize(3); assertThat(addresses).hasSize(1); diff --git a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/cleanup/DataCleanupUsingScriptEventHandlingTest.java b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/cleanup/DataCleanupUsingScriptEventHandlingTest.java index 8e49b204..88f9b62e 100644 --- a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/cleanup/DataCleanupUsingScriptEventHandlingTest.java +++ b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/cleanup/DataCleanupUsingScriptEventHandlingTest.java @@ -52,6 +52,7 @@ public static Archive createDeploymentPackage() { .addPackage(UserAccount.class.getPackage()) // required for remote containers in order to run tests with FEST-Asserts .addPackages(true, "org.assertj.core") + .addPackages(true, "org.apache.tools") .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") .addAsResource("test-persistence.xml", "META-INF/persistence.xml"); } diff --git a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/cleanup/NoDataSeededCleanupStrategiesTest.java b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/cleanup/NoDataSeededCleanupStrategiesTest.java index 379cee68..3cb0d4a3 100644 --- a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/cleanup/NoDataSeededCleanupStrategiesTest.java +++ b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/cleanup/NoDataSeededCleanupStrategiesTest.java @@ -56,6 +56,7 @@ public static Archive createDeploymentPackage() { .addClass(Query.class) // required for remote containers in order to run tests with FEST-Asserts .addPackages(true, "org.assertj.core") + .addPackages(true, "org.apache.tools") .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") .addAsResource("test-persistence-no-generate.xml", "META-INF/persistence.xml"); } diff --git a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/cleanup/StrictCleanupWithEmptyDataSetsTest.java b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/cleanup/StrictCleanupWithEmptyDataSetsTest.java index cea4cc52..9d6563fe 100644 --- a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/cleanup/StrictCleanupWithEmptyDataSetsTest.java +++ b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/cleanup/StrictCleanupWithEmptyDataSetsTest.java @@ -57,6 +57,7 @@ public static Archive createDeploymentPackage() { .addClass(Query.class) // required for remote containers in order to run tests with FEST-Asserts .addPackages(true, "org.assertj.core") + .addPackages(true, "org.apache.tools") .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") .addAsResource("test-persistence-no-generate.xml", "META-INF/persistence.xml"); } diff --git a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/contentverification/MatchingDatabaseContentUsingDataSetsTest.java b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/contentverification/MatchingDatabaseContentUsingDataSetsTest.java index f7feb1f4..00a1ad31 100644 --- a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/contentverification/MatchingDatabaseContentUsingDataSetsTest.java +++ b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/contentverification/MatchingDatabaseContentUsingDataSetsTest.java @@ -31,6 +31,7 @@ public static Archive createDeploymentPackage() { .addPackage(UserAccount.class.getPackage()) // required for remote containers in order to run tests with FEST-Asserts .addPackages(true, "org.assertj.core") + .addPackages(true, "org.apache.tools") .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") .addAsResource("test-persistence.xml", "META-INF/persistence.xml"); } diff --git a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/customscripts/CreatingSchemaUsingCustomScriptTest.java b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/customscripts/CreatingSchemaUsingCustomScriptTest.java index bb0da685..74d7d65b 100644 --- a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/customscripts/CreatingSchemaUsingCustomScriptTest.java +++ b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/customscripts/CreatingSchemaUsingCustomScriptTest.java @@ -39,6 +39,7 @@ public static Archive createDeploymentPackage() { .addPackage(UserAccount.class.getPackage()) .addClass(Query.class) .addPackages(true, "org.assertj.core") + .addPackages(true, "org.apache.tools") .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml") .addAsManifestResource("test-persistence-no-generate.xml", "persistence.xml"); } diff --git a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/enricher/InContainerConfigurationEnricherTest.java b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/enricher/InContainerConfigurationEnricherTest.java index a3486f7c..cb86cb4b 100644 --- a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/enricher/InContainerConfigurationEnricherTest.java +++ b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/enricher/InContainerConfigurationEnricherTest.java @@ -32,7 +32,9 @@ public class InContainerConfigurationEnricherTest { @Deployment public static Archive createDeployment() { return ShrinkWrap.create(JavaArchive.class, "dummy.jar") + .addClass(org.jboss.arquillian.integration.persistence.test.enricher.InContainerConfigurationEnricherTest.class) .addPackages(true, "org.assertj.core") + .addPackages(true, "org.apache.tools") .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml") .addAsManifestResource("test-persistence.xml", "persistence.xml"); } diff --git a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/seeding/SeedingStrategyTest.java b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/seeding/SeedingStrategyTest.java index ec4d1716..21957a4d 100644 --- a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/seeding/SeedingStrategyTest.java +++ b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/test/seeding/SeedingStrategyTest.java @@ -32,6 +32,7 @@ public static Archive createDeploymentPackage() { .addPackage(UserAccount.class.getPackage()) .addClass(Query.class) .addPackages(true, "org.assertj.core") + .addPackages(true, "org.apache.tools") .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml") .addAsManifestResource("test-persistence.xml", "persistence.xml"); } diff --git a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/testextension/PersistenceExtensionTesterArchiveAppender.java b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/testextension/PersistenceExtensionTesterArchiveAppender.java index 00f57cb3..b058e0aa 100644 --- a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/testextension/PersistenceExtensionTesterArchiveAppender.java +++ b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/testextension/PersistenceExtensionTesterArchiveAppender.java @@ -34,6 +34,7 @@ protected Archive buildArchive() { PersistenceExtensionTester.class), this.getClass().getPackage()) .addPackages(true, "org.assertj.core") + .addPackages(true, "org.apache.tools") .addAsServiceProvider(RemoteLoadableExtension.class, PersistenceExtensionRemoteTester.class); } } diff --git a/pom.xml b/pom.xml index 0fab8fe7..71a35fab 100644 --- a/pom.xml +++ b/pom.xml @@ -69,14 +69,16 @@ 1.1.13.Final 1.0.3.Final 3.0.0-alpha-4 + 2.0.0 3.0.1.Final 2.5.3 5.1.21 - + 1.7.20 3.0.0 2.6.0 1.10.19 + 2.0 1.0.0.CR4 @@ -86,12 +88,12 @@ 0.15.16 - 1.10 + 3.0.0 - 1.5 - 1.5 - 1.5 + 1.7 + 1.7 + 1.7 @@ -103,6 +105,15 @@ import pom + + + org.jboss.shrinkwrap.descriptors + shrinkwrap-descriptors-bom + ${version.shrinkwrap.descriptors} + import + pom + + org.jboss.arquillian arquillian-bom @@ -165,7 +176,7 @@ test - +