Merge pull request #17083 from cbridgha/EE9APIBundles

Adding separate EE9 api/api bundle projects
OpenLiberty · May 6, 2021 · 151f599 · 151f599
2 parents dbd0dbf + 53bc265
commit 151f599
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/...pserver.features/visibility/private/com.ibm.websphere.appserver.globalhandler-1.0.feature b/...pserver.features/visibility/private/com.ibm.websphere.appserver.globalhandler-1.0.feature
@@ -6,8 +6,7 @@ IBM-SPI-Package: com.ibm.wsspi.webservices.handler
 -features=\
   io.openliberty.servlet.api-3.0; ibm.tolerates:="3.1,4.0,5.0"; apiJar=false, \
   io.openliberty.globalhandler1.0.internal.ee-6.0; ibm.tolerates:="9.0"
--jars=com.ibm.websphere.appserver.spi.globalhandler; location:=dev/spi/ibm/, \
-  com.ibm.websphere.appserver.spi.globalhandler.jakarta; location:=dev/spi/ibm/
+-jars=com.ibm.websphere.appserver.spi.globalhandler; location:=dev/spi/ibm/
 -files=dev/spi/ibm/javadoc/com.ibm.websphere.appserver.spi.globalhandler_1.0-javadoc.zip
 kind=ga
 edition=core

diff --git a/....appserver.features/visibility/public/jwt-1.0/com.ibm.websphere.appserver.jwt-1.0.feature b/....appserver.features/visibility/public/jwt-1.0/com.ibm.websphere.appserver.jwt-1.0.feature
@@ -21,7 +21,6 @@ Subsystem-Name: JSON Web Token 1.0
   com.ibm.ws.org.slf4j.jdk14.1.7.7, \
   com.ibm.json4j
 -jars=\
-  com.ibm.websphere.appserver.api.jwt; location:=dev/api/ibm/, \
-  io.openliberty.jwt; location:=dev/api/ibm/
+  com.ibm.websphere.appserver.api.jwt; location:=dev/api/ibm/
 kind=ga
 edition=core
diff --git a/...server.features/visibility/public/oauth-2.0/com.ibm.websphere.appserver.oauth-2.0.feature b/...server.features/visibility/public/oauth-2.0/com.ibm.websphere.appserver.oauth-2.0.feature
@@ -32,7 +32,6 @@ Subsystem-Name: OAuth 2.0
   com.ibm.ws.org.json.simple.1.1.1
 -jars=\
   com.ibm.websphere.appserver.api.oauth; location:=dev/api/ibm/, \
-  io.openliberty.oauth; location:=dev/api/ibm/, \
   com.ibm.websphere.appserver.spi.oauth; location:=dev/spi/ibm/
 -files=\
   dev/spi/ibm/javadoc/com.ibm.websphere.appserver.spi.oauth_1.4-javadoc.zip

diff --git a/...ty/public/passwordUtilities-1.0/com.ibm.websphere.appserver.passwordUtilities-1.0.feature b/...ty/public/passwordUtilities-1.0/com.ibm.websphere.appserver.passwordUtilities-1.0.feature
@@ -14,8 +14,7 @@ Subsystem-Name: Password Utilities 1.0
  io.openliberty.passwordUtilities1.0.internal.ee-6.0; ibm.tolerates:="9.0"
 -jars=\
  com.ibm.websphere.appserver.api.passwordUtil; location:=dev/api/ibm/, \
- com.ibm.websphere.appserver.api.authData; location:=dev/api/ibm/, \
- io.openliberty.authData; location:=dev/api/ibm/
+ com.ibm.websphere.appserver.api.authData; location:=dev/api/ibm/
 -files=\
  dev/api/ibm/javadoc/com.ibm.websphere.appserver.api.passwordUtil_1.0-javadoc.zip
 kind=ga