From 91b5bf5c026ccd9617a8b1a80753026b93453a92 Mon Sep 17 00:00:00 2001 From: Jared Anderson Date: Thu, 23 Jun 2022 16:22:37 -0500 Subject: [PATCH] Update CDI, lang-model and annotation APIs - Move the aforementioned EE10 API bundles to their x.y.1 version. --- dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml | 6 +++--- dev/cnf/oss_dependencies.maven | 6 +++--- .../private/io.openliberty.jakarta.annotation-2.1.feature | 2 +- .../private/io.openliberty.jakarta.cdi-4.0.feature | 2 +- dev/io.openliberty.jakarta.annotation.2.1/bnd.bnd | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) 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 64cb0eef2102..cb753e7665f0 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 @@ -689,7 +689,7 @@ jakarta.annotation jakarta.annotation-api - 2.1.0 + 2.1.1 jakarta.authentication @@ -744,12 +744,12 @@ jakarta.enterprise jakarta.enterprise.cdi-api - 4.0.0 + 4.0.1 jakarta.enterprise jakarta.enterprise.lang-model - 4.0.0 + 4.0.1 jakarta.inject diff --git a/dev/cnf/oss_dependencies.maven b/dev/cnf/oss_dependencies.maven index 5ef6f9ade93e..7ef86d81593a 100644 --- a/dev/cnf/oss_dependencies.maven +++ b/dev/cnf/oss_dependencies.maven @@ -133,7 +133,7 @@ io.smallrye:smallrye-graphql:1.0.26 jakarta.activation:jakarta.activation-api:2.0.0 jakarta.activation:jakarta.activation-api:2.1.0-RC1 jakarta.annotation:jakarta.annotation-api:2.0.0 -jakarta.annotation:jakarta.annotation-api:2.1.0 +jakarta.annotation:jakarta.annotation-api:2.1.1 jakarta.authentication:jakarta.authentication-api:2.0.0 jakarta.authentication:jakarta.authentication-api:3.0.0 jakarta.authorization:jakarta.authorization-api:2.0.0 @@ -144,8 +144,8 @@ 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 jakarta.enterprise:jakarta.enterprise.cdi-api:3.0.0 -jakarta.enterprise:jakarta.enterprise.cdi-api:4.0.0 -jakarta.enterprise:jakarta.enterprise.lang-model:4.0.0 +jakarta.enterprise:jakarta.enterprise.cdi-api:4.0.1 +jakarta.enterprise:jakarta.enterprise.lang-model:4.0.1 jakarta.inject:jakarta.inject-api:2.0.1 jakarta.interceptor:jakarta.interceptor-api:2.0.0 jakarta.interceptor:jakarta.interceptor-api:2.1.0 diff --git a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.jakarta.annotation-2.1.feature b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.jakarta.annotation-2.1.feature index 8a647d37a420..c29b08c08aef 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.jakarta.annotation-2.1.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.jakarta.annotation-2.1.feature @@ -4,7 +4,7 @@ singleton=true IBM-Process-Types: server, \ client -features=com.ibm.websphere.appserver.eeCompatible-10.0 --bundles=io.openliberty.jakarta.annotation.2.1; location:="dev/api/spec/,lib/"; mavenCoordinates="jakarta.annotation:jakarta.annotation-api:2.1.0" +-bundles=io.openliberty.jakarta.annotation.2.1; location:="dev/api/spec/,lib/"; mavenCoordinates="jakarta.annotation:jakarta.annotation-api:2.1.1" kind=noship edition=full WLP-Activation-Type: parallel diff --git a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.jakarta.cdi-4.0.feature b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.jakarta.cdi-4.0.feature index 15147a17fa2e..54feed42e48e 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.jakarta.cdi-4.0.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.jakarta.cdi-4.0.feature @@ -4,7 +4,7 @@ singleton=true -features=io.openliberty.jakarta.expressionLanguage-5.0; apiJar=false, \ com.ibm.websphere.appserver.eeCompatible-10.0, \ io.openliberty.jakarta.interceptor-2.1 --bundles=io.openliberty.jakarta.cdi.4.0; location:="dev/api/spec/,lib/"; mavenCoordinates="jakarta.enterprise:jakarta.enterprise.cdi-api:4.0.0" +-bundles=io.openliberty.jakarta.cdi.4.0; location:="dev/api/spec/,lib/"; mavenCoordinates="jakarta.enterprise:jakarta.enterprise.cdi-api:4.0.1" kind=noship edition=full WLP-Activation-Type: parallel diff --git a/dev/io.openliberty.jakarta.annotation.2.1/bnd.bnd b/dev/io.openliberty.jakarta.annotation.2.1/bnd.bnd index bb22d9fbb259..130960e3e4d4 100644 --- a/dev/io.openliberty.jakarta.annotation.2.1/bnd.bnd +++ b/dev/io.openliberty.jakarta.annotation.2.1/bnd.bnd @@ -24,11 +24,11 @@ Export-Package: \ jakarta.annotation.sql;version="2.1.0" Include-Resource: \ - @${repo;jakarta.annotation:jakarta.annotation-api;2.1.0;EXACT}!/META-INF/NOTICE + @${repo;jakarta.annotation:jakarta.annotation-api;2.1.1;EXACT}!/META-INF/NOTICE instrument.disabled: true publish.wlp.jar.suffix: dev/api/spec -buildpath: \ - jakarta.annotation:jakarta.annotation-api;version=2.1.0;strategy=exact + jakarta.annotation:jakarta.annotation-api;version=2.1.1;strategy=exact