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-6519 Test Improvement #6435

Merged
merged 1 commit into from
Oct 9, 2023
Merged

FISH-6519 Test Improvement #6435

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
3 changes: 1 addition & 2 deletions ...ces/src/test/java/fish/payara/samples/usebundledjsf/primefaces/DontUseBundledJsfTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,7 @@ public static WebArchive createDeployment() {
// Don't add payara-web.xml so that useBundledJsf and class loader delegation are not configured
// .addAsWebInfResource(new File("src/main/webapp/WEB-INF", "payara-web.xml"))
.addAsLibraries(Libraries.resolveMavenCoordinatesToFiles("org.glassfish:jakarta.faces:" + JSF_VERSION))
.addAsLibraries(Libraries.resolveMavenCoordinatesToFiles("org.primefaces:primefaces:13.0.1-jakarta"))
;
.addAsLibraries(Libraries.resolveMavenCoordinatesToFiles("org.primefaces:primefaces:jar:jakarta:13.0.1"));
}

@Test
Expand Down
6 changes: 2 additions & 4 deletions ...src/test/java/fish/payara/samples/usebundledjsf/primefaces/ParallelUseBundledJsfTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,7 @@ public static WebArchive createDontDeployment() {
// Don't add payara-web.xml so that useBundledJsf and class loader delegation are not configured
// .addAsWebInfResource(new File("src/main/webapp/WEB-INF", "payara-web.xml"))
.addAsLibraries(Libraries.resolveMavenCoordinatesToFiles("org.glassfish:jakarta.faces:" + JSF_VERSION))
.addAsLibraries(Libraries.resolveMavenCoordinatesToFiles("org.primefaces:primefaces:13.0.1-jakarta"))
;
.addAsLibraries(Libraries.resolveMavenCoordinatesToFiles("org.primefaces:primefaces:jar:jakarta:13.0.1"));
}

@Deployment(name = "usebundledjsfprimefaces")
Expand All @@ -88,8 +87,7 @@ public static WebArchive createUseDeployment() {
.addAsWebInfResource(new File("src/main/webapp/WEB-INF", "web.xml"))
.addAsWebInfResource(new File("src/main/webapp/WEB-INF", "payara-web.xml"))
.addAsLibraries(Libraries.resolveMavenCoordinatesToFiles("org.glassfish:jakarta.faces:" + JSF_VERSION))
.addAsLibraries(Libraries.resolveMavenCoordinatesToFiles("org.primefaces:primefaces:13.0.1-jakarta"))
;
.addAsLibraries(Libraries.resolveMavenCoordinatesToFiles("org.primefaces:primefaces:jar:jakarta:13.0.1"));
}


Expand Down
3 changes: 1 addition & 2 deletions ...aces/src/test/java/fish/payara/samples/usebundledjsf/primefaces/UseBundledJsfEarTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,7 @@ public static EnterpriseArchive createDeployment() {
.addAsWebInfResource(new File("src/main/webapp/WEB-INF", "web.xml"))
.addAsWebInfResource(new File("src/main/webapp/WEB-INF", "payara-web.xml"))
.addAsLibraries(Libraries.resolveMavenCoordinatesToFiles("org.glassfish:jakarta.faces:" + JSF_VERSION))
.addAsLibraries(Libraries.resolveMavenCoordinatesToFiles("org.primefaces:primefaces:13.0.1-jakarta"))
);
.addAsLibraries(Libraries.resolveMavenCoordinatesToFiles("org.primefaces:primefaces:jar:jakarta:13.0.1")));
}

@Test
Expand Down
3 changes: 1 addition & 2 deletions ...mefaces/src/test/java/fish/payara/samples/usebundledjsf/primefaces/UseBundledJsfTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,7 @@ public static WebArchive createDeployment() {
.addAsWebInfResource(new File("src/main/webapp/WEB-INF", "web.xml"))
.addAsWebInfResource(new File("src/main/webapp/WEB-INF", "payara-web.xml"))
.addAsLibraries(Libraries.resolveMavenCoordinatesToFiles("org.glassfish:jakarta.faces:" + JSF_VERSION))
.addAsLibraries(Libraries.resolveMavenCoordinatesToFiles("org.primefaces:primefaces:13.0.1-jakarta"))
;
.addAsLibraries(Libraries.resolveMavenCoordinatesToFiles("org.primefaces:primefaces:jar:jakarta:13.0.1"));
}

@Test
Expand Down