Repository: tomee Updated Branches: refs/heads/master 545a9ff08 -> 6f485a5fe
trying to fix the build after shrinkwrap upgrades Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/6f485a5f Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/6f485a5f Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/6f485a5f Branch: refs/heads/master Commit: 6f485a5fe4c8f6ee74b8b9d1c5cb6657fa3ecd48 Parents: 545a9ff Author: rmannibucau <rmannibu...@apache.org> Authored: Tue Jun 13 09:16:43 2017 +0200 Committer: rmannibucau <rmannibu...@apache.org> Committed: Tue Jun 13 09:16:43 2017 +0200 ---------------------------------------------------------------------- tck/bval-embedded/pom.xml | 10 ++++++++ tck/bval-embedded/src/test/resources/dev.xml | 7 +++--- tck/bval-tomee/pom.xml | 28 ++++++++--------------- tck/bval-tomee/src/test/resources/dev.xml | 3 ++- 4 files changed, 26 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/6f485a5f/tck/bval-embedded/pom.xml ---------------------------------------------------------------------- diff --git a/tck/bval-embedded/pom.xml b/tck/bval-embedded/pom.xml index 06a4767..bd62125 100644 --- a/tck/bval-embedded/pom.xml +++ b/tck/bval-embedded/pom.xml @@ -59,6 +59,16 @@ <artifactId>arquillian-openejb-embedded</artifactId> <version>${project.version}</version> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.jboss.shrinkwrap</groupId> + <artifactId>*</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.shrinkwrap.descriptors</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.tomcat</groupId> http://git-wip-us.apache.org/repos/asf/tomee/blob/6f485a5f/tck/bval-embedded/src/test/resources/dev.xml ---------------------------------------------------------------------- diff --git a/tck/bval-embedded/src/test/resources/dev.xml b/tck/bval-embedded/src/test/resources/dev.xml index dafd7f7..5c3e646 100644 --- a/tck/bval-embedded/src/test/resources/dev.xml +++ b/tck/bval-embedded/src/test/resources/dev.xml @@ -16,10 +16,11 @@ limitations under the License. --> <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"; > -<suite name="JSR-303-TCK" verbose="1"> - <test name="JSR-303-TCK"> +<suite name="BVAL-TCK" verbose="1"> + <test name="BVAL-TCK"> <classes> - <class name="org.hibernate.beanvalidation.tck.tests.integration.cdi.executable.types.ExecutableTypesTest" /> + <class name="org.hibernate.beanvalidation.tck.tests.integration.ee.cdi.ConstraintValidatorInjectionTest" /> + <class name="org.hibernate.beanvalidation.tck.tests.integration.cdi.factory.ConstraintValidatorInjectionTest" /> </classes> </test> </suite> http://git-wip-us.apache.org/repos/asf/tomee/blob/6f485a5f/tck/bval-tomee/pom.xml ---------------------------------------------------------------------- diff --git a/tck/bval-tomee/pom.xml b/tck/bval-tomee/pom.xml index 489a364..5ae185e 100644 --- a/tck/bval-tomee/pom.xml +++ b/tck/bval-tomee/pom.xml @@ -70,6 +70,16 @@ <artifactId>arquillian-tomee-remote</artifactId> <version>${project.version}</version> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.jboss.shrinkwrap</groupId> + <artifactId>*</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.shrinkwrap.descriptors</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.hibernate.beanvalidation.tck</groupId> @@ -89,24 +99,6 @@ <version>${version.arquillian}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.jboss.shrinkwrap.descriptors</groupId> - <artifactId>shrinkwrap-descriptors-spi</artifactId> - <version>${version.shrinkwrap.descriptor}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.shrinkwrap</groupId> - <artifactId>shrinkwrap-api</artifactId> - <version>${version.shrinkwrap.shrinkwrap}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.shrinkwrap</groupId> - <artifactId>shrinkwrap-impl-base</artifactId> - <version>${version.shrinkwrap.shrinkwrap}</version> - <scope>test</scope> - </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/tomee/blob/6f485a5f/tck/bval-tomee/src/test/resources/dev.xml ---------------------------------------------------------------------- diff --git a/tck/bval-tomee/src/test/resources/dev.xml b/tck/bval-tomee/src/test/resources/dev.xml index 2000f81..694abaf 100644 --- a/tck/bval-tomee/src/test/resources/dev.xml +++ b/tck/bval-tomee/src/test/resources/dev.xml @@ -19,7 +19,8 @@ <suite name="BVal-TCK" verbose="1"> <test name="BVal-TCK"> <classes> - <class name="org.hibernate.beanvalidation.tck.tests.bootstrap.ConfigurationTest" /> + <class name="org.hibernate.beanvalidation.tck.tests.integration.ee.cdi.ConstraintValidatorInjectionTest" /> + <class name="org.hibernate.beanvalidation.tck.tests.integration.cdi.factory.ConstraintValidatorInjectionTest" /> </classes> </test> </suite>
