From c5319f06301b03d9f545217f98f7d223f5259654 Mon Sep 17 00:00:00 2001 From: Bauke Scholtz Date: Sat, 19 Oct 2024 15:47:30 -0400 Subject: [PATCH 1/8] Fix #5511: don't anymore rely on CodeSource#getLocation(), instead obtain the URL of the resource itself via its own class loader --- .../tasks/ProvideMetadataToAnnotationScanTask.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/impl/src/main/java/com/sun/faces/config/manager/tasks/ProvideMetadataToAnnotationScanTask.java b/impl/src/main/java/com/sun/faces/config/manager/tasks/ProvideMetadataToAnnotationScanTask.java index 3eb07472e0..90ed093b64 100644 --- a/impl/src/main/java/com/sun/faces/config/manager/tasks/ProvideMetadataToAnnotationScanTask.java +++ b/impl/src/main/java/com/sun/faces/config/manager/tasks/ProvideMetadataToAnnotationScanTask.java @@ -17,6 +17,7 @@ package com.sun.faces.config.manager.tasks; import java.net.URI; +import java.net.URL; import java.util.ArrayList; import java.util.HashSet; import java.util.Set; @@ -75,8 +76,14 @@ private void initializeIvars(Set> annotatedSet) { String sourceURIString = sourceURI.toString(); if (annotatedSet != null) { for (Class clazz : annotatedSet) { - if (sourceURIString.contains(clazz.getProtectionDomain().getCodeSource().getLocation().toString())) { - toRemove.add(clazz); + URL resource = clazz.getClassLoader().getResource(clazz.getName().replace(".", "/") + ".class"); + + if (resource != null) { + String location = resource.toString().split("(?<=\\.jar)[!/].*", 2)[0]; + + if (sourceURIString.startsWith(location)) { + toRemove.add(clazz); + } } } annotatedSet.removeAll(toRemove); From 7cc2bd1ba1e350e2ef1df1fc0194f71ceaccf756 Mon Sep 17 00:00:00 2001 From: Bauke Scholtz Date: Sat, 19 Oct 2024 16:03:13 -0400 Subject: [PATCH 2/8] Further improved #5511 --- .../ProvideMetadataToAnnotationScanTask.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/impl/src/main/java/com/sun/faces/config/manager/tasks/ProvideMetadataToAnnotationScanTask.java b/impl/src/main/java/com/sun/faces/config/manager/tasks/ProvideMetadataToAnnotationScanTask.java index 90ed093b64..746b96218c 100644 --- a/impl/src/main/java/com/sun/faces/config/manager/tasks/ProvideMetadataToAnnotationScanTask.java +++ b/impl/src/main/java/com/sun/faces/config/manager/tasks/ProvideMetadataToAnnotationScanTask.java @@ -31,7 +31,8 @@ public final class ProvideMetadataToAnnotationScanTask { - private static final Pattern JAR_PATTERN = Pattern.compile("(.*/(\\S*\\.jar)).*(/faces-config.xml|/*.\\.faces-config.xml)"); + private static final Pattern FACES_CONFIG_XML_IN_JAR_PATTERN = Pattern.compile("(.*/(\\S*\\.jar)).*(/faces-config.xml|/*.\\.faces-config.xml)"); + private static final Pattern CURRENT_RESOURCE_IN_JAR_PATTERN = Pattern.compile("(?<=\\.jar)[!/].*"); private final DocumentInfo[] documentInfos; private final InjectionProvider containerConnector; @@ -55,7 +56,7 @@ private void initializeIvars(Set> annotatedSet) { for (DocumentInfo docInfo : documentInfos) { URI sourceURI = docInfo.getSourceURI(); - Matcher jarMatcher = JAR_PATTERN.matcher(sourceURI == null ? "" : sourceURI.toString()); + Matcher jarMatcher = FACES_CONFIG_XML_IN_JAR_PATTERN.matcher(sourceURI == null ? "" : sourceURI.toString()); if (jarMatcher.matches()) { String jarName = jarMatcher.group(2); @@ -76,14 +77,10 @@ private void initializeIvars(Set> annotatedSet) { String sourceURIString = sourceURI.toString(); if (annotatedSet != null) { for (Class clazz : annotatedSet) { - URL resource = clazz.getClassLoader().getResource(clazz.getName().replace(".", "/") + ".class"); + String location = CURRENT_RESOURCE_IN_JAR_PATTERN.split(clazz.getResource(".").toString(), 2)[0]; - if (resource != null) { - String location = resource.toString().split("(?<=\\.jar)[!/].*", 2)[0]; - - if (sourceURIString.startsWith(location)) { - toRemove.add(clazz); - } + if (sourceURIString.startsWith(location)) { + toRemove.add(clazz); } } annotatedSet.removeAll(toRemove); From 386035fb2005bed65cb1764b74c3ab34dddd93e9 Mon Sep 17 00:00:00 2001 From: Bauke Scholtz Date: Sat, 19 Oct 2024 16:04:55 -0400 Subject: [PATCH 3/8] Renamed variables for clarity --- .../tasks/ProvideMetadataToAnnotationScanTask.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/impl/src/main/java/com/sun/faces/config/manager/tasks/ProvideMetadataToAnnotationScanTask.java b/impl/src/main/java/com/sun/faces/config/manager/tasks/ProvideMetadataToAnnotationScanTask.java index 746b96218c..25de5f1d7a 100644 --- a/impl/src/main/java/com/sun/faces/config/manager/tasks/ProvideMetadataToAnnotationScanTask.java +++ b/impl/src/main/java/com/sun/faces/config/manager/tasks/ProvideMetadataToAnnotationScanTask.java @@ -55,15 +55,15 @@ private void initializeIvars(Set> annotatedSet) { for (DocumentInfo docInfo : documentInfos) { - URI sourceURI = docInfo.getSourceURI(); - Matcher jarMatcher = FACES_CONFIG_XML_IN_JAR_PATTERN.matcher(sourceURI == null ? "" : sourceURI.toString()); + URI facesConfigURI = docInfo.getSourceURI(); + Matcher jarMatcher = FACES_CONFIG_XML_IN_JAR_PATTERN.matcher(facesConfigURI == null ? "" : facesConfigURI.toString()); if (jarMatcher.matches()) { String jarName = jarMatcher.group(2); if (!jarNames.contains(jarName)) { FacesConfigInfo configInfo = new FacesConfigInfo(docInfo); if (!configInfo.isMetadataComplete()) { - uris.add(sourceURI); + uris.add(facesConfigURI); jarNames.add(jarName); } else { /* @@ -74,12 +74,12 @@ private void initializeIvars(Set> annotatedSet) { * annotatedSet because the faces-config.xml that owns it has metadata-complete="true". */ ArrayList> toRemove = new ArrayList<>(1); - String sourceURIString = sourceURI.toString(); + String facesConfigURIString = facesConfigURI.toString(); if (annotatedSet != null) { for (Class clazz : annotatedSet) { - String location = CURRENT_RESOURCE_IN_JAR_PATTERN.split(clazz.getResource(".").toString(), 2)[0]; + String jarURIString = CURRENT_RESOURCE_IN_JAR_PATTERN.split(clazz.getResource(".").toString(), 2)[0]; - if (sourceURIString.startsWith(location)) { + if (facesConfigURIString.startsWith(jarURIString)) { toRemove.add(clazz); } } From 060c0d520abbdb784740511f74b74fe67dade326 Mon Sep 17 00:00:00 2001 From: Bauke Scholtz Date: Thu, 24 Oct 2024 10:11:58 -0400 Subject: [PATCH 4/8] Improved #5511: turns out getResource(".") didn't work in GlassFish (did work in Tomcat and WildFly); so resorted to full class name --- .../manager/tasks/ProvideMetadataToAnnotationScanTask.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/impl/src/main/java/com/sun/faces/config/manager/tasks/ProvideMetadataToAnnotationScanTask.java b/impl/src/main/java/com/sun/faces/config/manager/tasks/ProvideMetadataToAnnotationScanTask.java index 25de5f1d7a..5a5c6406bf 100644 --- a/impl/src/main/java/com/sun/faces/config/manager/tasks/ProvideMetadataToAnnotationScanTask.java +++ b/impl/src/main/java/com/sun/faces/config/manager/tasks/ProvideMetadataToAnnotationScanTask.java @@ -77,7 +77,8 @@ private void initializeIvars(Set> annotatedSet) { String facesConfigURIString = facesConfigURI.toString(); if (annotatedSet != null) { for (Class clazz : annotatedSet) { - String jarURIString = CURRENT_RESOURCE_IN_JAR_PATTERN.split(clazz.getResource(".").toString(), 2)[0]; + URL classURI = clazz.getClassLoader().getResource(clazz.getName().replace('.', '/') + ".class"); + String jarURIString = CURRENT_RESOURCE_IN_JAR_PATTERN.split(classURI.toString(), 2)[0]; if (facesConfigURIString.startsWith(jarURIString)) { toRemove.add(clazz); From 1ff67143b9f9ab5dba14d1b8932a982b8dc47399 Mon Sep 17 00:00:00 2001 From: Bauke Scholtz Date: Thu, 24 Oct 2024 10:14:32 -0400 Subject: [PATCH 5/8] Add integration test for #5511 --- .../pom.xml | 40 ++++++++++++++ .../ExampleFacesComponent.java | 24 +++++++++ .../main/resources/META-INF/faces-config.xml | 8 +++ .../pom.xml | 40 ++++++++++++++ .../ExampleFacesComponent.java | 24 +++++++++ .../main/resources/META-INF/faces-config.xml | 8 +++ test/issue5511/pom.xml | 52 +++++++++++++++++++ .../src/main/webapp/WEB-INF/beans.xml | 0 .../issue5511/src/main/webapp/WEB-INF/web.xml | 36 +++++++++++++ ...ing-jar-with-metadata-complete-false.xhtml | 31 +++++++++++ ...sing-jar-with-metadata-complete-true.xhtml | 31 +++++++++++ .../mojarra/test/issue5511/Issue5511IT.java | 46 ++++++++++++++++ test/pom.xml | 3 ++ 13 files changed, 343 insertions(+) create mode 100644 test/example_jar_with_metadata_complete_false/pom.xml create mode 100644 test/example_jar_with_metadata_complete_false/src/main/java/org/eclipse/mojarra/test/example_jar_with_metadata_complete_false/ExampleFacesComponent.java create mode 100644 test/example_jar_with_metadata_complete_false/src/main/resources/META-INF/faces-config.xml create mode 100644 test/example_jar_with_metadata_complete_true/pom.xml create mode 100644 test/example_jar_with_metadata_complete_true/src/main/java/org/eclipse/mojarra/test/example_jar_with_metadata_complete_true/ExampleFacesComponent.java create mode 100644 test/example_jar_with_metadata_complete_true/src/main/resources/META-INF/faces-config.xml create mode 100644 test/issue5511/pom.xml create mode 100644 test/issue5511/src/main/webapp/WEB-INF/beans.xml create mode 100644 test/issue5511/src/main/webapp/WEB-INF/web.xml create mode 100644 test/issue5511/src/main/webapp/issue5511-using-jar-with-metadata-complete-false.xhtml create mode 100644 test/issue5511/src/main/webapp/issue5511-using-jar-with-metadata-complete-true.xhtml create mode 100644 test/issue5511/src/test/java/org/eclipse/mojarra/test/issue5511/Issue5511IT.java diff --git a/test/example_jar_with_metadata_complete_false/pom.xml b/test/example_jar_with_metadata_complete_false/pom.xml new file mode 100644 index 0000000000..e9dd17a368 --- /dev/null +++ b/test/example_jar_with_metadata_complete_false/pom.xml @@ -0,0 +1,40 @@ + + + + 4.0.0 + + + org.eclipse.mojarra.test + pom + 4.0.9-SNAPSHOT + + + example_jar_with_metadata_complete_false + jar + + Mojarra ${project.version} - INTEGRATION TESTS - ${project.artifactId} + + + + org.glassfish + jakarta.faces + ${project.version} + + + diff --git a/test/example_jar_with_metadata_complete_false/src/main/java/org/eclipse/mojarra/test/example_jar_with_metadata_complete_false/ExampleFacesComponent.java b/test/example_jar_with_metadata_complete_false/src/main/java/org/eclipse/mojarra/test/example_jar_with_metadata_complete_false/ExampleFacesComponent.java new file mode 100644 index 0000000000..730e32dcd8 --- /dev/null +++ b/test/example_jar_with_metadata_complete_false/src/main/java/org/eclipse/mojarra/test/example_jar_with_metadata_complete_false/ExampleFacesComponent.java @@ -0,0 +1,24 @@ +/* + * Copyright (c) Contributors to the Eclipse Foundation. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 + * which is available at https://www.apache.org/licenses/LICENSE-2.0. + * + * This Source Code may also be made available under the following Secondary + * Licenses when the conditions for such availability set forth in the Eclipse + * Public License v. 2.0 are satisfied: GPL-2.0 with Classpath-exception-2.0 which + * is available at https://openjdk.java.net/legal/gplv2+ce.html. + * + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 or Apache-2.0 + */ +package org.eclipse.mojarra.test.example_jar_with_metadata_complete_false; + +import jakarta.faces.component.FacesComponent; +import jakarta.faces.component.html.HtmlOutputText; + +@FacesComponent(createTag = true, namespace="example_jar_with_metadata_complete_false") +public class ExampleFacesComponent extends HtmlOutputText { + +} diff --git a/test/example_jar_with_metadata_complete_false/src/main/resources/META-INF/faces-config.xml b/test/example_jar_with_metadata_complete_false/src/main/resources/META-INF/faces-config.xml new file mode 100644 index 0000000000..0728c095bd --- /dev/null +++ b/test/example_jar_with_metadata_complete_false/src/main/resources/META-INF/faces-config.xml @@ -0,0 +1,8 @@ + + + diff --git a/test/example_jar_with_metadata_complete_true/pom.xml b/test/example_jar_with_metadata_complete_true/pom.xml new file mode 100644 index 0000000000..9b6596aabc --- /dev/null +++ b/test/example_jar_with_metadata_complete_true/pom.xml @@ -0,0 +1,40 @@ + + + + 4.0.0 + + + org.eclipse.mojarra.test + pom + 4.0.9-SNAPSHOT + + + example_jar_with_metadata_complete_true + jar + + Mojarra ${project.version} - INTEGRATION TESTS - ${project.artifactId} + + + + org.glassfish + jakarta.faces + ${project.version} + + + diff --git a/test/example_jar_with_metadata_complete_true/src/main/java/org/eclipse/mojarra/test/example_jar_with_metadata_complete_true/ExampleFacesComponent.java b/test/example_jar_with_metadata_complete_true/src/main/java/org/eclipse/mojarra/test/example_jar_with_metadata_complete_true/ExampleFacesComponent.java new file mode 100644 index 0000000000..c97b56ee9f --- /dev/null +++ b/test/example_jar_with_metadata_complete_true/src/main/java/org/eclipse/mojarra/test/example_jar_with_metadata_complete_true/ExampleFacesComponent.java @@ -0,0 +1,24 @@ +/* + * Copyright (c) Contributors to the Eclipse Foundation. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 + * which is available at https://www.apache.org/licenses/LICENSE-2.0. + * + * This Source Code may also be made available under the following Secondary + * Licenses when the conditions for such availability set forth in the Eclipse + * Public License v. 2.0 are satisfied: GPL-2.0 with Classpath-exception-2.0 which + * is available at https://openjdk.java.net/legal/gplv2+ce.html. + * + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 or Apache-2.0 + */ +package org.eclipse.mojarra.test.example_jar_with_metadata_complete_true; + +import jakarta.faces.component.FacesComponent; +import jakarta.faces.component.html.HtmlOutputText; + +@FacesComponent(createTag = true, namespace="example_jar_with_metadata_complete_true") +public class ExampleFacesComponent extends HtmlOutputText { + +} diff --git a/test/example_jar_with_metadata_complete_true/src/main/resources/META-INF/faces-config.xml b/test/example_jar_with_metadata_complete_true/src/main/resources/META-INF/faces-config.xml new file mode 100644 index 0000000000..ea8ec0ee60 --- /dev/null +++ b/test/example_jar_with_metadata_complete_true/src/main/resources/META-INF/faces-config.xml @@ -0,0 +1,8 @@ + + + diff --git a/test/issue5511/pom.xml b/test/issue5511/pom.xml new file mode 100644 index 0000000000..d8f275ff56 --- /dev/null +++ b/test/issue5511/pom.xml @@ -0,0 +1,52 @@ + + + + 4.0.0 + + + org.eclipse.mojarra.test + pom + 4.0.9-SNAPSHOT + + + issue5511 + war + + Mojarra ${project.version} - INTEGRATION TESTS - ${project.artifactId} + + + + org.eclipse.mojarra.test + example_jar_with_metadata_complete_false + ${project.version} + + + org.eclipse.mojarra.test + example_jar_with_metadata_complete_true + ${project.version} + + + + org.eclipse.mojarra.test + base + ${project.version} + test + + + diff --git a/test/issue5511/src/main/webapp/WEB-INF/beans.xml b/test/issue5511/src/main/webapp/WEB-INF/beans.xml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/issue5511/src/main/webapp/WEB-INF/web.xml b/test/issue5511/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000000..31ee2d0dbe --- /dev/null +++ b/test/issue5511/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,36 @@ + + + + + facesServlet + jakarta.faces.webapp.FacesServlet + 1 + + + facesServlet + *.xhtml + *.jsf + /faces/* + + diff --git a/test/issue5511/src/main/webapp/issue5511-using-jar-with-metadata-complete-false.xhtml b/test/issue5511/src/main/webapp/issue5511-using-jar-with-metadata-complete-false.xhtml new file mode 100644 index 0000000000..1ac34508f5 --- /dev/null +++ b/test/issue5511/src/main/webapp/issue5511-using-jar-with-metadata-complete-false.xhtml @@ -0,0 +1,31 @@ + + + + + issue5511 - trying to use annotated @FacesComponent from JAR with metadata-complete=false + + + + + diff --git a/test/issue5511/src/main/webapp/issue5511-using-jar-with-metadata-complete-true.xhtml b/test/issue5511/src/main/webapp/issue5511-using-jar-with-metadata-complete-true.xhtml new file mode 100644 index 0000000000..eee8362ed0 --- /dev/null +++ b/test/issue5511/src/main/webapp/issue5511-using-jar-with-metadata-complete-true.xhtml @@ -0,0 +1,31 @@ + + + + + issue5511 - trying to use annotated @FacesComponent from JAR with metadata-complete=true + + + + + diff --git a/test/issue5511/src/test/java/org/eclipse/mojarra/test/issue5511/Issue5511IT.java b/test/issue5511/src/test/java/org/eclipse/mojarra/test/issue5511/Issue5511IT.java new file mode 100644 index 0000000000..4d45aa2d52 --- /dev/null +++ b/test/issue5511/src/test/java/org/eclipse/mojarra/test/issue5511/Issue5511IT.java @@ -0,0 +1,46 @@ +/* + * Copyright (c) Contributors to the Eclipse Foundation. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 + * which is available at https://www.apache.org/licenses/LICENSE-2.0. + * + * This Source Code may also be made available under the following Secondary + * Licenses when the conditions for such availability set forth in the Eclipse + * Public License v. 2.0 are satisfied: GPL-2.0 with Classpath-exception-2.0 which + * is available at https://openjdk.java.net/legal/gplv2+ce.html. + * + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 or Apache-2.0 + */ +package org.eclipse.mojarra.test.issue5511; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.eclipse.mojarra.test.base.BaseIT; +import org.junit.jupiter.api.Test; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.FindBy; + +/** + * https://github.com/eclipse-ee4j/mojarra/issues/5511 + */ +class Issue5511IT extends BaseIT { + + @FindBy(id = "exampleFacesComponent") + private WebElement exampleFacesComponent; + + @Test + void testJarWithMetadataCompleteFalse() { + open("issue5511-using-jar-with-metadata-complete-false.xhtml"); + assertEquals("span", exampleFacesComponent.getTagName().toLowerCase(), "The ex:exampleFacesComponent SHOULD be processed because of metadata-complete=false on its JAR"); + assertEquals("Hello World", exampleFacesComponent.getText(), "Because it renders a span via HtmlOutputText, it should output its value as well."); + } + + @Test + void testJarWithMetadataCompleteTrue() { + open("issue5511-using-jar-with-metadata-complete-true.xhtml"); + assertEquals("ex:examplefacescomponent", exampleFacesComponent.getTagName().toLowerCase(), "The ex:exampleFacesComponent SHOULD NOT be processed because of metadata-complete=true on its JAR"); + assertEquals("", exampleFacesComponent.getText(), "Because it does not render to a valid HTML element, it should not output anything either."); + } +} diff --git a/test/pom.xml b/test/pom.xml index 04ded8897b..5e526f250d 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -33,11 +33,14 @@ base + example_jar_with_metadata_complete_false + example_jar_with_metadata_complete_true issue5460 issue5464 issue5488 issue5503 issue5507 + issue5511 From 720496565f3d4c8b7cb7338789377de8077c1a86 Mon Sep 17 00:00:00 2001 From: Bauke Scholtz Date: Thu, 24 Oct 2024 15:56:56 -0400 Subject: [PATCH 6/8] Improved assertion message --- .../java/org/eclipse/mojarra/test/issue5511/Issue5511IT.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/issue5511/src/test/java/org/eclipse/mojarra/test/issue5511/Issue5511IT.java b/test/issue5511/src/test/java/org/eclipse/mojarra/test/issue5511/Issue5511IT.java index 4d45aa2d52..debc5f4884 100644 --- a/test/issue5511/src/test/java/org/eclipse/mojarra/test/issue5511/Issue5511IT.java +++ b/test/issue5511/src/test/java/org/eclipse/mojarra/test/issue5511/Issue5511IT.java @@ -33,14 +33,14 @@ class Issue5511IT extends BaseIT { @Test void testJarWithMetadataCompleteFalse() { open("issue5511-using-jar-with-metadata-complete-false.xhtml"); - assertEquals("span", exampleFacesComponent.getTagName().toLowerCase(), "The ex:exampleFacesComponent SHOULD be processed because of metadata-complete=false on its JAR"); + assertEquals("span", exampleFacesComponent.getTagName().toLowerCase(), "The @FacesComponent annotation SHOULD be processed because of metadata-complete=false on its JAR"); assertEquals("Hello World", exampleFacesComponent.getText(), "Because it renders a span via HtmlOutputText, it should output its value as well."); } @Test void testJarWithMetadataCompleteTrue() { open("issue5511-using-jar-with-metadata-complete-true.xhtml"); - assertEquals("ex:examplefacescomponent", exampleFacesComponent.getTagName().toLowerCase(), "The ex:exampleFacesComponent SHOULD NOT be processed because of metadata-complete=true on its JAR"); + assertEquals("ex:examplefacescomponent", exampleFacesComponent.getTagName().toLowerCase(), "The @FacesComponent annotation SHOULD NOT be processed because of metadata-complete=true on its JAR"); assertEquals("", exampleFacesComponent.getText(), "Because it does not render to a valid HTML element, it should not output anything either."); } } From 8f036a562926dcb2b221f618a21a12cfb29cf566 Mon Sep 17 00:00:00 2001 From: Bauke Scholtz Date: Thu, 24 Oct 2024 16:02:18 -0400 Subject: [PATCH 7/8] Improved example jars --- test/example_jar_with_metadata_complete_false/pom.xml | 1 + test/example_jar_with_metadata_complete_true/pom.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/test/example_jar_with_metadata_complete_false/pom.xml b/test/example_jar_with_metadata_complete_false/pom.xml index e9dd17a368..56cff34403 100644 --- a/test/example_jar_with_metadata_complete_false/pom.xml +++ b/test/example_jar_with_metadata_complete_false/pom.xml @@ -35,6 +35,7 @@ org.glassfish jakarta.faces ${project.version} + provided diff --git a/test/example_jar_with_metadata_complete_true/pom.xml b/test/example_jar_with_metadata_complete_true/pom.xml index 9b6596aabc..672f8474bf 100644 --- a/test/example_jar_with_metadata_complete_true/pom.xml +++ b/test/example_jar_with_metadata_complete_true/pom.xml @@ -35,6 +35,7 @@ org.glassfish jakarta.faces ${project.version} + provided From 1e710f5b84baaa15e809b2ccbbc9fccc56460366 Mon Sep 17 00:00:00 2001 From: Bauke Scholtz Date: Sat, 26 Oct 2024 09:47:17 -0400 Subject: [PATCH 8/8] Remove copypaste leftovers --- test/issue5507/src/main/webapp/WEB-INF/web.xml | 2 -- test/issue5511/src/main/webapp/WEB-INF/web.xml | 2 -- 2 files changed, 4 deletions(-) diff --git a/test/issue5507/src/main/webapp/WEB-INF/web.xml b/test/issue5507/src/main/webapp/WEB-INF/web.xml index 31ee2d0dbe..64e14f6f40 100644 --- a/test/issue5507/src/main/webapp/WEB-INF/web.xml +++ b/test/issue5507/src/main/webapp/WEB-INF/web.xml @@ -30,7 +30,5 @@ facesServlet *.xhtml - *.jsf - /faces/* diff --git a/test/issue5511/src/main/webapp/WEB-INF/web.xml b/test/issue5511/src/main/webapp/WEB-INF/web.xml index 31ee2d0dbe..64e14f6f40 100644 --- a/test/issue5511/src/main/webapp/WEB-INF/web.xml +++ b/test/issue5511/src/main/webapp/WEB-INF/web.xml @@ -30,7 +30,5 @@ facesServlet *.xhtml - *.jsf - /faces/*