From 159cdc68fab9b93e7d4fd19ca68a359678d12eb4 Mon Sep 17 00:00:00 2001 From: Jared Anderson Date: Fri, 31 May 2024 17:56:22 -0500 Subject: [PATCH] Revert mail-api 2.1 update from PR #27761 --- dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml | 2 +- dev/cnf/oss_dependencies.maven | 2 +- .../private/io.openliberty.jakarta.mail-2.1.feature | 2 +- dev/io.openliberty.jakarta/mail.2.1.bnd | 4 ++-- 4 files changed, 5 insertions(+), 5 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 6ad1270df50..a25e31f385f 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 @@ -1434,7 +1434,7 @@ jakarta.mail jakarta.mail-api - 2.1.3 + 2.1.1 jakarta.nosql diff --git a/dev/cnf/oss_dependencies.maven b/dev/cnf/oss_dependencies.maven index 3dbad00558a..1d4552d4f6c 100644 --- a/dev/cnf/oss_dependencies.maven +++ b/dev/cnf/oss_dependencies.maven @@ -282,7 +282,7 @@ jakarta.json:jakarta.json-api:2.0.2 jakarta.json:jakarta.json-api:2.1.3 jakarta.jws:jakarta.jws-api:3.0.0 jakarta.mail:jakarta.mail-api:2.0.1 -jakarta.mail:jakarta.mail-api:2.1.3 +jakarta.mail:jakarta.mail-api:2.1.1 jakarta.nosql:nosql-column:1.0.0-b6 jakarta.nosql:nosql-core:1.0.0-b6 jakarta.nosql:nosql-document:1.0.0-b6 diff --git a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.jakarta.mail-2.1.feature b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.jakarta.mail-2.1.feature index 8c6181707be..fc22547c136 100644 --- a/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.jakarta.mail-2.1.feature +++ b/dev/com.ibm.websphere.appserver.features/visibility/private/io.openliberty.jakarta.mail-2.1.feature @@ -8,7 +8,7 @@ IBM-Process-Types: client, \ -features=com.ibm.websphere.appserver.eeCompatible-10.0; ibm.tolerates:="11.0", \ io.openliberty.jakarta.activation-2.1 -bundles=\ - io.openliberty.jakarta.mail.2.1;location:="dev/api/spec/,lib/"; mavenCoordinates="jakarta.mail:jakarta.mail-api:2.1.3" + io.openliberty.jakarta.mail.2.1;location:="dev/api/spec/,lib/"; mavenCoordinates="jakarta.mail:jakarta.mail-api:2.1.1" kind=ga edition=core WLP-Activation-Type: parallel diff --git a/dev/io.openliberty.jakarta/mail.2.1.bnd b/dev/io.openliberty.jakarta/mail.2.1.bnd index 330c0a77c64..638ca46ae88 100644 --- a/dev/io.openliberty.jakarta/mail.2.1.bnd +++ b/dev/io.openliberty.jakarta/mail.2.1.bnd @@ -31,8 +31,8 @@ Import-Package: jakarta.activation;version="[2.1,3)", \ * -includeresource: \ - @${repo;jakarta.mail:jakarta.mail-api;2.1.3;EXACT}!/!(META-INF/maven/*|module-info.class) + @${repo;jakarta.mail:jakarta.mail-api;2.1.1;EXACT}!/!(META-INF/maven/*|module-info.class) -maven-dependencies: \ - dep1;groupId=jakarta.mail;artifactId=jakarta.mail-api;version=2.1.3;scope=runtime + dep1;groupId=jakarta.mail;artifactId=jakarta.mail-api;version=2.1.1;scope=runtime