Skip to content

dep: update Jakarta Data to 1.1.0-M4 #35740

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KyleAure merged 2 commits into from
Sep 14, 2026
Merged

dep: update Jakarta Data to 1.1.0-M4 #35740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3fa9e46
dep: add jakarta.data:jakarta.data.stateful-api;1.1.0.M4
KyleAure Sep 8, 2026
2e71c96
fix: update tck project for M4
KyleAure Sep 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1631,6 +1631,16 @@
<artifactId>jakarta.data-api</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.data</groupId>
<artifactId>jakarta.data-api</artifactId>
<version>1.1.0-M4</version>
</dependency>
<dependency>
<groupId>jakarta.data</groupId>
<artifactId>jakarta.data.stateful-api</artifactId>
<version>1.1.0-M4</version>
</dependency>
<dependency>
<groupId>jakarta.ejb</groupId>
<artifactId>jakarta.ejb-api</artifactId>
Expand Down
2 changes: 2 additions & 0 deletions dev/cnf/oss_dependencies.maven
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,8 @@ jakarta.batch:jakarta.batch-api:2.0.0
jakarta.batch:jakarta.batch-api:2.1.1
jakarta.concurrency:jakarta.concurrency-api:3.2.0-M2
jakarta.data:jakarta.data-api:1.0.0
jakarta.data:jakarta.data-api:1.1.0-M4
jakarta.data:jakarta.data.stateful-api:1.1.0-M4
jakarta.ejb:jakarta.ejb-api:4.0.1
jakarta.enterprise.concurrent:jakarta.enterprise.concurrent-api:2.0.0
jakarta.enterprise.concurrent:jakarta.enterprise.concurrent-api:3.0.4
Expand Down
9 changes: 6 additions & 3 deletions dev/io.openliberty.jakarta.data.1.1/bnd.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,13 @@ Export-Package: \
Private-Package: \
jakarta.data.messages;version="1.0.0"

instrument.classesExcludes: jakarta/data/*.class
# Do not instrument classes otherwise we will fail the TCK
instrument.disabled: true

#-includeresource: \
# @${repo;jakarta.data:jakarta.data-api;1.0.0;EXACT}!/!(META-INF/maven/*|module-info.class)
# TODO remove checkstyle.xml|rules.xml once https://github.com/jakartaee/data/issues/1562 is fixed.
# @${repo;jakarta.data:jakarta.data-api;1.1.0.M4;EXACT}!/!(META-INF/maven/*|module-info.class|checkstyle.xml|rules.xml)
-includeresource: \
@${repo;jakarta.data:jakarta.data.stateful-api;1.1.0.M4;EXACT}!/!(META-INF/maven/*|module-info.class|checkstyle.xml|rules.xml)

publish.wlp.jar.suffix: dev/api/spec

Expand Down
29 changes: 0 additions & 29 deletions dev/io.openliberty.jakarta.data.1.1/src/jakarta/data/repository/stateful/Detach.java
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions dev/io.openliberty.jakarta.data.1.1/src/jakarta/data/repository/stateful/Merge.java
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions dev/io.openliberty.jakarta.data.1.1/src/jakarta/data/repository/stateful/Persist.java
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions dev/io.openliberty.jakarta.data.1.1/src/jakarta/data/repository/stateful/Refresh.java
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions dev/io.openliberty.jakarta.data.1.1/src/jakarta/data/repository/stateful/Remove.java
View file
Open in desktop

This file was deleted.

10 changes: 6 additions & 4 deletions ...jakarta.data.1.1_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataCoreTckLauncher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import java.util.Map;

import org.junit.After;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;

Expand Down Expand Up @@ -85,8 +86,8 @@ public void launchDataTckCorePersistence() throws Exception {
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.1.0");
additionalProps.put("jakarta.data.groupid", "jakarta.data");
additionalProps.put("jakarta.data.tck.version", "1.1.0-M4");

TCKRunner.build(persistenceServer, Type.JAKARTA, "Data")
.withPlatformVersion("12")
Expand All @@ -101,6 +102,7 @@ public void launchDataTckCorePersistence() throws Exception {
* Run the TCK (controlled by autoFVT/publish/tckRunner/tck/*)
*/
@Test
@Ignore("TODO: wait until we have a nosql-1.1 feature")
@AllowedFFDC // The tested exceptions cause FFDC so we have to allow for this.
public void launchDataTckCoreNoSQL() throws Exception {

Expand Down Expand Up @@ -137,8 +139,8 @@ public void launchDataTckCoreNoSQL() throws Exception {
additionalProps.put("excluded.tests", String.join(", ", exclude));

//Comment out to use SNAPSHOT
// additionalProps.put("jakarta.data.groupid", "jakarta.data");
// additionalProps.put("jakarta.data.tck.version", "1.1.0");
additionalProps.put("jakarta.data.groupid", "jakarta.data");
additionalProps.put("jakarta.data.tck.version", "1.1.0-M4");

TCKRunner.build(noSQLServer, Type.JAKARTA, "Data")
.withPlatformVersion("12")
Expand Down
4 changes: 2 additions & 2 deletions ...jakarta.data.1.1_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataFullTckLauncher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ public void launchDataTckFullPersistence() throws Exception {
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.1.0");
additionalProps.put("jakarta.data.groupid", "jakarta.data");
additionalProps.put("jakarta.data.tck.version", "1.1.0-M4");

TCKRunner.build(server, Type.JAKARTA, "Data")
.withPlatformVersion("12")
Expand Down
4 changes: 2 additions & 2 deletions ...a.data.1.1_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataStandaloneTckLauncher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ public void launchDataTckStandaloneNoSQL() throws Exception {
additionalProps.put("included.groups", "standalone & nosql");

//Comment out to use SNAPSHOT
// additionalProps.put("jakarta.data.groupid", "jakarta.data");
// additionalProps.put("jakarta.data.tck.version", "1.1.0");
additionalProps.put("jakarta.data.groupid", "jakarta.data");
additionalProps.put("jakarta.data.tck.version", "1.1.0-M4");

TCKRunner.build(DONOTSTART, Type.JAKARTA, "Data")
.withPlatformVersion("12")
Expand Down
4 changes: 2 additions & 2 deletions ....jakarta.data.1.1_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataWebTckLauncher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ public void launchDataTckWebPersistence() throws Exception {
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.1.0");
additionalProps.put("jakarta.data.groupid", "jakarta.data");
additionalProps.put("jakarta.data.tck.version", "1.1.0-M4");

TCKRunner.build(server, Type.JAKARTA, "Data")
.withPlatformVersion("12")
Expand Down
2 changes: 1 addition & 1 deletion dev/io.openliberty.jakarta.data.1.1_fat_tck/publish/tckRunner/platform/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<artifactId>jakarta.data-tck</artifactId>
<version>${jakarta.data.tck.version}</version>
</dependency>
<!-- api - data - internal bundle -->
<!-- api - data - internal bundle (General API and Stateful API-->
<dependency>
<groupId>${jakarta.data.groupid}</groupId>
<artifactId>jakarta.data-api</artifactId>
Expand Down
6 changes: 6 additions & 0 deletions dev/io.openliberty.jakarta.data.1.1_fat_tck/publish/tckRunner/platform/verification.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@
<artifactId>jakarta.data-api</artifactId>
<version>${jakarta.data.version}</version>
</dependency>
<!-- api - data stateful - internal bundle -->
<dependency>
<groupId>jakarta.data</groupId>
<artifactId>jakarta.data.stateful-api</artifactId>
<version>${jakarta.data.version}</version>
</dependency>

<!-- The Liberty Arquillian plugin -->
<dependency>
Expand Down