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 668f0f8c705e..f400ce788ee4 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 @@ -719,7 +719,7 @@ jakarta.batch jakarta.batch-api - 2.1.0 + 2.1.1 jakarta.ejb diff --git a/dev/cnf/oss_dependencies.maven b/dev/cnf/oss_dependencies.maven index 7a86e010661f..566b128df1ba 100644 --- a/dev/cnf/oss_dependencies.maven +++ b/dev/cnf/oss_dependencies.maven @@ -139,7 +139,7 @@ jakarta.authentication:jakarta.authentication-api:3.0.0 jakarta.authorization:jakarta.authorization-api:2.0.0 jakarta.authorization:jakarta.authorization-api:2.1.0 jakarta.batch:jakarta.batch-api:2.0.0 -jakarta.batch:jakarta.batch-api:2.1.0 +jakarta.batch:jakarta.batch-api:2.1.1 jakarta.ejb:jakarta.ejb-api:4.0.0 jakarta.enterprise.concurrent:jakarta.enterprise.concurrent-api:2.0.0 jakarta.enterprise.concurrent:jakarta.enterprise.concurrent-api:3.0.0 diff --git a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.jsonbImpl-3.0.0.feature b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.jsonbImpl-3.0.0.feature index ac483fa5e972..27a1d091345e 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.jsonbImpl-3.0.0.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.jsonbImpl-3.0.0.feature @@ -8,7 +8,7 @@ visibility=private io.openliberty.jakarta.cdi-4.0, \ io.openliberty.jsonp-2.1 -bundles=\ - io.openliberty.jakarta.jsonb.3.0; location:="dev/api/spec/,lib/"; mavenCoordinates="io.openliberty.jakarta.json.bind:jakarta.json.bind-api:3.0.0" + io.openliberty.jakarta.jsonb.3.0; location:="dev/api/spec/,lib/"; mavenCoordinates="jakarta.json.bind:jakarta.json.bind-api:3.0.0" kind=noship edition=full WLP-Activation-Type: parallel diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/batch-2.1/io.openliberty.batch-2.1.feature b/dev/com.ibm.websphere.appserver.features/visibility/public/batch-2.1/io.openliberty.batch-2.1.feature index 9d098dcc507f..8a7848b7fb4c 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/public/batch-2.1/io.openliberty.batch-2.1.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/public/batch-2.1/io.openliberty.batch-2.1.feature @@ -32,7 +32,7 @@ Subsystem-Name: Jakarta Batch 2.1 com.ibm.ws.security.credentials, \ com.ibm.websphere.security, \ com.ibm.jbatch.container.jakarta, \ - io.openliberty.jakarta.batch.2.1; location:="dev/api/spec/,lib/"; mavenCoordinates="jakarta.batch:jakarta.batch-api:2.1.0" + io.openliberty.jakarta.batch.2.1; location:="dev/api/spec/,lib/"; mavenCoordinates="jakarta.batch:jakarta.batch-api:2.1.1" kind=noship edition=full WLP-Activation-Type: parallel diff --git a/dev/com.ibm.ws.persistence_fat/fat/src/com/ibm/ws/persistence/fat/ConsumerTest_JPA31.java b/dev/com.ibm.ws.persistence_fat/fat/src/com/ibm/ws/persistence/fat/ConsumerTest_JPA31.java index 471cf66098e4..071aacece792 100644 --- a/dev/com.ibm.ws.persistence_fat/fat/src/com/ibm/ws/persistence/fat/ConsumerTest_JPA31.java +++ b/dev/com.ibm.ws.persistence_fat/fat/src/com/ibm/ws/persistence/fat/ConsumerTest_JPA31.java @@ -27,7 +27,7 @@ import componenttest.annotation.Server; import componenttest.annotation.TestServlet; import componenttest.custom.junit.runner.FATRunner; -import componenttest.rules.repeater.JakartaEE9Action; +import componenttest.rules.repeater.JakartaEE10Action; import componenttest.topology.impl.LibertyServer; import componenttest.topology.utils.FATServletClient; import persistence_fat.consumer.web.ConsumerServlet; @@ -51,13 +51,13 @@ public static void beforeClass() throws Exception { Assert.assertTrue(server.fileExistsInLibertyInstallRoot("lib/com.ibm.ws.persistence.consumer.jar")); Path someArchive = Paths.get(server.getInstallRoot() + File.separatorChar + "lib" + File.separatorChar + "com.ibm.ws.persistence.consumer.jar"); - JakartaEE9Action.transformApp(someArchive); + JakartaEE10Action.transformApp(someArchive); ShrinkHelper.defaultDropinApp(server, APP_NAME, "persistence_fat.consumer.ejb", "persistence_fat.consumer.model", "persistence_fat.consumer.web"); Path warArchive = Paths.get(server.getServerRoot() + File.separatorChar + "dropins" + File.separatorChar + APP_NAME + ".war"); - JakartaEE9Action.transformApp(warArchive); + JakartaEE10Action.transformApp(warArchive); server.startServer(); } diff --git a/dev/io.openliberty.jakarta.authentication.2.0/bnd.bnd b/dev/io.openliberty.jakarta.authentication.2.0/bnd.bnd index 0828cf184f1c..5b8bc4873f07 100644 --- a/dev/io.openliberty.jakarta.authentication.2.0/bnd.bnd +++ b/dev/io.openliberty.jakarta.authentication.2.0/bnd.bnd @@ -24,5 +24,5 @@ instrument.disabled: true publish.wlp.jar.suffix: dev/api/spec -buildpath: \ - jakarta.authentication:jakarta.authentication-api;version="[2.0.0,2.1.0)", \ + jakarta.authentication:jakarta.authentication-api;version=2.0.0;strategy=exact, \ com.ibm.ws.org.osgi.annotation.versioning;version=latest diff --git a/dev/io.openliberty.jakarta.authorization.2.0/bnd.bnd b/dev/io.openliberty.jakarta.authorization.2.0/bnd.bnd index ca113d9c697d..3ffec86bc428 100644 --- a/dev/io.openliberty.jakarta.authorization.2.0/bnd.bnd +++ b/dev/io.openliberty.jakarta.authorization.2.0/bnd.bnd @@ -21,4 +21,4 @@ instrument.disabled: true publish.wlp.jar.suffix: dev/api/spec -buildpath: \ - jakarta.authorization:jakarta.authorization-api;version="[2.0.0,2.1.0)" + jakarta.authorization:jakarta.authorization-api;version=2.0.0;strategy=exact diff --git a/dev/io.openliberty.jakarta.batch.2.0/bnd.bnd b/dev/io.openliberty.jakarta.batch.2.0/bnd.bnd index 694c469c7134..04d9e44cf333 100644 --- a/dev/io.openliberty.jakarta.batch.2.0/bnd.bnd +++ b/dev/io.openliberty.jakarta.batch.2.0/bnd.bnd @@ -42,6 +42,6 @@ instrument.disabled: true publish.wlp.jar.suffix: dev/api/spec -buildpath: \ - jakarta.batch:jakarta.batch-api;version="[2.0.0,2.1.0)",\ + jakarta.batch:jakarta.batch-api;version=2.0.0;strategy=exact,\ com.ibm.websphere.org.osgi.core;version=latest diff --git a/dev/io.openliberty.jakarta.batch.2.1/bnd.bnd b/dev/io.openliberty.jakarta.batch.2.1/bnd.bnd index fa16baf1d72a..70cf586bacb4 100644 --- a/dev/io.openliberty.jakarta.batch.2.1/bnd.bnd +++ b/dev/io.openliberty.jakarta.batch.2.1/bnd.bnd @@ -40,14 +40,13 @@ Import-Package: org.osgi.util.tracker,\ jakarta.inject;version="2.0",\ jakarta.enterprise.util;version="4.0" -# The 2.1.0 batch api bundle has a Bundle-Version of 2.0.0 still in it. --includeresource: @${repo;jakarta.batch:jakarta.batch-api;2.0.0;EXACT}!/xsd/*.xsd +-includeresource: @${repo;jakarta.batch:jakarta.batch-api;2.1.1;EXACT}!/xsd/*.xsd instrument.disabled: true publish.wlp.jar.suffix: dev/api/spec -buildpath: \ - jakarta.batch:jakarta.batch-api;version="[2.1.0,2.2.0)",\ + jakarta.batch:jakarta.batch-api;version=2.1.1;strategy=exact,\ com.ibm.websphere.org.osgi.core;version=latest diff --git a/dev/io.openliberty.jakarta.batch.2.1/resources/io/openliberty/jbatch/jakarta/batch/runtime/internal/resources/BatchMessages.nlsprops b/dev/io.openliberty.jakarta.batch.2.1/resources/io/openliberty/jbatch/jakarta/batch/runtime/internal/resources/BatchMessages.nlsprops index 32ccda33a1d3..fa40bd7b6723 100644 --- a/dev/io.openliberty.jakarta.batch.2.1/resources/io/openliberty/jbatch/jakarta/batch/runtime/internal/resources/BatchMessages.nlsprops +++ b/dev/io.openliberty.jakarta.batch.2.1/resources/io/openliberty/jbatch/jakarta/batch/runtime/internal/resources/BatchMessages.nlsprops @@ -29,9 +29,9 @@ # 0350 - 0399: jakarta.batch # -batch.container.unavailable=CWWKY0350E: The batch container is not activated. Ensure that batch persistence has been configured via the configuration element {0}. -batch.container.unavailable.explanation=An attempt to access the batch container failed because the batch container is not activated. This is commonly due to missing configuration. -batch.container.unavailable.useraction=Ensure that batch persistence has been configured. +batch.container.unavailable=CWWKY0350E: The batch container is not activated. Ensure that batch persistence is configured in the {0} configuration element. +batch.container.unavailable.explanation=An attempt to access the batch container failed because the batch container is not activated. This failure is commonly due to missing configuration. +batch.container.unavailable.useraction=Ensure that batch persistence is configured. diff --git a/dev/io.openliberty.jakarta.connectors.2.0/bnd.bnd b/dev/io.openliberty.jakarta.connectors.2.0/bnd.bnd index 60d824f6a76d..f9547fd7824a 100644 --- a/dev/io.openliberty.jakarta.connectors.2.0/bnd.bnd +++ b/dev/io.openliberty.jakarta.connectors.2.0/bnd.bnd @@ -22,11 +22,11 @@ Export-Package: \ jakarta.resource.spi.work Include-Resource: \ - @${repo;jakarta.resource:jakarta.resource-api;[2.0.0,2.1.0)}!/META-INF/NOTICE + @${repo;jakarta.resource:jakarta.resource-api;2.0.0;EXACT}!/META-INF/NOTICE instrument.disabled: true publish.wlp.jar.suffix: dev/api/spec -buildpath: \ - jakarta.resource:jakarta.resource-api;version="[2.0.0,2.1.0)" + jakarta.resource:jakarta.resource-api;version=2.0.0;strategy=exact diff --git a/dev/io.openliberty.jakarta.faces.4.0/bnd.bnd b/dev/io.openliberty.jakarta.faces.4.0/bnd.bnd index e1fddd23e000..cb5c4d0630c4 100644 --- a/dev/io.openliberty.jakarta.faces.4.0/bnd.bnd +++ b/dev/io.openliberty.jakarta.faces.4.0/bnd.bnd @@ -38,8 +38,8 @@ publish.wlp.jar.suffix: dev/api/spec io.openliberty.jakarta.expressionLanguage.5.0;version=latest,\ org.apache.myfaces.buildtools:myfaces-builder-annotations;version=1.0.9,\ io.openliberty.jakarta.validation.3.0;version=latest,\ - io.openliberty.jakarta.jstl.2.0;version=latest,\ - io.openliberty.jakarta.pages.3.0;version=latest,\ + io.openliberty.jakarta.tags.3.0;version=latest,\ + io.openliberty.jakarta.pages.3.1;version=latest,\ io.openliberty.jakarta.servlet.6.0;version=latest, \ io.openliberty.jakarta.websocket.2.1;version=latest, \ com.ibm.ws.org.osgi.annotation.versioning;version=latest diff --git a/dev/io.openliberty.jakarta.jsonb.2.0/bnd.bnd b/dev/io.openliberty.jakarta.jsonb.2.0/bnd.bnd index 7add6f13747d..da9a06802e98 100644 --- a/dev/io.openliberty.jakarta.jsonb.2.0/bnd.bnd +++ b/dev/io.openliberty.jakarta.jsonb.2.0/bnd.bnd @@ -29,4 +29,4 @@ instrument.disabled: true publish.wlp.jar.suffix: dev/api/spec -buildpath: \ - jakarta.json.bind:jakarta.json.bind-api;version="[2.0.0,2.1.0)" + jakarta.json.bind:jakarta.json.bind-api;version=2.0.0;strategy=exact diff --git a/dev/io.openliberty.jakarta.jsonb.3.0/bnd.bnd b/dev/io.openliberty.jakarta.jsonb.3.0/bnd.bnd index 2e1379cbcbe1..f1071cd6d0b1 100644 --- a/dev/io.openliberty.jakarta.jsonb.3.0/bnd.bnd +++ b/dev/io.openliberty.jakarta.jsonb.3.0/bnd.bnd @@ -34,4 +34,4 @@ instrument.disabled: true publish.wlp.jar.suffix: dev/api/spec -buildpath: \ - jakarta.json.bind:jakarta.json.bind-api;version="[3.0.0,3.1.0)" + jakarta.json.bind:jakarta.json.bind-api;version=3.0.0;strategy=exact diff --git a/dev/io.openliberty.jakarta.mail.2.0/bnd.bnd b/dev/io.openliberty.jakarta.mail.2.0/bnd.bnd index e854c90c495b..3e23049b3a09 100644 --- a/dev/io.openliberty.jakarta.mail.2.0/bnd.bnd +++ b/dev/io.openliberty.jakarta.mail.2.0/bnd.bnd @@ -29,6 +29,6 @@ instrument.disabled: true publish.wlp.jar.suffix: dev/api/spec -buildpath: \ - jakarta.mail:jakarta.mail-api;version="[2.0.0,2.1.0)", \ + jakarta.mail:jakarta.mail-api;version=2.0.0;strategy=exact, \ io.openliberty.jakarta.activation.2.0;version=latest diff --git a/dev/io.openliberty.jakarta.messaging.3.0/bnd.bnd b/dev/io.openliberty.jakarta.messaging.3.0/bnd.bnd index 71840a4690f8..9940ec93fa6c 100644 --- a/dev/io.openliberty.jakarta.messaging.3.0/bnd.bnd +++ b/dev/io.openliberty.jakarta.messaging.3.0/bnd.bnd @@ -8,9 +8,9 @@ # Contributors: # IBM Corporation - initial API and implementation #******************************************************************************* --include= jar:${fileuri;${repo;jakarta.jms:jakarta.jms-api;[3.0.0,3.1.0)}}!/META-INF/MANIFEST.MF,bnd.overrides +-include= jar:${fileuri;${repo;jakarta.jms:jakarta.jms-api;3.0.0;EXACT}}!/META-INF/MANIFEST.MF,bnd.overrides -includeresource: \ - @${repo;jakarta.jms:jakarta.jms-api;[3.0.0,3.1.0)}!/!META-INF/maven/* + @${repo;jakarta.jms:jakarta.jms-api;3.0.0;EXACT}!/!META-INF/maven/* --buildpath: jakarta.jms:jakarta.jms-api;version="[3.0.0,3.1.0)" +-buildpath: jakarta.jms:jakarta.jms-api;version=3.0.0;strategy=exact diff --git a/dev/io.openliberty.jakarta.pages.3.0/bnd.bnd b/dev/io.openliberty.jakarta.pages.3.0/bnd.bnd index fd8c362af182..12ed0f6af0a6 100644 --- a/dev/io.openliberty.jakarta.pages.3.0/bnd.bnd +++ b/dev/io.openliberty.jakarta.pages.3.0/bnd.bnd @@ -36,4 +36,4 @@ instrument.disabled: true publish.wlp.jar.suffix: dev/api/spec -buildpath: \ - jakarta.servlet.jsp:jakarta.servlet.jsp-api;version="[3.0.0,3.1.0)" + jakarta.servlet.jsp:jakarta.servlet.jsp-api;version=3.0.0;strategy=exact diff --git a/dev/io.openliberty.jakarta.pages.tld.3.0/bnd.bnd b/dev/io.openliberty.jakarta.pages.tld.3.0/bnd.bnd index 982d464701dd..2d3e212ba1d3 100644 --- a/dev/io.openliberty.jakarta.pages.tld.3.0/bnd.bnd +++ b/dev/io.openliberty.jakarta.pages.tld.3.0/bnd.bnd @@ -13,7 +13,7 @@ bVersion=1.0 -nouses=true Bundle-SymbolicName: io.openliberty.jakarta.pages.tld.3.0 -Bundle-Description: Jakarta Standard Tag Library, version 2.0 +Bundle-Description: Jakarta Standard Tag Library, version 3.0 Import-Package: \ !com.oracle.wls.shaded.org.apache.xml.serialize,\ @@ -33,7 +33,7 @@ Export-Package: \ org.apache.taglibs.standard.tag.rt.sql;version="2.0.0", \ org.apache.taglibs.standard.tag.rt.xml;version="2.0.0" --includeresource: @${repo;org.glassfish.web:jakarta.servlet.jsp.jstl;2.0}!/!com/oracle/wls/shaded/* +-includeresource: @${repo;org.glassfish.web:jakarta.servlet.jsp.jstl;2.0;EXACT}!/!com/oracle/wls/shaded/* instrument.disabled: true diff --git a/dev/io.openliberty.jakarta.restfulWS.3.0/bnd.bnd b/dev/io.openliberty.jakarta.restfulWS.3.0/bnd.bnd index 03c01ebff061..06746697d43d 100755 --- a/dev/io.openliberty.jakarta.restfulWS.3.0/bnd.bnd +++ b/dev/io.openliberty.jakarta.restfulWS.3.0/bnd.bnd @@ -31,4 +31,4 @@ instrument.disabled: true publish.wlp.jar.suffix: dev/api/spec -buildpath: \ - jakarta.ws.rs:jakarta.ws.rs-api;version="[3.0.0,3.1.0)" + jakarta.ws.rs:jakarta.ws.rs-api;version=3.0.0;strategy=exact diff --git a/dev/io.openliberty.jakarta.security.2.0/bnd.bnd b/dev/io.openliberty.jakarta.security.2.0/bnd.bnd index 2e880cb9af8f..f9e1148078b9 100644 --- a/dev/io.openliberty.jakarta.security.2.0/bnd.bnd +++ b/dev/io.openliberty.jakarta.security.2.0/bnd.bnd @@ -29,4 +29,4 @@ publish.wlp.jar.suffix: dev/api/spec io.openliberty.jakarta.authentication.2.0;version=latest, \ com.ibm.ws.org.osgi.annotation.versioning;version=latest, \ io.openliberty.jakarta.servlet.5.0;version=latest, \ - jakarta.security.enterprise:jakarta.security.enterprise-api;version="[2.0.0,2.1.0)" + jakarta.security.enterprise:jakarta.security.enterprise-api;version=2.0.0;strategy=exact diff --git a/dev/io.openliberty.jakarta.security.3.0/bnd.bnd b/dev/io.openliberty.jakarta.security.3.0/bnd.bnd index 8c08709fe694..0d74a69c3f1a 100644 --- a/dev/io.openliberty.jakarta.security.3.0/bnd.bnd +++ b/dev/io.openliberty.jakarta.security.3.0/bnd.bnd @@ -39,4 +39,4 @@ publish.wlp.jar.suffix: dev/api/spec com.ibm.ws.org.osgi.annotation.versioning;version=latest, \ io.openliberty.jakarta.servlet.6.0;version=latest, \ io.openliberty.jakarta.jsonp.2.1;version=latest, \ - jakarta.security.enterprise:jakarta.security.enterprise-api;version="[3.0.0,3.1.0)" + jakarta.security.enterprise:jakarta.security.enterprise-api;version=3.0.0;strategy=exact diff --git a/dev/io.openliberty.jakarta.servlet.5.0/bnd.bnd b/dev/io.openliberty.jakarta.servlet.5.0/bnd.bnd index e674497fc6f4..df70fbd58df0 100644 --- a/dev/io.openliberty.jakarta.servlet.5.0/bnd.bnd +++ b/dev/io.openliberty.jakarta.servlet.5.0/bnd.bnd @@ -27,4 +27,4 @@ instrument.disabled: true publish.wlp.jar.suffix: dev/api/spec -buildpath: \ - jakarta.servlet:jakarta.servlet-api;version=5.0.0 + jakarta.servlet:jakarta.servlet-api;version=5.0.0;strategy=exact diff --git a/dev/io.openliberty.jakarta.servlet.6.0/bnd.bnd b/dev/io.openliberty.jakarta.servlet.6.0/bnd.bnd index 345ef128cee4..f681728ee2d5 100644 --- a/dev/io.openliberty.jakarta.servlet.6.0/bnd.bnd +++ b/dev/io.openliberty.jakarta.servlet.6.0/bnd.bnd @@ -28,11 +28,11 @@ Export-Package: \ jakarta.servlet.resources;thread-context=true;version="6.0.0" Include-Resource: \ - @${repo;jakarta.servlet:jakarta.servlet-api;[6.0.0,6.1.0)}!/META-INF/NOTICE + @${repo;jakarta.servlet:jakarta.servlet-api;6.0.0;EXACT}!/META-INF/NOTICE instrument.disabled: true publish.wlp.jar.suffix: dev/api/spec -buildpath: \ - jakarta.servlet:jakarta.servlet-api;version="[6.0.0,6.1.0)" + jakarta.servlet:jakarta.servlet-api;version=6.0.0;strategy=exact diff --git a/dev/io.openliberty.jakarta.soap.2.0/bnd.bnd b/dev/io.openliberty.jakarta.soap.2.0/bnd.bnd index 667599113fab..52094def63d8 100755 --- a/dev/io.openliberty.jakarta.soap.2.0/bnd.bnd +++ b/dev/io.openliberty.jakarta.soap.2.0/bnd.bnd @@ -23,4 +23,4 @@ instrument.disabled: true publish.wlp.jar.suffix: dev/api/spec -buildpath: \ - jakarta.xml.soap:jakarta.xml.soap-api;version=2.0.0 + jakarta.xml.soap:jakarta.xml.soap-api;version=2.0.0;strategy=exact diff --git a/dev/io.openliberty.jakarta.websocket.2.0/bnd.bnd b/dev/io.openliberty.jakarta.websocket.2.0/bnd.bnd index 63102b281f1b..4ab9002722c0 100644 --- a/dev/io.openliberty.jakarta.websocket.2.0/bnd.bnd +++ b/dev/io.openliberty.jakarta.websocket.2.0/bnd.bnd @@ -18,12 +18,12 @@ Export-Package: \ jakarta.websocket.server; version="2.0.0" Include-Resource: \ - @${repo;jakarta.websocket:jakarta.websocket-api;[2.0.0,2.1.0)}!/META-INF/LICENSE, \ - @${repo;jakarta.websocket:jakarta.websocket-api;[2.0.0,2.1.0)}!/META-INF/NOTICE + @${repo;jakarta.websocket:jakarta.websocket-api;2.0.0;EXACT}!/META-INF/LICENSE, \ + @${repo;jakarta.websocket:jakarta.websocket-api;2.0.0;EXACT}!/META-INF/NOTICE instrument.disabled: true publish.wlp.jar.suffix: dev/api/spec -buildpath: \ - jakarta.websocket:jakarta.websocket-api;version="[2.0.0,2.1.0)" + jakarta.websocket:jakarta.websocket-api;version=2.0.0;strategy=exact diff --git a/dev/io.openliberty.jakarta.xmlWS.3.0/bnd.bnd b/dev/io.openliberty.jakarta.xmlWS.3.0/bnd.bnd index c8a0c4cc50eb..952e5039fc74 100755 --- a/dev/io.openliberty.jakarta.xmlWS.3.0/bnd.bnd +++ b/dev/io.openliberty.jakarta.xmlWS.3.0/bnd.bnd @@ -24,4 +24,4 @@ instrument.disabled: true publish.wlp.jar.suffix: dev/api/spec -buildpath: \ - jakarta.xml.ws:jakarta.xml.ws-api;version="[3.0.0,3.1.0)" + jakarta.xml.ws:jakarta.xml.ws-api;version=3.0.0;strategy=exact diff --git a/dev/io.openliberty.jakarta/authentication.3.0.bnd b/dev/io.openliberty.jakarta/authentication.3.0.bnd index e6ae2f42668b..af4aebc7de63 100644 --- a/dev/io.openliberty.jakarta/authentication.3.0.bnd +++ b/dev/io.openliberty.jakarta/authentication.3.0.bnd @@ -25,4 +25,4 @@ Export-Package: \ jakarta.security.auth.message.module;version="3.0.0" -includeresource: \ - @${repo;jakarta.authentication:jakarta.authentication-api;[3.0.0,3.1.0)}!/!(META-INF/maven/*|module-info.class) + @${repo;jakarta.authentication:jakarta.authentication-api;3.0.0;EXACT}!/!(META-INF/maven/*|module-info.class) diff --git a/dev/io.openliberty.jakarta/authorization.2.1.bnd b/dev/io.openliberty.jakarta/authorization.2.1.bnd index 28323755fe45..19bfecee3887 100644 --- a/dev/io.openliberty.jakarta/authorization.2.1.bnd +++ b/dev/io.openliberty.jakarta/authorization.2.1.bnd @@ -21,4 +21,4 @@ Bundle-SymbolicName: io.openliberty.jakarta.authorization.2.1; singleton:=true Export-Package: jakarta.security.jacc;version=2.1.0 -includeresource: \ - @${repo;jakarta.authorization:jakarta.authorization-api;[2.1.0,2.2.0)}!/!(META-INF/maven/*|module-info.class) + @${repo;jakarta.authorization:jakarta.authorization-api;2.1.0;EXACT}!/!(META-INF/maven/*|module-info.class) diff --git a/dev/io.openliberty.jakarta/connector.2.1.bnd b/dev/io.openliberty.jakarta/connector.2.1.bnd index 0ab32b4ddbb7..48a71ba8934e 100644 --- a/dev/io.openliberty.jakarta/connector.2.1.bnd +++ b/dev/io.openliberty.jakarta/connector.2.1.bnd @@ -31,4 +31,4 @@ Import-Package: \ * -includeresource: \ - @${repo;jakarta.resource:jakarta.resource-api;[2.1.0,2.2.0)}!/!(META-INF/maven/*|module-info.class) \ No newline at end of file + @${repo;jakarta.resource:jakarta.resource-api;2.1.0;EXACT}!/!(META-INF/maven/*|module-info.class) \ No newline at end of file diff --git a/dev/io.openliberty.jakarta/mail.2.1.bnd b/dev/io.openliberty.jakarta/mail.2.1.bnd index 25ebcaec9540..327fe3371798 100644 --- a/dev/io.openliberty.jakarta/mail.2.1.bnd +++ b/dev/io.openliberty.jakarta/mail.2.1.bnd @@ -29,4 +29,4 @@ Import-Package: jakarta.activation;version="[2.1,3)", \ * -includeresource: \ - @${repo;jakarta.mail:jakarta.mail-api;[2.1.0,2.2.0)}!/!(META-INF/maven/*|module-info.class) \ No newline at end of file + @${repo;jakarta.mail:jakarta.mail-api;2.1.0;EXACT}!/!(META-INF/maven/*|module-info.class) \ No newline at end of file diff --git a/dev/io.openliberty.jakarta/messaging.3.1.bnd b/dev/io.openliberty.jakarta/messaging.3.1.bnd index d12dd7158498..7a4254834e89 100644 --- a/dev/io.openliberty.jakarta/messaging.3.1.bnd +++ b/dev/io.openliberty.jakarta/messaging.3.1.bnd @@ -25,4 +25,4 @@ Specification-Version: 3.1 Export-Package: jakarta.jms;version="3.1.0" -includeresource: \ - @${repo;jakarta.jms:jakarta.jms-api;[3.1.0,3.2.0)}!/!(META-INF/maven/*|module-info.class) + @${repo;jakarta.jms:jakarta.jms-api;3.1.0;EXACT}!/!(META-INF/maven/*|module-info.class) diff --git a/dev/io.openliberty.jakarta/pages.3.1.bnd b/dev/io.openliberty.jakarta/pages.3.1.bnd index 46d10ba797ee..b416fda76bff 100644 --- a/dev/io.openliberty.jakarta/pages.3.1.bnd +++ b/dev/io.openliberty.jakarta/pages.3.1.bnd @@ -37,4 +37,4 @@ Import-Package: \ org.xml.sax.helpers; resolution:=optional -includeresource: \ - @${repo;jakarta.servlet.jsp:jakarta.servlet.jsp-api;[3.1.0,3.2.0)}!/!(META-INF/maven/*|module-info.class) + @${repo;jakarta.servlet.jsp:jakarta.servlet.jsp-api;3.1.0;EXACT}!/!(META-INF/maven/*|module-info.class) diff --git a/dev/io.openliberty.jakarta/restfulWS.3.1.bnd b/dev/io.openliberty.jakarta/restfulWS.3.1.bnd index cfc303929763..9e922a5820d6 100755 --- a/dev/io.openliberty.jakarta/restfulWS.3.1.bnd +++ b/dev/io.openliberty.jakarta/restfulWS.3.1.bnd @@ -24,8 +24,8 @@ Import-Package: !jakarta.xml.bind.annotation,\ !jakarta.xml.bind.annotation.adapters,\ * -DynamicImport-Package: jakarta.xml.bind.annotation;version="[3.0,5.0)",\ - jakarta.xml.bind.annotation.adapters;version="[3.0,5.0)" +DynamicImport-Package: jakarta.xml.bind.annotation;version="[4.0,5.0)",\ + jakarta.xml.bind.annotation.adapters;version="[4.0,5.0)" -includeresource: \ @${repo;jakarta.ws.rs:jakarta.ws.rs-api;3.1.0;EXACT}!/!(META-INF/maven/*|module-info.class) diff --git a/dev/io.openliberty.jakarta/soap.3.0.bnd b/dev/io.openliberty.jakarta/soap.3.0.bnd index b5d06c388314..7034e5a09635 100755 --- a/dev/io.openliberty.jakarta/soap.3.0.bnd +++ b/dev/io.openliberty.jakarta/soap.3.0.bnd @@ -23,4 +23,4 @@ Export-Package: jakarta.xml.soap.*; version="3.0" Import-Package: * -includeresource: \ - @${repo;jakarta.xml.soap:jakarta.xml.soap-api;[3.0.0,3.1.0)}!/!(META-INF/maven/*|module-info.class) + @${repo;jakarta.xml.soap:jakarta.xml.soap-api;3.0.0;EXACT}!/!(META-INF/maven/*|module-info.class) diff --git a/dev/io.openliberty.jakarta/tags.3.0.bnd b/dev/io.openliberty.jakarta/tags.3.0.bnd index 5966ca4eeda6..69f8b8722dca 100644 --- a/dev/io.openliberty.jakarta/tags.3.0.bnd +++ b/dev/io.openliberty.jakarta/tags.3.0.bnd @@ -20,10 +20,10 @@ Bundle-SymbolicName: io.openliberty.jakarta.tags.3.0; singleton:=true Bundle-Description: Jakarta Standard Tag Library, version 3.0 Export-Package: \ - jakarta.servlet.jsp.jstl.core,\ - jakarta.servlet.jsp.jstl.fmt,\ - jakarta.servlet.jsp.jstl.sql,\ - jakarta.servlet.jsp.jstl.tlv + jakarta.servlet.jsp.jstl.core;version=3.0.0,\ + jakarta.servlet.jsp.jstl.fmt;version=3.0.0,\ + jakarta.servlet.jsp.jstl.sql;version=3.0.0,\ + jakarta.servlet.jsp.jstl.tlv;version=3.0.0 Import-Package: jakarta.servlet.jsp.*;version="[3.0.0,4.0.0)", \ jakarta.servlet.*; version="[6.0.0,7.0.0)", \ @@ -35,4 +35,4 @@ Import-Package: jakarta.servlet.jsp.*;version="[3.0.0,4.0.0)", \ jakarta.el; version="[5.0.0,6.0.0)" -includeresource: \ - @${repo;jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api;[3.0.0,3.1.0)}!/!(META-INF/maven/*|module-info.class) + @${repo;jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api;3.0.0;EXACT}!/!(META-INF/maven/*|module-info.class) diff --git a/dev/io.openliberty.jakarta/websocket.2.1.bnd b/dev/io.openliberty.jakarta/websocket.2.1.bnd index 63fc6fc295f2..d7435d8cf0ca 100644 --- a/dev/io.openliberty.jakarta/websocket.2.1.bnd +++ b/dev/io.openliberty.jakarta/websocket.2.1.bnd @@ -23,6 +23,6 @@ Export-Package: \ jakarta.websocket.server; version="2.1.0" -includeresource: \ - @${repo;jakarta.websocket:jakarta.websocket-api;[2.1.0,2.2.0)}!/!(META-INF/maven/*|module-info.class), \ - @${repo;jakarta.websocket:jakarta.websocket-client-api;[2.1.0,2.2.0)}!/!(META-INF/maven/*|module-info.class) + @${repo;jakarta.websocket:jakarta.websocket-api;2.1.0;EXACT}!/!(META-INF/maven/*|module-info.class), \ + @${repo;jakarta.websocket:jakarta.websocket-client-api;2.1.0;EXACT}!/!(META-INF/maven/*|module-info.class) diff --git a/dev/io.openliberty.jakarta/xmlWS.4.0.bnd b/dev/io.openliberty.jakarta/xmlWS.4.0.bnd index 9f06227a0d8e..d65e7a9097f2 100755 --- a/dev/io.openliberty.jakarta/xmlWS.4.0.bnd +++ b/dev/io.openliberty.jakarta/xmlWS.4.0.bnd @@ -21,8 +21,8 @@ Bundle-SymbolicName: io.openliberty.jakarta.xmlWS.4.0; singleton:=true Export-Package: jakarta.jws.*;version="4.0.0", \ jakarta.xml.ws.*; version="4.0.0" -Import-Package: jakarta.xml.bind.*; version="[3.0,5)", \ +Import-Package: jakarta.xml.bind.*; version="[4.0,5)", \ * -includeresource: \ - @${repo;jakarta.xml.ws:jakarta.xml.ws-api;[4.0.0,4.1.0)}!/!(META-INF/maven/*|module-info.class) + @${repo;jakarta.xml.ws:jakarta.xml.ws-api;4.0.0;EXACT}!/!(META-INF/maven/*|module-info.class) diff --git a/dev/io.openliberty.jakartaee10.internal_fat/bnd.bnd b/dev/io.openliberty.jakartaee10.internal_fat/bnd.bnd index f65b235ace31..eb39fc93517a 100644 --- a/dev/io.openliberty.jakartaee10.internal_fat/bnd.bnd +++ b/dev/io.openliberty.jakartaee10.internal_fat/bnd.bnd @@ -30,12 +30,12 @@ tested.features:\ io.openliberty.jakarta.annotation.2.1;version=latest,\ io.openliberty.jakarta.cdi.4.0;version=latest,\ io.openliberty.jakarta.enterpriseBeans.4.0;version=latest,\ - io.openliberty.jakarta.restfulWS.3.0;version=latest,\ + io.openliberty.jakarta.restfulWS.3.1;version=latest,\ io.openliberty.jakarta.faces.4.0;version=latest,\ io.openliberty.jakarta.jsonb.3.0;version=latest,\ io.openliberty.jakarta.jsonp.2.1;version=latest,\ io.openliberty.jakarta.persistence.3.1;version=latest,\ - io.openliberty.jakarta.security.2.0;version=latest,\ + io.openliberty.jakarta.security.3.0;version=latest,\ io.openliberty.jakarta.servlet.6.0;version=latest,\ io.openliberty.jakarta.transaction.2.0;version=latest,\ io.openliberty.jakarta.validation.3.0;version=latest,\ diff --git a/dev/io.openliberty.jakartaee10.internal_fat/fat/src/io/openliberty/jakartaee10/internal/apps/jakartaee10/web/WebProfile10TestServlet.java b/dev/io.openliberty.jakartaee10.internal_fat/fat/src/io/openliberty/jakartaee10/internal/apps/jakartaee10/web/WebProfile10TestServlet.java index 1d52d3ef15fd..8ca036430670 100644 --- a/dev/io.openliberty.jakartaee10.internal_fat/fat/src/io/openliberty/jakartaee10/internal/apps/jakartaee10/web/WebProfile10TestServlet.java +++ b/dev/io.openliberty.jakartaee10.internal_fat/fat/src/io/openliberty/jakartaee10/internal/apps/jakartaee10/web/WebProfile10TestServlet.java @@ -13,6 +13,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertTrue; import java.sql.Connection; @@ -24,8 +25,12 @@ import componenttest.app.FATServlet; import io.openliberty.jakartaee10.internal.apps.jakartaee10.web.cdi.BasicCDIBean; import io.openliberty.jakartaee10.internal.apps.jakartaee10.web.jpa.UserEntity; +import io.openliberty.jakartaee10.internal.apps.jakartaee10.web.jsonb.Team; import jakarta.annotation.Resource; import jakarta.inject.Inject; +import jakarta.json.bind.Jsonb; +import jakarta.json.bind.JsonbBuilder; +import jakarta.json.bind.spi.JsonbProvider; import jakarta.persistence.EntityManager; import jakarta.persistence.PersistenceContext; import jakarta.servlet.annotation.WebServlet; @@ -68,51 +73,51 @@ public void testJAXRS(HttpServletRequest req, HttpServletResponse resp) throws E } } -// @Test -// public void testJsonb() throws Exception { -// // Convert Java Object --> JSON -// Team zombies = new Team(); -// zombies.name = "Zombies"; -// zombies.size = 9; -// zombies.winLossRatio = 0.85f; -// Jsonb jsonb = JsonbProvider.provider().create().build(); -// String teamJson = jsonb.toJson(zombies); -// System.out.println("POJO --> JSON: " + teamJson); -// assertTrue(teamJson.contains("\"name\":\"Zombies\"")); -// assertTrue(teamJson.contains("\"size\":9")); -// assertTrue(teamJson.contains("\"winLossRatio\":0.8")); -// -// // Convert JSON --> Java Object -// Team rangers = jsonb.fromJson("{\"name\":\"Rangers\",\"size\":7,\"winLossRatio\":0.6}", Team.class); -// System.out.println("JSON --> POJO: " + rangers.name); -// assertEquals("Rangers", rangers.name); -// assertEquals(7, rangers.size); -// assertEquals(0.6f, rangers.winLossRatio, 0.01f); -// } - -// @Test -// public void testJPAandJSONB() throws Exception { -// Jsonb jsonb = JsonbBuilder.create(); -// -// tx.begin(); -// UserEntity entity = new UserEntity("Foo Bar"); -// em.persist(entity); -// tx.commit(); -// -// em.clear(); -// UserEntity findEntity = em.find(UserEntity.class, entity.id); -// assertNotNull(findEntity); -// assertNotSame(entity, findEntity); -// assertEquals(entity.id, findEntity.id); -// assertEquals("Foo Bar", findEntity.strData); -// -// String entityJSON = jsonb.toJson(findEntity); -// System.out.println("JPA POJO --> JSON: " + entityJSON); -// assertTrue("JPA entity converted to JSON did not contain expected data: " + entityJSON, entityJSON.contains("\"id\":"));// ID value is generated -// assertTrue("JPA entity converted to JSON did not contain expected data: " + entityJSON, entityJSON.contains("\"strData\":\"Foo Bar\"")); -// assertTrue("JPA entity converted to JSON did not contain expected data: " + entityJSON, entityJSON.contains("\"version\":")); // version number is generated -// assertTrue("JPA entity converted to JSON was not the expected length: " + entityJSON, 40 <= entityJSON.length() && entityJSON.length() <= 46); -// } + @Test + public void testJsonb() throws Exception { + // Convert Java Object --> JSON + Team zombies = new Team(); + zombies.name = "Zombies"; + zombies.size = 9; + zombies.winLossRatio = 0.85f; + Jsonb jsonb = JsonbProvider.provider().create().build(); + String teamJson = jsonb.toJson(zombies); + System.out.println("POJO --> JSON: " + teamJson); + assertTrue(teamJson.contains("\"name\":\"Zombies\"")); + assertTrue(teamJson.contains("\"size\":9")); + assertTrue(teamJson.contains("\"winLossRatio\":0.8")); + + // Convert JSON --> Java Object + Team rangers = jsonb.fromJson("{\"name\":\"Rangers\",\"size\":7,\"winLossRatio\":0.6}", Team.class); + System.out.println("JSON --> POJO: " + rangers.name); + assertEquals("Rangers", rangers.name); + assertEquals(7, rangers.size); + assertEquals(0.6f, rangers.winLossRatio, 0.01f); + } + + @Test + public void testJPAandJSONB() throws Exception { + Jsonb jsonb = JsonbBuilder.create(); + + tx.begin(); + UserEntity entity = new UserEntity("Foo Bar"); + em.persist(entity); + tx.commit(); + + em.clear(); + UserEntity findEntity = em.find(UserEntity.class, entity.id); + assertNotNull(findEntity); + assertNotSame(entity, findEntity); + assertEquals(entity.id, findEntity.id); + assertEquals("Foo Bar", findEntity.strData); + + String entityJSON = jsonb.toJson(findEntity); + System.out.println("JPA POJO --> JSON: " + entityJSON); + assertTrue("JPA entity converted to JSON did not contain expected data: " + entityJSON, entityJSON.contains("\"id\":"));// ID value is generated + assertTrue("JPA entity converted to JSON did not contain expected data: " + entityJSON, entityJSON.contains("\"strData\":\"Foo Bar\"")); + assertTrue("JPA entity converted to JSON did not contain expected data: " + entityJSON, entityJSON.contains("\"version\":")); // version number is generated + assertTrue("JPA entity converted to JSON was not the expected length: " + entityJSON, 40 <= entityJSON.length() && entityJSON.length() <= 46); + } @Test public void testJPA() throws Exception { diff --git a/dev/io.openliberty.jakartaee10.internal_fat/publish/servers/jakartaee10.fat/server.xml b/dev/io.openliberty.jakartaee10.internal_fat/publish/servers/jakartaee10.fat/server.xml index dd4e371af345..0f162b6f3f0d 100644 --- a/dev/io.openliberty.jakartaee10.internal_fat/publish/servers/jakartaee10.fat/server.xml +++ b/dev/io.openliberty.jakartaee10.internal_fat/publish/servers/jakartaee10.fat/server.xml @@ -28,4 +28,6 @@ + +