use latest CdiTck version for the whole project and skip known bad tests
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/6687dec8 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/6687dec8 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/6687dec8 Branch: refs/heads/tomee-1.7.x Commit: 6687dec8de7921ec8e2aca65c6e995bcd1151881 Parents: 2a36004 Author: Mark Struberg <[email protected]> Authored: Wed Nov 26 11:33:04 2014 +0100 Committer: Mark Struberg <[email protected]> Committed: Wed Nov 26 11:33:04 2014 +0100 ---------------------------------------------------------------------- tck/cdi-embedded/pom.xml | 2 +- tck/cdi-tomee-embedded/pom.xml | 2 +- tck/cdi-tomee/pom.xml | 2 +- tck/cdi-tomee/src/test/resources/passing.xml | 16 +++++++++++++++- tck/pom.xml | 1 + 5 files changed, 19 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/6687dec8/tck/cdi-embedded/pom.xml ---------------------------------------------------------------------- diff --git a/tck/cdi-embedded/pom.xml b/tck/cdi-embedded/pom.xml index d46ceba..ac58296 100644 --- a/tck/cdi-embedded/pom.xml +++ b/tck/cdi-embedded/pom.xml @@ -48,7 +48,7 @@ <dependency> <groupId>org.jboss.jsr299.tck</groupId> <artifactId>jsr299-tck-impl</artifactId> - <version>1.0.6.Final</version> + <version>${cditck.version}</version> <exclusions> <exclusion> <groupId>org.testng</groupId> http://git-wip-us.apache.org/repos/asf/tomee/blob/6687dec8/tck/cdi-tomee-embedded/pom.xml ---------------------------------------------------------------------- diff --git a/tck/cdi-tomee-embedded/pom.xml b/tck/cdi-tomee-embedded/pom.xml index 889d985..feee9d7 100644 --- a/tck/cdi-tomee-embedded/pom.xml +++ b/tck/cdi-tomee-embedded/pom.xml @@ -44,7 +44,7 @@ <dependency> <groupId>org.jboss.jsr299.tck</groupId> <artifactId>jsr299-tck-impl</artifactId> - <version>1.0.4.SP1</version> + <version>${cditck.version}</version> <exclusions> <exclusion> <groupId>org.testng</groupId> http://git-wip-us.apache.org/repos/asf/tomee/blob/6687dec8/tck/cdi-tomee/pom.xml ---------------------------------------------------------------------- diff --git a/tck/cdi-tomee/pom.xml b/tck/cdi-tomee/pom.xml index 191dd66..2cf856c 100644 --- a/tck/cdi-tomee/pom.xml +++ b/tck/cdi-tomee/pom.xml @@ -99,7 +99,7 @@ <dependency> <groupId>org.jboss.jsr299.tck</groupId> <artifactId>jsr299-tck-impl</artifactId> - <version>1.0.4.SP1</version> + <version>${cditck.version}</version> <exclusions> <exclusion> <groupId>org.testng</groupId> http://git-wip-us.apache.org/repos/asf/tomee/blob/6687dec8/tck/cdi-tomee/src/test/resources/passing.xml ---------------------------------------------------------------------- diff --git a/tck/cdi-tomee/src/test/resources/passing.xml b/tck/cdi-tomee/src/test/resources/passing.xml index a8ae68a..08b4d44 100644 --- a/tck/cdi-tomee/src/test/resources/passing.xml +++ b/tck/cdi-tomee/src/test/resources/passing.xml @@ -22,7 +22,21 @@ <package name="org.jboss.jsr299.tck.interceptors.tests.*"/> </packages> <classes> - <class name="org.jboss.jsr299.tck.tests.context.passivating.broken.dependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean.EnterpriseBeanWithIllegalDependencyTest"> + <!-- ERROR in TCK, see CDITCK-265 --> + <class name="org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle.ProducerFieldLifecycleTest"> + <methods> + <exclude name=".*"></exclude> + </methods> + </class> + + <!-- ERROR in TCK, see CDITCK-458 --> + <class name="org.jboss.jsr299.tck.tests.extensions.processBean.ProcessBeanTest"> + <methods> + <exclude name=".*"></exclude> + </methods> + </class> + + <class name="org.jboss.jsr299.tck.tests.context.passivating.broken.dependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean.EnterpriseBeanWithIllegalDependencyTest"> <methods> <exclude name="test"/> </methods> http://git-wip-us.apache.org/repos/asf/tomee/blob/6687dec8/tck/pom.xml ---------------------------------------------------------------------- diff --git a/tck/pom.xml b/tck/pom.xml index 173fa6c..f60fca4 100644 --- a/tck/pom.xml +++ b/tck/pom.xml @@ -27,6 +27,7 @@ <name>OpenEJB :: TCK</name> <properties> + <cditck.version>1.0.6.Final</cditck.version> <test.coverage.skip>true</test.coverage.skip> </properties>
