diff --git a/dev/io.openliberty.jakarta.data.1.0_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataCoreTckLauncher.java b/dev/io.openliberty.jakarta.data.1.0_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataCoreTckLauncher.java index 95e0aa9dbd71..6424ec3aca12 100644 --- a/dev/io.openliberty.jakarta.data.1.0_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataCoreTckLauncher.java +++ b/dev/io.openliberty.jakarta.data.1.0_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataCoreTckLauncher.java @@ -79,7 +79,7 @@ public void launchDataTckCorePersistence() throws Exception { //Comment out to use SNAPSHOT additionalProps.put("jakarta.data.groupid", "jakarta.data"); - additionalProps.put("jakarta.data.tck.version", "1.0.0-RC1"); + additionalProps.put("jakarta.data.tck.version", "1.0.1"); String bucketName = "io.openliberty.jakarta.data.1.0_fat_tck"; String testName = this.getClass() + ":launchDataTckCorePersistence"; @@ -116,7 +116,7 @@ public void launchDataTckCoreNoSQL() throws Exception { //Comment out to use SNAPSHOT additionalProps.put("jakarta.data.groupid", "jakarta.data"); - additionalProps.put("jakarta.data.tck.version", "1.0.0-RC1"); + additionalProps.put("jakarta.data.tck.version", "1.0.1"); String bucketName = "io.openliberty.jakarta.data.1.0_fat_tck"; String testName = this.getClass() + ":launchDataTckCoreNoSQL"; diff --git a/dev/io.openliberty.jakarta.data.1.0_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataFullTckLauncher.java b/dev/io.openliberty.jakarta.data.1.0_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataFullTckLauncher.java index 515c8d98d51b..93edc8f54f44 100644 --- a/dev/io.openliberty.jakarta.data.1.0_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataFullTckLauncher.java +++ b/dev/io.openliberty.jakarta.data.1.0_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataFullTckLauncher.java @@ -67,13 +67,13 @@ public void launchDataTckFullPersistence() throws Exception { additionalProps.put("jakarta.profile", "full"); //Always skip signature tests on full profile (already tested in core profile) - additionalProps.put("included.groups", "full & persistence & !signature"); + additionalProps.put("included.groups", "platform & persistence & !signature"); additionalProps.put("excluded.tests", FATSuite.getExcludedTestByDatabase(DatabaseContainerType.valueOf(FATSuite.relationalDatabase))); //Comment out to use SNAPSHOT additionalProps.put("jakarta.data.groupid", "jakarta.data"); - additionalProps.put("jakarta.data.tck.version", "1.0.0-RC1"); + additionalProps.put("jakarta.data.tck.version", "1.0.1"); String bucketName = "io.openliberty.jakarta.data.1.0_fat_tck"; String testName = this.getClass() + ":launchDataTckFull"; diff --git a/dev/io.openliberty.jakarta.data.1.0_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataStandaloneTckLauncher.java b/dev/io.openliberty.jakarta.data.1.0_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataStandaloneTckLauncher.java index 64f7e719485e..7edce1a1e95b 100644 --- a/dev/io.openliberty.jakarta.data.1.0_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataStandaloneTckLauncher.java +++ b/dev/io.openliberty.jakarta.data.1.0_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataStandaloneTckLauncher.java @@ -58,7 +58,7 @@ public void launchDataTckStandaloneNoSQL() throws Exception { //Comment out to use SNAPSHOT additionalProps.put("jakarta.data.groupid", "jakarta.data"); - additionalProps.put("jakarta.data.tck.version", "1.0.0-RC1"); + additionalProps.put("jakarta.data.tck.version", "1.0.1"); String bucketName = "io.openliberty.jakarta.data.1.0_fat_tck"; String testName = this.getClass() + ":launchDataTckStandaloneNoSQL"; diff --git a/dev/io.openliberty.jakarta.data.1.0_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataWebTckLauncher.java b/dev/io.openliberty.jakarta.data.1.0_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataWebTckLauncher.java index 301400a921bf..3337bcb021dd 100644 --- a/dev/io.openliberty.jakarta.data.1.0_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataWebTckLauncher.java +++ b/dev/io.openliberty.jakarta.data.1.0_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataWebTckLauncher.java @@ -71,7 +71,7 @@ public void launchDataTckWebPersistence() throws Exception { //Comment out to use SNAPSHOT additionalProps.put("jakarta.data.groupid", "jakarta.data"); - additionalProps.put("jakarta.data.tck.version", "1.0.0-RC1"); + additionalProps.put("jakarta.data.tck.version", "1.0.1"); String bucketName = "io.openliberty.jakarta.data.1.0_fat_tck"; String testName = this.getClass() + ":launchDataTckWeb"; diff --git a/dev/io.openliberty.jakarta.data.1.0_fat_tck/publish/servers/io.openliberty.jakarta.data.1.0.core.nosql/server.xml b/dev/io.openliberty.jakarta.data.1.0_fat_tck/publish/servers/io.openliberty.jakarta.data.1.0.core.nosql/server.xml index 95286d060d57..69e9f87339a7 100644 --- a/dev/io.openliberty.jakarta.data.1.0_fat_tck/publish/servers/io.openliberty.jakarta.data.1.0.core.nosql/server.xml +++ b/dev/io.openliberty.jakarta.data.1.0_fat_tck/publish/servers/io.openliberty.jakarta.data.1.0.core.nosql/server.xml @@ -14,8 +14,8 @@ - cdi-4.0 - restfulWS-3.1 + cdi-4.1 + restfulWS-4.0 data-1.0 diff --git a/dev/io.openliberty.jakarta.data.1.0_fat_tck/publish/servers/io.openliberty.jakarta.data.1.0.core/server.xml b/dev/io.openliberty.jakarta.data.1.0_fat_tck/publish/servers/io.openliberty.jakarta.data.1.0.core/server.xml index 599f97a89a6e..8f709e77845f 100644 --- a/dev/io.openliberty.jakarta.data.1.0_fat_tck/publish/servers/io.openliberty.jakarta.data.1.0.core/server.xml +++ b/dev/io.openliberty.jakarta.data.1.0_fat_tck/publish/servers/io.openliberty.jakarta.data.1.0.core/server.xml @@ -1,5 +1,5 @@ - cdi-4.0 - restfulWS-3.1 + cdi-4.1 + restfulWS-4.0 data-1.0 - persistence-3.1 + persistence-3.2 localConnector-1.0 diff --git a/dev/io.openliberty.jakarta.data.1.0_fat_tck/publish/servers/io.openliberty.jakarta.data.1.0.full/server.xml b/dev/io.openliberty.jakarta.data.1.0_fat_tck/publish/servers/io.openliberty.jakarta.data.1.0.full/server.xml index a8072625e317..34670bb49f37 100644 --- a/dev/io.openliberty.jakarta.data.1.0_fat_tck/publish/servers/io.openliberty.jakarta.data.1.0.full/server.xml +++ b/dev/io.openliberty.jakarta.data.1.0_fat_tck/publish/servers/io.openliberty.jakarta.data.1.0.full/server.xml @@ -1,5 +1,5 @@ - jakartaee-10.0 + jakartaee-11.0 data-1.0 diff --git a/dev/io.openliberty.jakarta.data.1.0_fat_tck/publish/servers/io.openliberty.jakarta.data.1.0.web/server.xml b/dev/io.openliberty.jakarta.data.1.0_fat_tck/publish/servers/io.openliberty.jakarta.data.1.0.web/server.xml index 426157ebee34..c5c6a9e9865a 100644 --- a/dev/io.openliberty.jakarta.data.1.0_fat_tck/publish/servers/io.openliberty.jakarta.data.1.0.web/server.xml +++ b/dev/io.openliberty.jakarta.data.1.0_fat_tck/publish/servers/io.openliberty.jakarta.data.1.0.web/server.xml @@ -1,5 +1,5 @@ - webProfile-10.0 + webProfile-11.0 data-1.0 - persistence-3.1 + persistence-3.2 localConnector-1.0 diff --git a/dev/io.openliberty.jakarta.data.1.0_fat_tck/publish/tckRunner/platform/pom.xml b/dev/io.openliberty.jakarta.data.1.0_fat_tck/publish/tckRunner/platform/pom.xml index 7ccbec6d3c2e..527ffa2294b2 100644 --- a/dev/io.openliberty.jakarta.data.1.0_fat_tck/publish/tckRunner/platform/pom.xml +++ b/dev/io.openliberty.jakarta.data.1.0_fat_tck/publish/tckRunner/platform/pom.xml @@ -1,6 +1,6 @@ - org.netbeans.tools + jakarta.tck sigtest-maven-plugin ${sigtest.version} diff --git a/dev/io.openliberty.jakarta.data.1.0_fat_tck/publish/tckRunner/platform/verification.xml b/dev/io.openliberty.jakarta.data.1.0_fat_tck/publish/tckRunner/platform/verification.xml index 4011d3b12889..9ec17743727d 100644 --- a/dev/io.openliberty.jakarta.data.1.0_fat_tck/publish/tckRunner/platform/verification.xml +++ b/dev/io.openliberty.jakarta.data.1.0_fat_tck/publish/tckRunner/platform/verification.xml @@ -54,7 +54,7 @@ jakarta.servlet jakarta.servlet-api - 6.1.0-M2 + 6.1.0 jakarta.transaction @@ -84,7 +84,7 @@ - org.netbeans.tools + jakarta.tck sigtest-maven-plugin ${sigtest.version} diff --git a/dev/io.openliberty.jakarta.data.1.0_fat_tck/publish/tckRunner/pom.xml b/dev/io.openliberty.jakarta.data.1.0_fat_tck/publish/tckRunner/pom.xml index 7f1a0a967240..80cd9e7f36e0 100644 --- a/dev/io.openliberty.jakarta.data.1.0_fat_tck/publish/tckRunner/pom.xml +++ b/dev/io.openliberty.jakarta.data.1.0_fat_tck/publish/tckRunner/pom.xml @@ -32,8 +32,8 @@ jakarta.data - 1.0.0-SNAPSHOT - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT + 1.0.1-SNAPSHOT 4.0.1 @@ -43,7 +43,7 @@ 1.7.0.Final 2.1.3 5.10.0 - 1.6 + 2.3 diff --git a/dev/io.openliberty.jakarta.data.1.0_fat_tck/publish/tckRunner/standalone/pom.xml b/dev/io.openliberty.jakarta.data.1.0_fat_tck/publish/tckRunner/standalone/pom.xml index 056af8fe6871..6a50347228a2 100644 --- a/dev/io.openliberty.jakarta.data.1.0_fat_tck/publish/tckRunner/standalone/pom.xml +++ b/dev/io.openliberty.jakarta.data.1.0_fat_tck/publish/tckRunner/standalone/pom.xml @@ -74,7 +74,7 @@ junit-jupiter - org.netbeans.tools + jakarta.tck sigtest-maven-plugin ${sigtest.version} @@ -89,26 +89,24 @@ org.jboss.shrinkwrap shrinkwrap-api - 1.2.6 org.jboss.arquillian.junit5 arquillian-junit5-core - 1.7.0.Alpha13 jakarta.servlet jakarta.servlet-api - 6.0 + 6.1 system - ${io.openliberty.jakarta.servlet.6.0} + ${io.openliberty.jakarta.servlet.6.1} jakarta.enterprise jakarta.enterprise.cdi-api - 4.0 + 4.1 system - ${io.openliberty.jakarta.cdi.4.0} + ${io.openliberty.jakarta.cdi.4.1}