Upgrade TCK to 1.2.3.Final and 2.0.0.Alpha1

weld · Dec 2, 2014 · 0a6007e · 0a6007e
1 parent e1b446e
commit 0a6007e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 22 deletions.
diff --git a/jboss-tck-runner/src/test/tck12/tck-tests.xml b/jboss-tck-runner/src/test/tck12/tck-tests.xml
@@ -32,26 +32,6 @@
             </class>
 
             <!-- Issues in the TCK -->
-            <!-- CDITCK-421 -->
-            <class name="org.jboss.cdi.tck.interceptors.tests.contract.aroundInvoke.AroundInvokeAccessInterceptorTest">
-                <methods>
-                    <exclude name=".*"/>
-                </methods>
-            </class>
-
-            <class name="org.jboss.cdi.tck.interceptors.tests.contract.aroundTimeout.AroundTimeoutInterceptorTest">
-                <methods>
-                    <exclude name=".*"/>
-                </methods>
-            </class>
-
-            <!-- CDITCK-454 -->
-            <class name="org.jboss.cdi.tck.tests.deployment.discovery.BeanDiscoveryTest">
-                <methods>
-                    <exclude name=".*"/>
-                </methods>
-            </class>
-
             <!-- CDITCK-457 -->
             <class name="org.jboss.cdi.tck.tests.context.passivating.dependency.resource.webservice.WebResourcePassivationCapableDependencyTest">
                 <methods>

diff --git a/jboss-tck-runner/src/test/tck20/tck-tests.xml b/jboss-tck-runner/src/test/tck20/tck-tests.xml
@@ -26,6 +26,12 @@
             <!-- Issues in the spec -->
 
             <!-- Issues in the TCK -->
+            <!-- CDI-437 -->
+            <class name="org.jboss.cdi.tck.tests.lookup.byname.ambiguous.broken.AmbiguousELNamesTest">
+                <methods>
+                    <exclude name=".*"/>
+                </methods>
+            </class>
 
             <!-- CDITCK-457 -->
             <class name="org.jboss.cdi.tck.tests.context.passivating.dependency.resource.webservice.WebResourcePassivationCapableDependencyTest">

diff --git a/pom.xml b/pom.xml
@@ -35,8 +35,8 @@
         <arquillian.glassfish.version>1.0.0.CR1</arquillian.glassfish.version>
         <atinject.tck.version>1</atinject.tck.version>
         <build.config.version>6</build.config.version>
-        <cdi.tck-1-2.version>1.2.2.Final</cdi.tck-1-2.version>
-        <cdi.tck-2-0.version>2.0.0-SNAPSHOT</cdi.tck-2-0.version>
+        <cdi.tck-1-2.version>1.2.3.Final</cdi.tck-1-2.version>
+        <cdi.tck-2-0.version>2.0.0.Alpha1</cdi.tck-2-0.version>
         <classfilewriter.version>1.0.5.Final</classfilewriter.version>
         <contiperf.version>1.06</contiperf.version>
         <findbugs-maven-plugin.version>3.0.0</findbugs-maven-plugin.version>