Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into fb_optional_bean_it
Browse files Browse the repository at this point in the history
  • Loading branch information
@rzo1
rzo1 committed Jan 19, 2024
2 parents 5c41ae8 + c766615 commit 3788312
Show file tree
Hide file tree
Showing 41 changed files with 1,837 additions and 229 deletions.
11 changes: 5 additions & 6 deletions arquillian/arquillian-tomee-moviefun-example/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
<name>TomEE :: Arquillian Adaptors Parent :: Sample :: Moviefun</name>

<properties>
<version.selenium>2.40.0</version.selenium>
<version.drone>1.3.0.Final</version.drone>
<version.selenium>2.53.1</version.selenium>
<version.drone>1.3.1.Final</version.drone>
</properties>

<build>
Expand Down Expand Up @@ -81,12 +81,12 @@
<artifactItem>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<version>4.0.1</version>
<version>${version.myfaces}</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.tomee</groupId>
<artifactId>taglibs-shade</artifactId>
<version>10.0.0-M1-SNAPSHOT</version>
<version>${project.version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>
Expand Down Expand Up @@ -121,7 +121,6 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>taglibs-shade</artifactId>
<version>10.0.0-M1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down Expand Up @@ -258,7 +257,7 @@
<dependency>
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
<version>2.12</version>
<version>2.70.0</version>
<type>jar</type>
<scope>test</scope>
</dependency>
Expand Down
20 changes: 3 additions & 17 deletions ...illian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesHtmlUnitTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,23 +76,9 @@ private static File createWebApp() throws IOException {
}

@Test
@Ignore("This test fails due to a change in OWB-4 to pass the TCK related to dotted EL names: " +
"https://github.com/apache/openwebbeans/commit/4e4962a69064585d146c71bb387a8395455e88b5" +
"Until this is fixed, we disable this test. Related stacktrace is added below.")
/*
jakarta.el.PropertyNotFoundException: The class 'org.apache.webbeans.el22.WrappedValueExpressionNode' does not have the property 'title'.
at jakarta.el.BeanELResolver.getBeanProperty(BeanELResolver.java:626)
at jakarta.el.BeanELResolver.getValue(BeanELResolver.java:338)
at org.apache.jasper.el.JasperELResolver.getValue(JasperELResolver.java:129)
at org.apache.el.parser.AstValue.getValue(AstValue.java:169)
at org.apache.el.ValueExpressionImpl.getValue(ValueExpressionImpl.java:190)
at org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate(PageContextImpl.java:701)
at org.apache.jsp.WEB_002dINF.setup_jsp._jspx_meth_c_005fout_005f0(setup_jsp.java:247)
at org.apache.jsp.WEB_002dINF.setup_jsp._jspx_meth_c_005fforEach_005f0(setup_jsp.java:198)
at org.apache.jsp.WEB_002dINF.setup_jsp._jspService(setup_jsp.java:150)
*/
public void testShouldMakeSureWebappIsWorking() throws Exception {
WebClient webClient = new WebClient();
webClient.getOptions().setThrowExceptionOnScriptError(false);
HtmlPage page = webClient.getPage("http://localhost:9999/moviefun/setup");

assertMoviesPresent(page);
Expand All @@ -105,11 +91,11 @@ public void testShouldMakeSureWebappIsWorking() throws Exception {
}

assertMoviesPresent(page);
webClient.closeAllWindows();
webClient.close();
}

private void assertMoviesPresent(HtmlPage page) {
String pageAsText = page.asText();
String pageAsText = page.asNormalizedText();
assertTrue(pageAsText.contains("Wedding Crashers"));
assertTrue(pageAsText.contains("Starsky & Hutch"));
assertTrue(pageAsText.contains("Shanghai Knights"));
Expand Down
2 changes: 1 addition & 1 deletion boms/tomee-microprofile-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<version>4.0.1</version>
<version>4.0.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand Down
20 changes: 10 additions & 10 deletions boms/tomee-microprofile/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -829,7 +829,7 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<version>4.0.1</version>
<version>4.0.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand All @@ -840,7 +840,7 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
<version>4.0.1</version>
<version>4.0.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand Down Expand Up @@ -884,7 +884,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-ee-common</artifactId>
<version>4.0.0</version>
<version>4.0.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand All @@ -895,7 +895,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-ee</artifactId>
<version>4.0.0</version>
<version>4.0.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand All @@ -906,7 +906,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-ejb</artifactId>
<version>4.0.0</version>
<version>4.0.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand All @@ -917,7 +917,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-el22</artifactId>
<version>4.0.0</version>
<version>4.0.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand All @@ -928,7 +928,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-impl</artifactId>
<version>4.0.0</version>
<version>4.0.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand All @@ -939,7 +939,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-jsf</artifactId>
<version>4.0.0</version>
<version>4.0.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand All @@ -950,7 +950,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-spi</artifactId>
<version>4.0.0</version>
<version>4.0.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand All @@ -961,7 +961,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-web</artifactId>
<version>4.0.0</version>
<version>4.0.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand Down
18 changes: 9 additions & 9 deletions boms/tomee-plume/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -972,7 +972,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-ee-common</artifactId>
<version>4.0.0</version>
<version>4.0.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand All @@ -983,7 +983,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-ee</artifactId>
<version>4.0.0</version>
<version>4.0.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand All @@ -994,7 +994,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-ejb</artifactId>
<version>4.0.0</version>
<version>4.0.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand All @@ -1005,7 +1005,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-el22</artifactId>
<version>4.0.0</version>
<version>4.0.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand All @@ -1016,7 +1016,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-impl</artifactId>
<version>4.0.0</version>
<version>4.0.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand All @@ -1027,7 +1027,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-jsf</artifactId>
<version>4.0.0</version>
<version>4.0.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand All @@ -1038,7 +1038,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-spi</artifactId>
<version>4.0.0</version>
<version>4.0.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand All @@ -1049,7 +1049,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-web</artifactId>
<version>4.0.0</version>
<version>4.0.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand Down Expand Up @@ -2105,7 +2105,7 @@
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>eclipselink</artifactId>
<version>3.0.3</version>
<version>3.0.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion boms/tomee-plus-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<version>4.0.1</version>
<version>4.0.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand Down
20 changes: 10 additions & 10 deletions boms/tomee-plus/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -939,7 +939,7 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<version>4.0.1</version>
<version>4.0.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand All @@ -950,7 +950,7 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
<version>4.0.1</version>
<version>4.0.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand Down Expand Up @@ -994,7 +994,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-ee-common</artifactId>
<version>4.0.0</version>
<version>4.0.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand All @@ -1005,7 +1005,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-ee</artifactId>
<version>4.0.0</version>
<version>4.0.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand All @@ -1016,7 +1016,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-ejb</artifactId>
<version>4.0.0</version>
<version>4.0.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand All @@ -1027,7 +1027,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-el22</artifactId>
<version>4.0.0</version>
<version>4.0.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand All @@ -1038,7 +1038,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-impl</artifactId>
<version>4.0.0</version>
<version>4.0.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand All @@ -1049,7 +1049,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-jsf</artifactId>
<version>4.0.0</version>
<version>4.0.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand All @@ -1060,7 +1060,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-spi</artifactId>
<version>4.0.0</version>
<version>4.0.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand All @@ -1071,7 +1071,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-web</artifactId>
<version>4.0.0</version>
<version>4.0.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion boms/tomee-webprofile-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<version>4.0.1</version>
<version>4.0.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand Down
Loading

0 comments on commit 3788312

Please sign in to comment.