Skip to content

Rename Jakarta JSF shared modules to jsf-common-jakarta #18080

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
trask merged 2 commits into from
Apr 23, 2026
Merged

Rename Jakarta JSF shared modules to jsf-common-jakarta #18080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af92286
Rename JSF common jakarta module
Copilot Apr 20, 2026
c4e2c79
Merge remote-tracking branch 'upstream/main' into copilot/rename-jsf-…
trask Apr 23, 2026
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
4 changes: 2 additions & 2 deletions .fossa.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,10 +630,10 @@ targets:
target: ':instrumentation:jms:jms-common:javaagent'
- type: gradle
path: ./
target: ':instrumentation:jsf:jsf-common-javax:javaagent'
target: ':instrumentation:jsf:jsf-common-jakarta:javaagent'
- type: gradle
path: ./
target: ':instrumentation:jsf:jsf-jakarta-common:javaagent'
target: ':instrumentation:jsf:jsf-common-javax:javaagent'
- type: gradle
path: ./
target: ':instrumentation:jsf:jsf-mojarra-1.2:javaagent'
Expand Down
0 ...jakarta-common/javaagent/build.gradle.kts → ...common-jakarta/javaagent/build.gradle.kts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...n/jsf/jakarta/JsfErrorCauseExtractor.java → ...ommon/jakarta/JsfErrorCauseExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.jsf.jakarta;
package io.opentelemetry.javaagent.instrumentation.jsf.common.jakarta;

import io.opentelemetry.instrumentation.api.instrumenter.ErrorCauseExtractor;
import jakarta.faces.FacesException;
Expand Down
2 changes: 1 addition & 1 deletion ...strumentation/jsf/jakarta/JsfRequest.java → ...tation/jsf/common/jakarta/JsfRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.jsf.jakarta;
package io.opentelemetry.javaagent.instrumentation.jsf.common.jakarta;

import static java.util.Objects.requireNonNull;

Expand Down
2 changes: 1 addition & 1 deletion ...tion/jsf/jakarta/JsfServerSpanNaming.java → ...f/common/jakarta/JsfServerSpanNaming.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.jsf.jakarta;
package io.opentelemetry.javaagent.instrumentation.jsf.common.jakarta;

import io.opentelemetry.api.trace.Span;
import io.opentelemetry.context.Context;
Expand Down
0 ...f-jakarta-common/testing/build.gradle.kts → ...f-common-jakarta/testing/build.gradle.kts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...trumentation/jsf/jakarta/BaseJsfTest.java → ...ation/jsf/common/jakarta/BaseJsfTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.jsf.jakarta;
package io.opentelemetry.javaagent.instrumentation.jsf.common.jakarta;

import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
Expand Down
2 changes: 1 addition & 1 deletion ...entation/jsf/jakarta/ExceptionFilter.java → ...n/jsf/common/jakarta/ExceptionFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.jsf.jakarta;
package io.opentelemetry.javaagent.instrumentation.jsf.common.jakarta;

import jakarta.servlet.Filter;
import jakarta.servlet.FilterChain;
Expand Down
2 changes: 1 addition & 1 deletion ...rumentation/jsf/jakarta/GreetingForm.java → ...tion/jsf/common/jakarta/GreetingForm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.jsf.jakarta;
package io.opentelemetry.javaagent.instrumentation.jsf.common.jakarta;

public class GreetingForm {

Expand Down
2 changes: 1 addition & 1 deletion ...sources/test-app/WEB-INF/faces-config.xml → ...sources/test-app/WEB-INF/faces-config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<managed-bean>
<managed-bean-name>greetingForm</managed-bean-name>
<managed-bean-class>io.opentelemetry.javaagent.instrumentation.jsf.jakarta.GreetingForm</managed-bean-class>
<managed-bean-class>io.opentelemetry.javaagent.instrumentation.jsf.common.jakarta.GreetingForm</managed-bean-class>
<managed-bean-scope>request</managed-bean-scope>
</managed-bean>

Expand Down
2 changes: 1 addition & 1 deletion ...c/main/resources/test-app/WEB-INF/web.xml → ...c/main/resources/test-app/WEB-INF/web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<filter>
<filter-name>ExceptionFilter</filter-name>
<filter-class>io.opentelemetry.javaagent.instrumentation.jsf.jakarta.ExceptionFilter</filter-class>
<filter-class>io.opentelemetry.javaagent.instrumentation.jsf.common.jakarta.ExceptionFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>ExceptionFilter</filter-name>
Expand Down
0 ...rc/main/resources/test-app/greeting.xhtml → ...rc/main/resources/test-app/greeting.xhtml
View file
Open in desktop
File renamed without changes.
0 ...g/src/main/resources/test-app/hello.xhtml → ...g/src/main/resources/test-app/hello.xhtml
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions instrumentation/jsf/jsf-mojarra-3.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ dependencies {
library("jakarta.faces:jakarta.faces-api:3.0.0")
testLibrary("org.glassfish:jakarta.faces:3.0.4")

implementation(project(":instrumentation:jsf:jsf-jakarta-common:javaagent"))
testImplementation(project(":instrumentation:jsf:jsf-jakarta-common:testing"))
implementation(project(":instrumentation:jsf:jsf-common-jakarta:javaagent"))
testImplementation(project(":instrumentation:jsf:jsf-common-jakarta:testing"))

testInstrumentation(project(":instrumentation:servlet:servlet-5.0:javaagent"))
testInstrumentation(project(":instrumentation:jsf:jsf-mojarra-1.2:javaagent"))
Expand Down
2 changes: 1 addition & 1 deletion ...entelemetry/javaagent/instrumentation/mojarra/v3_0/ActionListenerImplInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import io.opentelemetry.context.Scope;
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
import io.opentelemetry.javaagent.instrumentation.jsf.jakarta.JsfRequest;
import io.opentelemetry.javaagent.instrumentation.jsf.common.jakarta.JsfRequest;
import jakarta.faces.event.ActionEvent;
import javax.annotation.Nullable;
import net.bytebuddy.asm.Advice;
Expand Down
4 changes: 2 additions & 2 deletions .../main/java/io/opentelemetry/javaagent/instrumentation/mojarra/v3_0/MojarraSingletons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import io.opentelemetry.api.GlobalOpenTelemetry;
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.javaagent.bootstrap.internal.ExperimentalConfig;
import io.opentelemetry.javaagent.instrumentation.jsf.jakarta.JsfErrorCauseExtractor;
import io.opentelemetry.javaagent.instrumentation.jsf.jakarta.JsfRequest;
import io.opentelemetry.javaagent.instrumentation.jsf.common.jakarta.JsfErrorCauseExtractor;
import io.opentelemetry.javaagent.instrumentation.jsf.common.jakarta.JsfRequest;

public class MojarraSingletons {
private static final String INSTRUMENTATION_NAME = "io.opentelemetry.jsf-mojarra-3.0";
Expand Down
2 changes: 1 addition & 1 deletion ...opentelemetry/javaagent/instrumentation/mojarra/v3_0/RestoreViewPhaseInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
import io.opentelemetry.javaagent.instrumentation.jsf.jakarta.JsfServerSpanNaming;
import io.opentelemetry.javaagent.instrumentation.jsf.common.jakarta.JsfServerSpanNaming;
import jakarta.faces.context.FacesContext;
import net.bytebuddy.asm.Advice;
import net.bytebuddy.description.type.TypeDescription;
Expand Down
2 changes: 1 addition & 1 deletion ...t/src/test/java/io/opentelemetry/javaagent/instrumentation/mojarra/v3_0/Mojarra3Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@

package io.opentelemetry.javaagent.instrumentation.mojarra.v3_0;

import io.opentelemetry.javaagent.instrumentation.jsf.jakarta.BaseJsfTest;
import io.opentelemetry.javaagent.instrumentation.jsf.common.jakarta.BaseJsfTest;

class Mojarra3Test extends BaseJsfTest {}
4 changes: 2 additions & 2 deletions instrumentation/jsf/jsf-myfaces-3.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ dependencies {
library("org.apache.myfaces.core:myfaces-api:3.0.2")
testLibrary("org.apache.myfaces.core:myfaces-impl:3.0.2")

implementation(project(":instrumentation:jsf:jsf-jakarta-common:javaagent"))
testImplementation(project(":instrumentation:jsf:jsf-jakarta-common:testing"))
implementation(project(":instrumentation:jsf:jsf-common-jakarta:javaagent"))
testImplementation(project(":instrumentation:jsf:jsf-common-jakarta:testing"))

testInstrumentation(project(":instrumentation:servlet:servlet-5.0:javaagent"))
testInstrumentation(project(":instrumentation:jsf:jsf-myfaces-1.2:javaagent"))
Expand Down
2 changes: 1 addition & 1 deletion ...entelemetry/javaagent/instrumentation/myfaces/v3_0/ActionListenerImplInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import io.opentelemetry.context.Scope;
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
import io.opentelemetry.javaagent.instrumentation.jsf.jakarta.JsfRequest;
import io.opentelemetry.javaagent.instrumentation.jsf.common.jakarta.JsfRequest;
import jakarta.faces.event.ActionEvent;
import javax.annotation.Nullable;
import net.bytebuddy.asm.Advice;
Expand Down
2 changes: 1 addition & 1 deletion ...a/io/opentelemetry/javaagent/instrumentation/myfaces/v3_0/MyFacesErrorCauseExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

package io.opentelemetry.javaagent.instrumentation.myfaces.v3_0;

import io.opentelemetry.javaagent.instrumentation.jsf.jakarta.JsfErrorCauseExtractor;
import io.opentelemetry.javaagent.instrumentation.jsf.common.jakarta.JsfErrorCauseExtractor;
import jakarta.el.ELException;

class MyFacesErrorCauseExtractor extends JsfErrorCauseExtractor {
Expand Down
2 changes: 1 addition & 1 deletion .../main/java/io/opentelemetry/javaagent/instrumentation/myfaces/v3_0/MyFacesSingletons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import io.opentelemetry.api.GlobalOpenTelemetry;
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.javaagent.bootstrap.internal.ExperimentalConfig;
import io.opentelemetry.javaagent.instrumentation.jsf.jakarta.JsfRequest;
import io.opentelemetry.javaagent.instrumentation.jsf.common.jakarta.JsfRequest;

class MyFacesSingletons {
private static final String INSTRUMENTATION_NAME = "io.opentelemetry.jsf-myfaces-3.0";
Expand Down
2 changes: 1 addition & 1 deletion ...ntelemetry/javaagent/instrumentation/myfaces/v3_0/RestoreViewExecutorInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
import io.opentelemetry.javaagent.instrumentation.jsf.jakarta.JsfServerSpanNaming;
import io.opentelemetry.javaagent.instrumentation.jsf.common.jakarta.JsfServerSpanNaming;
import jakarta.faces.context.FacesContext;
import net.bytebuddy.asm.Advice;
import net.bytebuddy.description.type.TypeDescription;
Expand Down
2 changes: 1 addition & 1 deletion ...t/src/test/java/io/opentelemetry/javaagent/instrumentation/myfaces/v3_0/Myfaces3Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@

package io.opentelemetry.javaagent.instrumentation.myfaces.v3_0;

import io.opentelemetry.javaagent.instrumentation.jsf.jakarta.BaseJsfTest;
import io.opentelemetry.javaagent.instrumentation.jsf.common.jakarta.BaseJsfTest;

class Myfaces3Test extends BaseJsfTest {}
4 changes: 2 additions & 2 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,10 +402,10 @@ include(":instrumentation:jmx-metrics:testing-apps:camel-testing-app")
include(":instrumentation:jmx-metrics:testing-apps:testing-webapp")
include(":instrumentation:jodd-http-4.2:javaagent")
include(":instrumentation:jodd-http-4.2:javaagent-unit-tests")
include(":instrumentation:jsf:jsf-common-jakarta:javaagent")
include(":instrumentation:jsf:jsf-common-jakarta:testing")
include(":instrumentation:jsf:jsf-common-javax:javaagent")
include(":instrumentation:jsf:jsf-common-javax:testing")
include(":instrumentation:jsf:jsf-jakarta-common:javaagent")
include(":instrumentation:jsf:jsf-jakarta-common:testing")
include(":instrumentation:jsf:jsf-mojarra-1.2:javaagent")
include(":instrumentation:jsf:jsf-mojarra-3.0:javaagent")
include(":instrumentation:jsf:jsf-myfaces-1.2:javaagent")
Expand Down
Loading