From 1b16649c0be8271d19c09f68333ef68d8244b554 Mon Sep 17 00:00:00 2001 From: Thomas Bitonti Date: Wed, 6 Oct 2021 12:01:54 -0400 Subject: [PATCH 1/2] Update transformer dependency from 0.2.0 to .0.3.0.20211005. --- .../check_this_in_if_it_changes/pom.xml | 4 +- dev/cnf/oss_dependencies.maven | 2 - dev/cnf/oss_ibm.maven | 2 + dev/fattest.simplicity/bnd.bnd | 4 +- dev/wlp-gradle/subprojects/fat.gradle | 4 +- dev/wlp-gradle/subprojects/tasks.gradle | 4 +- dev/wlp-jakartaee-transform/bnd.bnd | 8 +-- dev/wlp-jakartaee-transform/notes.txt | 70 +++++++++++++++++++ 8 files changed, 84 insertions(+), 14 deletions(-) create mode 100644 dev/wlp-jakartaee-transform/notes.txt 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 75d806f9404..6689db7fd34 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 @@ -2149,12 +2149,12 @@ org.eclipse.transformer org.eclipse.transformer.cli - 0.2.0 + 0.3.0.20211005 org.eclipse.transformer org.eclipse.transformer - 0.2.0 + 0.3.0.20211005 org.eclipse diff --git a/dev/cnf/oss_dependencies.maven b/dev/cnf/oss_dependencies.maven index 7a71559e81c..f3918833d75 100644 --- a/dev/cnf/oss_dependencies.maven +++ b/dev/cnf/oss_dependencies.maven @@ -425,8 +425,6 @@ org.eclipse.persistence:org.eclipse.persistence.jpa.modelgen.processor:2.7.9 org.eclipse.persistence:org.eclipse.persistence.jpa.modelgen.processor:3.0.2 org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.9 org.eclipse.persistence:org.eclipse.persistence.jpa:3.0.2 -org.eclipse.transformer:org.eclipse.transformer.cli:0.2.0 -org.eclipse.transformer:org.eclipse.transformer:0.2.0 org.eclipse:yasson:2.0.1 org.ehcache.modules:ehcache-107:3.8.1 org.ektorp:org.ektorp:1.5.0 diff --git a/dev/cnf/oss_ibm.maven b/dev/cnf/oss_ibm.maven index 1cc14e57b2d..8f0586049d1 100644 --- a/dev/cnf/oss_ibm.maven +++ b/dev/cnf/oss_ibm.maven @@ -80,6 +80,8 @@ org.eclipse.microprofile.graphql:microprofile-graphql-tck:1.0.0-20191203 org.eclipse.microprofile.rest.client:microprofile-rest-client-tck:1.2.2-20210215 org.eclipse.microprofile.rest.client:microprofile-rest-client-tck:1.3.5-20210215 org.eclipse.microprofile.rest.client:microprofile-rest-client-tck:1.4.2-20210215 +org.eclipse.transformer:org.eclipse.transformer.cli:0.3.0.20211005 +org.eclipse.transformer:org.eclipse.transformer:0.3.0.20211005 org.mock-server:mockserver-core:3.10.7-IBM20191022 org.mock-server:mockserver-core:3.10.7-IBM20191022 org.openid4java:openid4java:0.9.7-ibm-s20130624-1827 diff --git a/dev/fattest.simplicity/bnd.bnd b/dev/fattest.simplicity/bnd.bnd index 089084a8b19..ab9e3b2d7d5 100644 --- a/dev/fattest.simplicity/bnd.bnd +++ b/dev/fattest.simplicity/bnd.bnd @@ -64,10 +64,10 @@ test.project: true com.ibm.websphere.javaee.jsonp.1.0;version=latest,\ com.ibm.websphere.javaee.servlet.3.0;version=latest,\ io.openliberty.jakarta.servlet.5.0;version=latest,\ - org.eclipse.transformer:org.eclipse.transformer.cli;version=0.2.0,\ + org.eclipse.transformer:org.eclipse.transformer.cli;version=0.3.0.20211005,\ biz.aQute.bnd:biz.aQute.bnd.transform;version=5.3.0,\ commons-cli:commons-cli;version=1.4,\ - org.eclipse.transformer:org.eclipse.transformer;version=0.2.0,\ + org.eclipse.transformer:org.eclipse.transformer;version=0.3.0.20211005,\ com.ibm.ws.common.encoder;version=latest,\ com.ibm.ws.componenttest;version=latest,\ com.ibm.ws.componenttest:com.ibm.componenttest.common;version=1.0.0,\ diff --git a/dev/wlp-gradle/subprojects/fat.gradle b/dev/wlp-gradle/subprojects/fat.gradle index f4a97722527..a15c08b1b4f 100644 --- a/dev/wlp-gradle/subprojects/fat.gradle +++ b/dev/wlp-gradle/subprojects/fat.gradle @@ -60,8 +60,8 @@ dependencies { 'commons-cli:commons-cli:1.4', 'org.slf4j:slf4j-simple:1.7.30', 'org.slf4j:slf4j-api:1.7.26', - 'org.eclipse.transformer:org.eclipse.transformer:0.2.0', - 'org.eclipse.transformer:org.eclipse.transformer.cli:0.2.0' + 'org.eclipse.transformer:org.eclipse.transformer:0.3.0.20211005', + 'org.eclipse.transformer:org.eclipse.transformer.cli:0.3.0.20211005' testcontainers project(':io.openliberty.org.testcontainers') diff --git a/dev/wlp-gradle/subprojects/tasks.gradle b/dev/wlp-gradle/subprojects/tasks.gradle index fe5212b4272..b28f0e811cb 100644 --- a/dev/wlp-gradle/subprojects/tasks.gradle +++ b/dev/wlp-gradle/subprojects/tasks.gradle @@ -158,8 +158,8 @@ if ( parseBoolean( bnd('jakartaeeMe', 'true'))) { 'commons-cli:commons-cli:1.4', 'org.slf4j:slf4j-simple:1.7.30', 'org.slf4j:slf4j-api:1.7.26', - 'org.eclipse.transformer:org.eclipse.transformer:0.2.0', - 'org.eclipse.transformer:org.eclipse.transformer.cli:0.2.0' + 'org.eclipse.transformer:org.eclipse.transformer:0.3.0.20211005', + 'org.eclipse.transformer:org.eclipse.transformer.cli:0.3.0.20211005' } task jakartaeeTransform { diff --git a/dev/wlp-jakartaee-transform/bnd.bnd b/dev/wlp-jakartaee-transform/bnd.bnd index ee9569f21fd..a70b3df2007 100755 --- a/dev/wlp-jakartaee-transform/bnd.bnd +++ b/dev/wlp-jakartaee-transform/bnd.bnd @@ -9,15 +9,15 @@ # IBM Corporation - initial API and implementation #******************************************************************************* --include= jar:${fileuri;${repo;org.eclipse.transformer:org.eclipse.transformer.cli;0.2.0}}!/META-INF/MANIFEST.MF,bnd.overrides +-include= jar:${fileuri;${repo;org.eclipse.transformer:org.eclipse.transformer.cli;0.3.0.20211005}}!/META-INF/MANIFEST.MF,bnd.overrides -includeresource: \ - @${repo;org.eclipse.transformer:org.eclipse.transformer.cli;0.2.0}!/!META-INF/maven/* + @${repo;org.eclipse.transformer:org.eclipse.transformer.cli;0.3.0.20211005}!/!META-INF/maven/* -buildpath: \ - org.eclipse.transformer:org.eclipse.transformer.cli;version=0.2.0,\ + org.eclipse.transformer:org.eclipse.transformer.cli;version=0.3.0.20211005,\ biz.aQute.bnd:biz.aQute.bnd.transform;version=5.3.0,\ org.slf4j:slf4j-api;version=1.7.30,\ - org.eclipse.transformer:org.eclipse.transformer;version=0.2.0,\ + org.eclipse.transformer:org.eclipse.transformer;version=0.3.0.20211005,\ commons-cli:commons-cli;version=1.4,\ org.slf4j:slf4j-simple;version=1.7.30 diff --git a/dev/wlp-jakartaee-transform/notes.txt b/dev/wlp-jakartaee-transform/notes.txt new file mode 100644 index 00000000000..fa4a1c44c0c --- /dev/null +++ b/dev/wlp-jakartaee-transform/notes.txt @@ -0,0 +1,70 @@ +gCurrent latest transformer version: 0.3.0.20211005 + +Update to 0.2.0: + https://github.com/OpenLiberty/open-liberty/pull/15125/files + +Update to 0.3.0.20211005: + https://github.com/OpenLiberty/open-liberty/issues/18900 + +--- + +To update to a new eclipse transformer version: + +These files must be updated to the target transformer version: + +dev/wlp-jakartaee-transform/notes.txt (this file) + +dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml +dev/fattest.simplicity/bnd.bnd +dev/wlp-gradle/subprojects/fat.gradle +dev/wlp-gradle/subprojects/tasks.gradle +dev/wlp-jakartaee-transform/bnd.bnd + +Either of: + +dev/cnf/oss_ibm.maven + (for a custom transformer release uploaded to the IBM artifactory) +dev/cnf/oss_dependencies.maven + (for a usual transformer release which is published to Maven Central) + +For example, see: + https://github.com/OpenLiberty/open-liberty/pull/15125/files + https://github.com/OpenLiberty/open-liberty/issues/18900 + +These examples show version "0.2.0". + +dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml + + org.eclipse.transformer + org.eclipse.transformer.cli + 0.2.0 + + + org.eclipse.transformer + org.eclipse.transformer + 0.2.0 + + +dev/cnf/oss_dependencies.maven + org.eclipse.transformer:org.eclipse.transformer.cli:0.2.0 + org.eclipse.transformer:org.eclipse.transformer:0.2.0 + +dev/fattest.simplicity/bnd.bnd + org.eclipse.transformer:org.eclipse.transformer.cli;version=0.2.0,\ + org.eclipse.transformer:org.eclipse.transformer;version=0.2.0,\ + +dev/wlp-gradle/subprojects/fat.gradle + 'org.eclipse.transformer:org.eclipse.transformer:0.2.0', + 'org.eclipse.transformer:org.eclipse.transformer.cli:0.2.0' + +dev/wlp-gradle/subprojects/tasks.gradle + 'org.eclipse.transformer:org.eclipse.transformer:0.2.0', + 'org.eclipse.transformer:org.eclipse.transformer.cli:0.2.0' + +dev/wlp-jakartaee-transform/bnd.bnd + +-include= jar:${fileuri;${repo;org.eclipse.transformer:org.eclipse.transformer.cli;0.2.0}}!/META-INF/MANIFEST.MF,bnd.overrides +-includeresource: \ + @${repo;org.eclipse.transformer:org.eclipse.transformer.cli;0.2.0}!/!META-INF/maven/* + org.eclipse.transformer:org.eclipse.transformer.cli;version=0.2.0,\ + org.eclipse.transformer:org.eclipse.transformer;version=0.2.0,\ From dbe36177c934913df775e1649418a7ce8cf27999 Mon Sep 17 00:00:00 2001 From: Jared Anderson Date: Sun, 10 Oct 2021 07:35:48 -0500 Subject: [PATCH 2/2] Update version numbers for APIs and SPIs - For APIs and SPIs that include Java EE / Jakarta EE APIs, update package versions to 10.0. --- .../check_this_in_if_it_changes/pom.xml | 10 ----- dev/com.ibm.ws.grpc_fat/build.gradle | 16 ++++++++ dev/com.ibm.ws.jaxws.2.3.security/bnd.bnd | 2 +- dev/com.ibm.ws.security.oauth.jwt/bnd.bnd | 1 + .../bnd.bnd | 1 + .../bnd.bnd | 1 + dev/com.ibm.ws.security.wim.core/bnd.bnd | 1 + dev/com.ibm.ws.security.wim.registry/bnd.bnd | 4 ++ .../bnd.bnd | 1 + .../bnd.bnd | 5 +++ .../bnd.bnd | 6 +++ .../bnd.bnd | 6 +-- .../subprojects/maven-central-mirror.gradle | 1 + .../rules/jakarta-renames.properties | 37 +++++++++++++++++++ .../rules/jakarta-versions.properties | 37 +++++++++++++++++++ 15 files changed, 115 insertions(+), 14 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 6689db7fd34..9ab49ada4e3 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 @@ -2146,16 +2146,6 @@ org.eclipse.persistence.jpa 3.0.2 - - org.eclipse.transformer - org.eclipse.transformer.cli - 0.3.0.20211005 - - - org.eclipse.transformer - org.eclipse.transformer - 0.3.0.20211005 - org.eclipse yasson diff --git a/dev/com.ibm.ws.grpc_fat/build.gradle b/dev/com.ibm.ws.grpc_fat/build.gradle index dfc5b068408..65faa6fefc6 100644 --- a/dev/com.ibm.ws.grpc_fat/build.gradle +++ b/dev/com.ibm.ws.grpc_fat/build.gradle @@ -38,6 +38,22 @@ apply plugin: 'com.google.protobuf' repositories.clear() repositories { if (isUsingArtifactory) { + maven { + credentials { + username userProps.getProperty("artifactory.download.user") + password userProps.getProperty("artifactory.download.token") + } + url ("https://" + userProps.getProperty("artifactory.download.server") + "/artifactory/wasliberty-open-liberty") + // for fats - this repository is used *only* contains artifacts with group "biz.aQute.bnd" + content { + includeGroup "biz.aQute.bnd" + includeGroup "org.eclipse.transformer" + } + metadataSources { + mavenPom() + artifact() + } + } maven { credentials { username userProps.getProperty("artifactory.download.user") diff --git a/dev/com.ibm.ws.jaxws.2.3.security/bnd.bnd b/dev/com.ibm.ws.jaxws.2.3.security/bnd.bnd index 0095e10016c..7131411a468 100644 --- a/dev/com.ibm.ws.jaxws.2.3.security/bnd.bnd +++ b/dev/com.ibm.ws.jaxws.2.3.security/bnd.bnd @@ -21,7 +21,7 @@ Import-Package: \ org.apache.cxf.*;version="[3.2,4)", \ com.ibm.ws.webcontainer.security.metadata, \ com.ibm.wsspi.webcontainer.metadata, \ - com.ibm.wsspi.webcontainer.webapp, \ + com.ibm.wsspi.webcontainer.webapp;version="[2.0,11)", \ * -dsannotations: com.ibm.ws.jaxws.security.internal.JaxWsSecurityConfigurationServiceImpl diff --git a/dev/com.ibm.ws.security.oauth.jwt/bnd.bnd b/dev/com.ibm.ws.security.oauth.jwt/bnd.bnd index f156086b885..6ae1700121e 100644 --- a/dev/com.ibm.ws.security.oauth.jwt/bnd.bnd +++ b/dev/com.ibm.ws.security.oauth.jwt/bnd.bnd @@ -32,6 +32,7 @@ Private-Package: \ com.ibm.ws.security.oauth20.jwt.resources Import-Package: \ + com.ibm.oauth.core.api.error.oauth20; version="[1.1,11)", \ com.ibm.oauth.core.internal.oauth20.granttype, \ com.ibm.oauth.core.internal.oauth20.token, \ * diff --git a/dev/com.ibm.ws.security.openidconnect.common/bnd.bnd b/dev/com.ibm.ws.security.openidconnect.common/bnd.bnd index 90b4936b149..d0427f86b66 100644 --- a/dev/com.ibm.ws.security.openidconnect.common/bnd.bnd +++ b/dev/com.ibm.ws.security.openidconnect.common/bnd.bnd @@ -29,6 +29,7 @@ Export-Package: \ com.ibm.ws.security.openidconnect.common.* Import-Package: \ + com.ibm.oauth.core.api.error.oauth20; version="[1.1,11)", \ com.ibm.oauth.core.internal.oauth20.token, \ com.ibm.websphere.security.openidconnect.token, \ org.jose4j.*;version="[0.6,1)", \ diff --git a/dev/com.ibm.ws.security.wim.adapter.ldap/bnd.bnd b/dev/com.ibm.ws.security.wim.adapter.ldap/bnd.bnd index fde47dcdf34..684c8d5598a 100644 --- a/dev/com.ibm.ws.security.wim.adapter.ldap/bnd.bnd +++ b/dev/com.ibm.ws.security.wim.adapter.ldap/bnd.bnd @@ -29,6 +29,7 @@ Import-Package: \ com.ibm.websphere.security.auth, \ com.ibm.ws.ssl.protocol, \ com.ibm.ws.security.kerberos.auth, \ + com.ibm.wsspi.security.wim.model; version="[1.1,11)", \ !*.internal.*, * Include-Resource: \ diff --git a/dev/com.ibm.ws.security.wim.core/bnd.bnd b/dev/com.ibm.ws.security.wim.core/bnd.bnd index 02245bc80f8..270b4843c29 100644 --- a/dev/com.ibm.ws.security.wim.core/bnd.bnd +++ b/dev/com.ibm.ws.security.wim.core/bnd.bnd @@ -22,6 +22,7 @@ Private-Package: \ Import-Package: \ com.ibm.websphere.ssl, \ + com.ibm.wsspi.security.wim.model; version="[1.1,11)", \ !com.ibm.ws.security.wim.adapter.urbridge,!com.ibm.ws.security.wim.adapter.urbridge.*,*; #TODO do we need to export all these packages? Can we move stuff to only expose a few interfaces? diff --git a/dev/com.ibm.ws.security.wim.registry/bnd.bnd b/dev/com.ibm.ws.security.wim.registry/bnd.bnd index c87cec69a56..c93c0261982 100644 --- a/dev/com.ibm.ws.security.wim.registry/bnd.bnd +++ b/dev/com.ibm.ws.security.wim.registry/bnd.bnd @@ -16,6 +16,10 @@ Bundle-Description: wimregistry service, version ${bVersion} Bundle-SymbolicName: com.ibm.ws.security.wim.registry Private-Package: com.ibm.ws.security.wim.registry.util.resources + +Import-Package: \ + com.ibm.wsspi.security.wim.model; version="[1.1,11)", \ + * Export-Package: \ !com.ibm.ws.security.wim.registry.util.resources,\ diff --git a/dev/com.ibm.ws.security.wim.repository_test.custom/bnd.bnd b/dev/com.ibm.ws.security.wim.repository_test.custom/bnd.bnd index 34c349dcffb..0bcea86ad09 100755 --- a/dev/com.ibm.ws.security.wim.repository_test.custom/bnd.bnd +++ b/dev/com.ibm.ws.security.wim.repository_test.custom/bnd.bnd @@ -17,6 +17,7 @@ Bundle-Description: CustomRepository Sample, version ${bVersion} Export-Package: com.myorg;version=1.0.0 Import-Package: \ + com.ibm.wsspi.security.wim.model; version="[1.1,11)", \ !com.myorg, \ ${defaultPackageImport} diff --git a/dev/com.ibm.ws.webcontainer.security.admin/bnd.bnd b/dev/com.ibm.ws.webcontainer.security.admin/bnd.bnd index 7281cdbd44a..4b041fd51d8 100644 --- a/dev/com.ibm.ws.webcontainer.security.admin/bnd.bnd +++ b/dev/com.ibm.ws.webcontainer.security.admin/bnd.bnd @@ -15,6 +15,11 @@ Bundle-Name: Webcontainer Admin Security Collaborator Bundle-Description: Webcontainer Admin Security Collaborator, version=${bVersion} Bundle-SymbolicName: com.ibm.ws.webcontainer.security.admin +Import-Package: \ + com.ibm.wsspi.security.tai; version="[1.1,11)", \ + com.ibm.wsspi.webcontainer.collaborator;version="[1.2,11)", \ + * + Private-Package: \ com.ibm.ws.webcontainer.security.admin.internal.* diff --git a/dev/com.ibm.ws.webcontainer.security.feature/bnd.bnd b/dev/com.ibm.ws.webcontainer.security.feature/bnd.bnd index e167fad6ab9..803afc78c7f 100644 --- a/dev/com.ibm.ws.webcontainer.security.feature/bnd.bnd +++ b/dev/com.ibm.ws.webcontainer.security.feature/bnd.bnd @@ -16,6 +16,12 @@ Bundle-Description: Webcontainer System WAB Security Collaborator, version=${bVe Bundle-SymbolicName: com.ibm.ws.webcontainer.security.feature Bundle-ActivationPolicy: lazy +Import-Package: \ + com.ibm.wsspi.security.tai;version="[1.1,11)", \ + com.ibm.wsspi.webcontainer.collaborator;version="[1.2,11)", \ + com.ibm.wsspi.webcontainer.webapp; version="[2.0,11)", \ + * + Private-Package: \ com.ibm.ws.webcontainer.security.feature.internal, \ com.ibm.ws.webcontainer.security.feature.resources diff --git a/dev/io.openliberty.persistence.3.0.thirdparty/bnd.bnd b/dev/io.openliberty.persistence.3.0.thirdparty/bnd.bnd index 78fa5b2fe76..933abced9cb 100644 --- a/dev/io.openliberty.persistence.3.0.thirdparty/bnd.bnd +++ b/dev/io.openliberty.persistence.3.0.thirdparty/bnd.bnd @@ -41,7 +41,7 @@ Export-Package: \ org.eclipse.persistence.*;version="${eclVersion}" Import-Package: \ - com.ibm.tx.jta;resolution:=optional, \ + com.ibm.tx.jta;version="[10.0,11)";resolution:=optional, \ com.ibm.websphere.ras, \ com.ibm.ws.Transaction;resolution:=optional, \ com.ibm.ws.jpa.container.eclipselink.logging;resolution:=optional, \ @@ -103,8 +103,8 @@ DynamicImport-Package: \ jakarta.xml.bind.annotation, \ jakarta.xml.bind.annotation.adapters, \ jakarta.xml.bind.attachment, \ - javax.xml.bind.helpers, \ - javax.xml.bind.util + jakarta.xml.bind.helpers, \ + jakarta.xml.bind.util Private-Package: io.openliberty.persistence.internal.helper diff --git a/dev/wlp-gradle/subprojects/maven-central-mirror.gradle b/dev/wlp-gradle/subprojects/maven-central-mirror.gradle index 7b4c6fb3134..8f67460beab 100644 --- a/dev/wlp-gradle/subprojects/maven-central-mirror.gradle +++ b/dev/wlp-gradle/subprojects/maven-central-mirror.gradle @@ -25,6 +25,7 @@ repositories { // for fats - this repository is used *only* contains artifacts with group "biz.aQute.bnd" content { includeGroup "biz.aQute.bnd" + includeGroup "org.eclipse.transformer" } metadataSources { mavenPom() diff --git a/dev/wlp-jakartaee-transform/rules/jakarta-renames.properties b/dev/wlp-jakartaee-transform/rules/jakarta-renames.properties index 1dee3774d7c..dcd9cebc0b4 100644 --- a/dev/wlp-jakartaee-transform/rules/jakarta-renames.properties +++ b/dev/wlp-jakartaee-transform/rules/jakarta-renames.properties @@ -1,9 +1,45 @@ +com.ibm.oauth.core.api.error.oauth20=com.ibm.oauth.core.api.error.oauth20 +com.ibm.tx.jta=com.ibm.tx.jta +com.ibm.websphere.ejbcontainer=com.ibm.websphere.ejbcontainer com.ibm.websphere.ejbcontainer.test.mdb.interceptors=io.openliberty.ejbcontainer.jakarta.test.mdb.interceptors com.ibm.websphere.ejbcontainer.test.mdb=io.openliberty.ejbcontainer.jakarta.test.mdb com.ibm.websphere.ejbcontainer.test.osgi.pmi.internal=io.openliberty.ejbcontainer.jakarta.test.osgi.pmi.internal com.ibm.websphere.ejbcontainer.test.osgi.pmi=io.openliberty.ejbcontainer.jakarta.test.osgi.pmi com.ibm.websphere.ejbcontainer.test.tools=io.openliberty.ejbcontainer.jakarta.test.tools +com.ibm.websphere.jaxrs20.multipart=com.ibm.websphere.jaxrs20.multipart +com.ibm.websphere.jaxrs.providers.json4j=com.ibm.websphere.jaxrs.providers.json4j +com.ibm.websphere.security.jca=com.ibm.websphere.security.jca +com.ibm.websphere.security.jwt=com.ibm.websphere.security.jwt +com.ibm.websphere.security.oauth20=com.ibm.websphere.security.oauth20 +com.ibm.websphere.security.tai.extension=com.ibm.websphere.security.tai.extension +com.ibm.websphere.security.web=com.ibm.websphere.security.web +com.ibm.websphere.servlet.cache=com.ibm.websphere.servlet.cache +com.ibm.websphere.servlet.context=com.ibm.websphere.servlet.context +com.ibm.websphere.servlet.error=com.ibm.websphere.servlet.error +com.ibm.websphere.servlet.event=com.ibm.websphere.servlet.event +com.ibm.websphere.servlet.filter=com.ibm.websphere.servlet.filter +com.ibm.websphere.servlet.request=com.ibm.websphere.servlet.request +com.ibm.websphere.servlet.response=com.ibm.websphere.servlet.response +com.ibm.websphere.servlet.session=com.ibm.websphere.servlet.session +com.ibm.websphere.uow=com.ibm.websphere.uow +com.ibm.websphere.webcontainer.async=com.ibm.websphere.webcontainer.async +com.ibm.websphere.wsoc=com.ibm.websphere.wsoc com.ibm.wsspi.el=com.ibm.wsspi.el +com.ibm.wsspi.security.auth.callback=com.ibm.wsspi.security.auth.callback +com.ibm.wsspi.security.authorization.jacc=com.ibm.wsspi.security.authorization.jacc +com.ibm.wsspi.security.jaspi=com.ibm.wsspi.security.jaspi +com.ibm.wsspi.security.tai=com.ibm.wsspi.security.tai +com.ibm.wsspi.security.tai.extension=com.ibm.wsspi.security.tai.extension +com.ibm.wsspi.security.wim.model=com.ibm.wsspi.security.wim.model +com.ibm.wsspi.webcontainer.collaborator=com.ibm.wsspi.webcontainer.collaborator +com.ibm.wsspi.webcontainer=com.ibm.wsspi.webcontainer +com.ibm.wsspi.webcontainer.extension=com.ibm.wsspi.webcontainer.extension +com.ibm.wsspi.webcontainer.filter=com.ibm.wsspi.webcontainer.filter +com.ibm.wsspi.webcontainer.servlet=com.ibm.wsspi.webcontainer.servlet +com.ibm.wsspi.webcontainer.webapp=com.ibm.wsspi.webcontainer.webapp +com.ibm.wsspi.webservices.handler=com.ibm.wsspi.webservices.handler +com.ibm.wsspi.webservices.wsat=com.ibm.wsspi.webservices.wsat +com.ibm.ws.webcontainer.extension=com.ibm.ws.webcontainer.extension com.sun.xml.bind.api.impl=org.glassfish.jaxb.core.api.impl com.sun.xml.bind.api=org.glassfish.jaxb.runtime.api com.sun.xml.bind.marshaller=org.glassfish.jaxb.core.marshaller @@ -29,6 +65,7 @@ com.sun.xml.internal.messaging.saaj.soap.name=com.sun.xml.messaging.saaj.soap.na com.sun.xml.internal.messaging.saaj.util=com.sun.xml.messaging.saaj.util com.sun.xml.internal.messaging.saaj.util.stax=com.sun.xml.messaging.saaj.util.stax com.sun.xml.internal.messaging.saaj.util.transform=com.sun.xml.messaging.saaj.util.transform +io.openliberty.cdi.spi=io.openliberty.cdi.spi javax.activation=jakarta.activation javax.annotation=jakarta.annotation javax.annotation.security=jakarta.annotation.security diff --git a/dev/wlp-jakartaee-transform/rules/jakarta-versions.properties b/dev/wlp-jakartaee-transform/rules/jakarta-versions.properties index 658d911deb9..fb5fd69af8f 100644 --- a/dev/wlp-jakartaee-transform/rules/jakarta-versions.properties +++ b/dev/wlp-jakartaee-transform/rules/jakarta-versions.properties @@ -1,4 +1,41 @@ +com.ibm.oauth.core.api.error.oauth20=[10.0,11);Export-Package=10.0 +com.ibm.tx.jta=[10.0,11);Export-Package=10.0 +com.ibm.websphere.ejbcontainer=[10.0,11);Export-Package=10.0 +com.ibm.websphere.jaxrs20.multipart=[10.0,11);Export-Package=10.0 +com.ibm.websphere.jaxrs.providers.json4j=[10.0,11);Export-Package=10.0 +com.ibm.websphere.security.jca=[10.0,11);Export-Package=10.0 +com.ibm.websphere.security.jwt=[10.0,11);Export-Package=10.0 +com.ibm.websphere.security.oauth20=[10.0,11);Export-Package=10.0 +com.ibm.websphere.security.tai.extension=[10.0,11);Export-Package=10.0 +com.ibm.websphere.security.web=[10.0,11);Export-Package=10.0 +com.ibm.websphere.servlet.cache=[10.0,11);Export-Package=10.0 +com.ibm.websphere.servlet.context=[10.0,11);Export-Package=10.0 +com.ibm.websphere.servlet.error=[10.0,11);Export-Package=10.0 +com.ibm.websphere.servlet.event=[10.0,11);Export-Package=10.0 +com.ibm.websphere.servlet.filter=[10.0,11);Export-Package=10.0 +com.ibm.websphere.servlet.request=[10.0,11);Export-Package=10.0 +com.ibm.websphere.servlet.response=[10.0,11);Export-Package=10.0 +com.ibm.websphere.servlet.session=[10.0,11);Export-Package=10.0 +com.ibm.websphere.uow=[10.0,11);Export-Package=10.0 +com.ibm.websphere.webcontainer.async=[10.0,11);Export-Package=10.0 +com.ibm.websphere.wsoc=[10.0,11);Export-Package=10.0 com.ibm.wsspi.el=[4.0,5) +com.ibm.wsspi.security.auth.callback=[10.0,11);Export-Package=10.0 +com.ibm.wsspi.security.authorization.jacc=[10.0,11);Export-Package=10.0 +com.ibm.wsspi.security.jaspi=[10.0,11);Export-Package=10.0 +com.ibm.wsspi.security.tai=[10.0,11);Export-Package=10.0 +com.ibm.wsspi.security.tai.extension=[10.0,11);Export-Package=10.0 +com.ibm.wsspi.security.wim.model=[10.0,11);Export-Package=10.0 +com.ibm.wsspi.webcontainer=[10.0,11);Export-Package=10.0 +com.ibm.wsspi.webcontainer.collaborator=[10.0,11);Export-Package=10.0 +com.ibm.wsspi.webcontainer.extension=[10.0,11);Export-Package=10.0 +com.ibm.wsspi.webcontainer.filter=[10.0,11);Export-Package=10.0 +com.ibm.wsspi.webcontainer.servlet=[10.0,11);Export-Package=10.0 +com.ibm.wsspi.webcontainer.webapp=[10.0,11);Export-Package=10.0 +com.ibm.wsspi.webservices.handler=[10.0,11);Export-Package=10.0 +com.ibm.wsspi.webservices.wsat=[10.0,11);Export-Package=10.0 +com.ibm.ws.webcontainer.extension=[10.0,11);Export-Package=10.0 +io.openliberty.cdi.spi=[10.0,11);Export-Package=10.0 jakarta.activation=[2.0,3) jakarta.annotation=[2.0,3) jakarta.annotation.security=[2.0,3)