Merge pull request #1334 from scottmarlow/issues_632_637_10.0.x

Address accepted Persistence 3.1 TCK issues 632 + 637

install/jakartaee/bin/ts.jtx

@@ -86,6 +86,131 @@ 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
+
+# https://github.com/jakartaee/persistence/issues/637 TCK should not set version on entity manually
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#intFieldTest_from_appmanaged
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#intFieldTest_from_appmanagedNoTx
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#intFieldTest_from_pmservlet
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#intFieldTest_from_puservlet
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#intFieldTest_from_stateful3
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#intFieldTest_from_stateless3
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#intPropertyTest_from_appmanaged
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#intPropertyTest_from_appmanagedNoTx
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#intPropertyTest_from_pmservlet
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#intPropertyTest_from_puservlet
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#intPropertyTest_from_stateful3
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#intPropertyTest_from_stateless3
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#integerFieldTest_from_appmanaged
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#integerFieldTest_from_appmanagedNoTx
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#integerFieldTest_from_pmservlet
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#integerFieldTest_from_puservlet
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#integerFieldTest_from_stateful3
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#integerFieldTest_from_stateless3
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#integerPropertyTest_from_appmanaged
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#integerPropertyTest_from_appmanagedNoTx
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#integerPropertyTest_from_pmservlet
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#integerPropertyTest_from_puservlet
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#integerPropertyTest_from_stateful3
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#integerPropertyTest_from_stateless3
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#longClassFieldTest_from_appmanaged
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#longClassFieldTest_from_appmanagedNoTx
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#longClassFieldTest_from_pmservlet
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#longClassFieldTest_from_puservlet
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#longClassFieldTest_from_stateful3
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#longClassFieldTest_from_stateless3
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#longClassPropertyTest_from_appmanaged
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#longClassPropertyTest_from_appmanagedNoTx
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#longClassPropertyTest_from_pmservlet
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#longClassPropertyTest_from_puservlet
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#longClassPropertyTest_from_stateful3
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#longClassPropertyTest_from_stateless3
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#longFieldTest_from_appmanaged
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#longFieldTest_from_appmanagedNoTx
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#longFieldTest_from_pmservlet
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#longFieldTest_from_puservlet
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#longFieldTest_from_stateful3
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#longFieldTest_from_stateless3
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#longPropertyTest_from_appmanaged
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#longPropertyTest_from_appmanagedNoTx
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#longPropertyTest_from_pmservlet
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#longPropertyTest_from_puservlet
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#longPropertyTest_from_stateful3
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#longPropertyTest_from_stateless3
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortClassFieldTest_from_appmanaged
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortClassFieldTest_from_appmanagedNoTx
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortClassFieldTest_from_pmservlet
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortClassFieldTest_from_puservlet
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortClassFieldTest_from_stateful3
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortClassFieldTest_from_stateless3
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortClassPropertyTest_from_appmanaged
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortClassPropertyTest_from_appmanagedNoTx
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortClassPropertyTest_from_pmservlet
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortClassPropertyTest_from_puservlet
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortClassPropertyTest_from_stateful3
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortClassPropertyTest_from_stateless3
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortFieldTest_from_appmanaged
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortFieldTest_from_appmanagedNoTx
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortFieldTest_from_pmservlet
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortFieldTest_from_puservlet
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortFieldTest_from_stateful3
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortFieldTest_from_stateless3
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortPropertyTest_from_appmanaged
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortPropertyTest_from_appmanagedNoTx
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortPropertyTest_from_pmservlet
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortPropertyTest_from_puservlet
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortPropertyTest_from_stateful3
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortPropertyTest_from_stateless3
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#timestampFieldTest_from_appmanaged
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#timestampFieldTest_from_appmanagedNoTx
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#timestampFieldTest_from_pmservlet
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#timestampFieldTest_from_puservlet
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#timestampFieldTest_from_stateful3
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#timestampFieldTest_from_stateless3
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#timestampPropertyTest_from_appmanaged
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#timestampPropertyTest_from_appmanagedNoTx
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#timestampPropertyTest_from_pmservlet
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#timestampPropertyTest_from_puservlet
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#timestampPropertyTest_from_stateful3
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#timestampPropertyTest_from_stateless3
+
+
 ################
 # Security API
 ################

install/jpa/bin/ts.jtx

@@ -41,3 +41,28 @@ 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
+
+# https://github.com/jakartaee/persistence/issues/637 TCK should not set version on entity manually
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#intFieldTest_from_standalone
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#intPropertyTest_from_standalone
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#integerFieldTest_from_standalone
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#integerPropertyTest_from_standalone
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#longClassFieldTest_from_standalone
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#longClassPropertyTest_from_standalone
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#longFieldTest_from_standalone
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#longPropertyTest_from_standalone
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortClassFieldTest_from_standalone
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortClassPropertyTest_from_standalone
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortFieldTest_from_standalone
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#shortPropertyTest_from_standalone
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#timestampFieldTest_from_standalone
+com/sun/ts/tests/jpa/core/annotations/version/Client.java#timestampPropertyTest_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"/>