Skip to content

FISH-10362: Stop bundling faces in faces-compat #8024

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

Merged
pdudits merged 1 commit into from
Mar 26, 2026
Merged

FISH-10362: Stop bundling faces in faces-compat #8024

Show file tree
Hide file tree
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
15 changes: 4 additions & 11 deletions appserver/admingui/faces-compat/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
~
~ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
~
~ Copyright (c) 2022-2025 Payara Foundation and/or its affiliates. All rights reserved.
~ Copyright (c) 2022-2026 Payara Foundation and/or its affiliates. All rights reserved.
~
~ The contents of this file are subject to the terms of either the GNU
~ General Public License Version 2 only ("GPL") or the Common Development
Expand Down Expand Up @@ -66,13 +66,6 @@
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.faces</artifactId>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down Expand Up @@ -161,12 +154,12 @@
</goals>
<configuration>
<instructions>
<Embed-Dependency>*;artifactId=jakarta.faces|jsftemplating|jsftemplating-dt;inline=true</Embed-Dependency>
<Embed-Dependency>*;artifactId=jsftemplating|jsftemplating-dt;inline=true</Embed-Dependency>
<!-- Contents are exported with additional mandatory attribute, so they wouldn't match general import for e. g. jakarta.faces -->
<Export-Package>fish.payara.server.internal.admingui,
!com.sun.faces.tlddoc-resources,
com.sun.faces.*;com.sun.jsft.*;com.sun.jsftemplating.*;jakarta.faces.*;version="4.0";usage="admingui";mandatory:=usage</Export-Package>
<Import-Package>!com.sun.faces.*,!jakarta.faces.*,!com.sun.jsftemplating.*,!com.sun.jsft,!org.apache.jasper.compiler,*</Import-Package>
com.sun.jsft.*;com.sun.jsftemplating.*;version="4.0";usage="admingui";mandatory:=usage</Export-Package>
<Import-Package>!com.sun.jsftemplating.*,!com.sun.jsft,!org.apache.jasper.compiler,*</Import-Package>
</instructions>
</configuration>
</execution>
Expand Down
56 changes: 0 additions & 56 deletions appserver/admingui/faces-compat/src/main/java/com/sun/faces/config/FacesInitializer2.java
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions appserver/admingui/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
holder.

-->
<!-- Portions Copyright 2016-2025 Payara Foundation and/or its affiliates -->
<!-- Portions Copyright 2016-2026 Payara Foundation and/or its affiliates -->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
Expand Down Expand Up @@ -190,7 +190,6 @@
<rules>
<bannedDependencies>
<excludes>
<exclude>org.glassfish:jakarta.faces</exclude>
<exclude>org.glassfish.jsftemplating:*</exclude>
</excludes>
</bannedDependencies>
Expand Down