excludes for jakartaee/persistence#632 Derived identity TCK tests rel…

…y on unspecified cascading behavior and increment the JPA TCK version

Signed-off-by: Scott Marlow <[email protected]>

install/jakartaee/bin/ts.jtx

@@ -86,6 +86,44 @@ com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/Client.java#fetchTest_from_
 com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/Client.java#fetchTest_from_stateful3
 com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/Client.java#fetchTest_from_stateless3
 
+# https://github.com/jakartaee/persistence/issues/632 Derived identity TCK tests rely on unspecified cascading behavior
+com/sun/ts/tests/jpa/core/derivedid/ex1a/Client.java#DIDTest_from_appmanaged
+com/sun/ts/tests/jpa/core/derivedid/ex1a/Client.java#DIDTest_from_appmanagedNoTx
+com/sun/ts/tests/jpa/core/derivedid/ex1a/Client.java#DIDTest_from_pmservlet
+com/sun/ts/tests/jpa/core/derivedid/ex1a/Client.java#DIDTest_from_puservlet
+com/sun/ts/tests/jpa/core/derivedid/ex1a/Client.java#DIDTest_from_stateful3
+com/sun/ts/tests/jpa/core/derivedid/ex1a/Client.java#DIDTest_from_stateless3
+com/sun/ts/tests/jpa/core/derivedid/ex1b/Client.java#DIDTest_from_appmanaged
+com/sun/ts/tests/jpa/core/derivedid/ex1b/Client.java#DIDTest_from_appmanagedNoTx
+com/sun/ts/tests/jpa/core/derivedid/ex1b/Client.java#DIDTest_from_pmservlet
+com/sun/ts/tests/jpa/core/derivedid/ex1b/Client.java#DIDTest_from_puservlet
+com/sun/ts/tests/jpa/core/derivedid/ex1b/Client.java#DIDTest_from_stateful3
+com/sun/ts/tests/jpa/core/derivedid/ex1b/Client.java#DIDTest_from_stateless3
+com/sun/ts/tests/jpa/core/derivedid/ex2b/Client.java#DIDTest_from_appmanaged
+com/sun/ts/tests/jpa/core/derivedid/ex2b/Client.java#DIDTest_from_appmanagedNoTx
+com/sun/ts/tests/jpa/core/derivedid/ex2b/Client.java#DIDTest_from_pmservlet
+com/sun/ts/tests/jpa/core/derivedid/ex2b/Client.java#DIDTest_from_puservlet
+com/sun/ts/tests/jpa/core/derivedid/ex2b/Client.java#DIDTest_from_stateful3
+com/sun/ts/tests/jpa/core/derivedid/ex2b/Client.java#DIDTest_from_stateless3
+com/sun/ts/tests/jpa/core/derivedid/ex3a/Client.java#DIDTest_from_appmanaged
+com/sun/ts/tests/jpa/core/derivedid/ex3a/Client.java#DIDTest_from_appmanagedNoTx
+com/sun/ts/tests/jpa/core/derivedid/ex3a/Client.java#DIDTest_from_pmservlet
+com/sun/ts/tests/jpa/core/derivedid/ex3a/Client.java#DIDTest_from_puservlet
+com/sun/ts/tests/jpa/core/derivedid/ex3a/Client.java#DIDTest_from_stateful3
+com/sun/ts/tests/jpa/core/derivedid/ex3a/Client.java#DIDTest_from_stateless3
+com/sun/ts/tests/jpa/core/derivedid/ex3b/Client.java#DIDTest_from_appmanaged
+com/sun/ts/tests/jpa/core/derivedid/ex3b/Client.java#DIDTest_from_appmanagedNoTx
+com/sun/ts/tests/jpa/core/derivedid/ex3b/Client.java#DIDTest_from_pmservlet
+com/sun/ts/tests/jpa/core/derivedid/ex3b/Client.java#DIDTest_from_puservlet
+com/sun/ts/tests/jpa/core/derivedid/ex3b/Client.java#DIDTest_from_stateful3
+com/sun/ts/tests/jpa/core/derivedid/ex3b/Client.java#DIDTest_from_stateless3
+com/sun/ts/tests/jpa/core/annotations/mapsid/Client.java#persistMX1Test1_from_appmanaged
+com/sun/ts/tests/jpa/core/annotations/mapsid/Client.java#persistMX1Test1_from_appmanagedNoTx
+com/sun/ts/tests/jpa/core/annotations/mapsid/Client.java#persistMX1Test1_from_pmservlet
+com/sun/ts/tests/jpa/core/annotations/mapsid/Client.java#persistMX1Test1_from_puservlet
+com/sun/ts/tests/jpa/core/annotations/mapsid/Client.java#persistMX1Test1_from_stateful3
+com/sun/ts/tests/jpa/core/annotations/mapsid/Client.java#persistMX1Test1_from_stateless3
+
 ################
 # Security API
 ################

install/jpa/bin/ts.jtx

@@ -41,3 +41,12 @@ com/sun/ts/tests/jpa/se/entityManager/Client.java#typedQueryMethodsAfterClose16T
 
 # https://github.com/jakartaee/persistence/issues/591 Multiple fetch joins for same attribute
 com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/Client.java#fetchTest_from_standalone
+
+# https://github.com/jakartaee/persistence/issues/632 Derived identity TCK tests rely on unspecified cascading behavior
+com/sun/ts/tests/jpa/core/derivedid/ex1a/Client.java#DIDTest_from_standalone
+com/sun/ts/tests/jpa/core/derivedid/ex1b/Client.java#DIDTest_from_standalone
+com/sun/ts/tests/jpa/core/derivedid/ex2b/Client.java#DIDTest_from_standalone
+com/sun/ts/tests/jpa/core/derivedid/ex3a/Client.java#DIDTest_from_standalone
+com/sun/ts/tests/jpa/core/derivedid/ex3b/Client.java#DIDTest_from_standalone
+com/sun/ts/tests/jpa/core/annotations/mapsid/Client.java#persistMX1Test1_from_standalone
+

release/tools/jpa.xml

@@ -22,7 +22,7 @@
     <import file="../../bin/xml/ts.common.props.xml"/>
 
     <property name="deliverable.version" value="3.1"/>
-    <property name="deliverable.tck.version" value="3.1.4"/>
+    <property name="deliverable.tck.version" value="3.1.5"/>
 
     <target name="init">
         <mkdir dir="${deliverable.bundle.dir}/bin"/>