Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FISH-10073 Reduce EE11 Shim #7226

Open
wants to merge 1 commit into
base: Payara7
Choose a base branch
from
Open

FISH-10073 Reduce EE11 Shim #7226

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 2 additions & 44 deletions appserver/packager/external/jakarta-ee11-shim/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,20 +78,6 @@
<artifactId>jakarta.ws.rs-api</artifactId>
<scope>provided</scope>
</dependency>

<!-- Downgrade shim for Jakarta Security API 3.0, required by security-connector-oidc-client. Remove once Security Connectors upgraded -->
<dependency>
<groupId>jakarta.security.enterprise</groupId>
<artifactId>jakarta.security.enterprise-api</artifactId>
<scope>provided</scope>
</dependency>

<!-- Downgrade shim for Soteria 3.0, required by security-connector-oauth2-client. Remove once Security Connectors upgraded -->
<dependency>
<groupId>org.glassfish.soteria</groupId>
<artifactId>soteria</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>

<build>
Expand All @@ -117,11 +103,7 @@
<!-- Downgrade shim for Jakarta EL, required by Jersey-HK2/Hibernate Validator(?). Remove once Jersey-HK2/Hibernate Validator(?) upgraded -->
jakarta.el-api,
<!-- Downgrade shim for JAX-RS, required by MicroProfile Rest Client. Remove once MicroProfile Rest Client upgraded -->
jakarta.ws.rs-api,
<!-- Downgrade shim for Jakarta Security API 3.0, required by security-connector-oidc-client. Remove once Security Connectors upgraded -->
jakarta.security.enterprise-api,
<!-- Downgrade shim for Soteria 3.0, required by security-connector-oauth2-client. Remove once Security Connectors upgraded -->
org.glassfish.soteria
jakarta.ws.rs-api
</Require-Bundle>
<!-- Manually specify the shim versions of packages to be exported via this bundle -->
<!-- Note the "shortened" syntax here: For every API the packages are delimited with
Expand All @@ -141,31 +123,7 @@
jakarta.ws.rs.container;
jakarta.ws.rs.core;
jakarta.ws.rs.ext;
jakarta.ws.rs.sse;version="3.1.99";shim=true,
<!-- Downgrade shim for Jakarta Security API 3.0, required by security-connector-oidc-client. Remove once Security Connectors upgraded -->
jakarta.security.enterprise;
jakarta.security.enterprise.authentication.mechanism.http;
jakarta.security.enterprise.authentication.mechanism.http.openid;
jakarta.security.enterprise.credential;
jakarta.security.enterprise.identitystore;
jakarta.security.enterprise.identitystore.openid;version="3.0.99";shim=true,
<!-- Downgrade shim for Soteria 3.0, required by security-connector-oauth2-client. Remove once Security Connectors upgraded -->
org.glassfish.soteria;
org.glassfish.soteria.authorization;
org.glassfish.soteria.authorization.spi;
org.glassfish.soteria.authorization.spi.impl;
org.glassfish.soteria.cdi;
org.glassfish.soteria.cdi.spi;
org.glassfish.soteria.cdi.spi.impl;
org.glassfish.soteria.identitystores;
org.glassfish.soteria.identitystores.annotation;
org.glassfish.soteria.identitystores.hash;
org.glassfish.soteria.mechanisms;
org.glassfish.soteria.mechanisms.jaspic;
org.glassfish.soteria.mechanisms.openid;
org.glassfish.soteria.mechanisms.openid.controller;
org.glassfish.soteria.mechanisms.openid.domain;
org.glassfish.soteria.servlet;version="3.0.99";shim=true
jakarta.ws.rs.sse;version="3.1.99";shim=true
</Export-Package>
</instructions>
</configuration>
Expand Down