diff --git a/dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml b/dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml index 9adc0af2668..c7db5d93f3c 100644 --- a/dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml +++ b/dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml @@ -1631,6 +1631,16 @@ 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 diff --git a/dev/cnf/oss_dependencies.maven b/dev/cnf/oss_dependencies.maven index 03620d7dcd0..723f9cee3d2 100644 --- a/dev/cnf/oss_dependencies.maven +++ b/dev/cnf/oss_dependencies.maven @@ -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 diff --git a/dev/io.openliberty.jakarta.data.1.1/bnd.bnd b/dev/io.openliberty.jakarta.data.1.1/bnd.bnd index bd5bdc4e070..81613bf8fda 100644 --- a/dev/io.openliberty.jakarta.data.1.1/bnd.bnd +++ b/dev/io.openliberty.jakarta.data.1.1/bnd.bnd @@ -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 diff --git a/dev/io.openliberty.jakarta.data.1.1/src/jakarta/data/repository/stateful/Detach.java b/dev/io.openliberty.jakarta.data.1.1/src/jakarta/data/repository/stateful/Detach.java deleted file mode 100644 index 23370e97dd0..00000000000 --- a/dev/io.openliberty.jakarta.data.1.1/src/jakarta/data/repository/stateful/Detach.java +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2026 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package jakarta.data.repository.stateful; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Copied from Jakarta Data. - */ -@Documented -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.METHOD) -public @interface Detach { - -} diff --git a/dev/io.openliberty.jakarta.data.1.1/src/jakarta/data/repository/stateful/Merge.java b/dev/io.openliberty.jakarta.data.1.1/src/jakarta/data/repository/stateful/Merge.java deleted file mode 100644 index 1ba9234433e..00000000000 --- a/dev/io.openliberty.jakarta.data.1.1/src/jakarta/data/repository/stateful/Merge.java +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2026 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package jakarta.data.repository.stateful; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Copied from Jakarta Data. - */ -@Documented -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.METHOD) -public @interface Merge { - -} diff --git a/dev/io.openliberty.jakarta.data.1.1/src/jakarta/data/repository/stateful/Persist.java b/dev/io.openliberty.jakarta.data.1.1/src/jakarta/data/repository/stateful/Persist.java deleted file mode 100644 index ca615ec111b..00000000000 --- a/dev/io.openliberty.jakarta.data.1.1/src/jakarta/data/repository/stateful/Persist.java +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2026 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package jakarta.data.repository.stateful; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Copied from Jakarta Data. - */ -@Documented -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.METHOD) -public @interface Persist { - -} diff --git a/dev/io.openliberty.jakarta.data.1.1/src/jakarta/data/repository/stateful/Refresh.java b/dev/io.openliberty.jakarta.data.1.1/src/jakarta/data/repository/stateful/Refresh.java deleted file mode 100644 index b9d85712945..00000000000 --- a/dev/io.openliberty.jakarta.data.1.1/src/jakarta/data/repository/stateful/Refresh.java +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2026 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package jakarta.data.repository.stateful; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Copied from Jakarta Data. - */ -@Documented -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.METHOD) -public @interface Refresh { - -} diff --git a/dev/io.openliberty.jakarta.data.1.1/src/jakarta/data/repository/stateful/Remove.java b/dev/io.openliberty.jakarta.data.1.1/src/jakarta/data/repository/stateful/Remove.java deleted file mode 100644 index 535fbd1c9c8..00000000000 --- a/dev/io.openliberty.jakarta.data.1.1/src/jakarta/data/repository/stateful/Remove.java +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2026 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package jakarta.data.repository.stateful; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Copied from Jakarta Data. - */ -@Documented -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.METHOD) -public @interface Remove { - -} diff --git a/dev/io.openliberty.jakarta.data.1.1_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataCoreTckLauncher.java b/dev/io.openliberty.jakarta.data.1.1_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataCoreTckLauncher.java index b07f7dd079e..a81811c0271 100644 --- a/dev/io.openliberty.jakarta.data.1.1_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataCoreTckLauncher.java +++ b/dev/io.openliberty.jakarta.data.1.1_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataCoreTckLauncher.java @@ -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; @@ -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") @@ -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 { @@ -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") diff --git a/dev/io.openliberty.jakarta.data.1.1_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataFullTckLauncher.java b/dev/io.openliberty.jakarta.data.1.1_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataFullTckLauncher.java index fe0c475df37..3152bc0d077 100644 --- a/dev/io.openliberty.jakarta.data.1.1_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataFullTckLauncher.java +++ b/dev/io.openliberty.jakarta.data.1.1_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataFullTckLauncher.java @@ -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") diff --git a/dev/io.openliberty.jakarta.data.1.1_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataStandaloneTckLauncher.java b/dev/io.openliberty.jakarta.data.1.1_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataStandaloneTckLauncher.java index c5a14ae386e..881254ca1f0 100644 --- a/dev/io.openliberty.jakarta.data.1.1_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataStandaloneTckLauncher.java +++ b/dev/io.openliberty.jakarta.data.1.1_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataStandaloneTckLauncher.java @@ -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") diff --git a/dev/io.openliberty.jakarta.data.1.1_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataWebTckLauncher.java b/dev/io.openliberty.jakarta.data.1.1_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataWebTckLauncher.java index 0ec837aa0ec..999c743e7fd 100644 --- a/dev/io.openliberty.jakarta.data.1.1_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataWebTckLauncher.java +++ b/dev/io.openliberty.jakarta.data.1.1_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataWebTckLauncher.java @@ -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") diff --git a/dev/io.openliberty.jakarta.data.1.1_fat_tck/publish/tckRunner/platform/pom.xml b/dev/io.openliberty.jakarta.data.1.1_fat_tck/publish/tckRunner/platform/pom.xml index 79327f33162..3565c149e39 100644 --- a/dev/io.openliberty.jakarta.data.1.1_fat_tck/publish/tckRunner/platform/pom.xml +++ b/dev/io.openliberty.jakarta.data.1.1_fat_tck/publish/tckRunner/platform/pom.xml @@ -35,7 +35,7 @@ jakarta.data-tck ${jakarta.data.tck.version} - + ${jakarta.data.groupid} jakarta.data-api diff --git a/dev/io.openliberty.jakarta.data.1.1_fat_tck/publish/tckRunner/platform/verification.xml b/dev/io.openliberty.jakarta.data.1.1_fat_tck/publish/tckRunner/platform/verification.xml index 74ca9bebab6..6fec1604801 100644 --- a/dev/io.openliberty.jakarta.data.1.1_fat_tck/publish/tckRunner/platform/verification.xml +++ b/dev/io.openliberty.jakarta.data.1.1_fat_tck/publish/tckRunner/platform/verification.xml @@ -41,6 +41,12 @@ jakarta.data-api ${jakarta.data.version} + + + jakarta.data + jakarta.data.stateful-api + ${jakarta.data.version} +