Merge remote-tracking branch 'origin/main' into TOMEE-4160_CDI-TCK

# Conflicts: # tck/cdi-embedded/pom.xml # tck/cdi-signature-test/pom.xml # tck/cdi-tomee/pom.xml # tck/pom.xml
apache · Nov 21, 2023 · 60ee432 · 60ee432
2 parents 6d9506e + b76ed51
commit 60ee432
Show file tree

Hide file tree

Showing 608 changed files with 7,983 additions and 13,899 deletions.
diff --git a/.asf.yaml b/.asf.yaml
@@ -39,8 +39,27 @@ github:
     tomee-7.0.x: {}
     tomee-7.1.x: {}
     tomee-8.x: {}
+  custom_subjects:
+    new_pr: "[PR] {title} ({repository})"
+    close_pr: "Re: [PR] {title} ({repository})"
+    comment_pr: "Re: [PR] {title} ({repository})"
+    diffcomment: "Re: [PR] {title} ({repository})"
+    merge_pr: "Re: [PR] {title} ({repository})"
+    new_issue: "[I] {title} ({repository})"
+    comment_issue: "Re: [I] {title} ({repository})"
+    close_issue: "Re: [I] {title} ({repository})"
+    catchall: "[GH] {title} ({repository})"
+    new_discussion: "[D] {title} ({repository})"
+    edit_discussion: "Re: [D] {title} ({repository})"
+    close_discussion: "Re: [D] {title} ({repository})"
+    close_discussion_with_comment: "Re: [D] {title} ({repository})"
+    reopen_discussion: "Re: [D] {title} ({repository})"
+    new_comment_discussion: "Re: [D] {title} ({repository})"
+    edit_comment_discussion: "Re: [D] {title} ({repository})"
+    delete_comment_discussion: "Re: [D] {title} ({repository})"
   dependabot_alerts: false
   dependabot_updates: false
+
 notifications:
   commits:      [email protected]
   issues:       [email protected]

diff --git a/.github/workflows/main-pull-request-build.yml b/.github/workflows/main-pull-request-build.yml
@@ -21,13 +21,13 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ~/.m2
-        key: ${{ runner.os }}-main-m2-${{ hashFiles('**/pom.xml') }}
-        restore-keys: ${{ runner.os }}-main-m2
+        key: ${{ runner.os }}-main-pr-m2-${{ hashFiles('**/pom.xml') }}
+        restore-keys: ${{ runner.os }}-main-pr-m2
 
     - name: maven-settings-xml-action
       run: echo "<settings xmlns=\"http://maven.apache.org/SETTINGS/1.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd\"> <activeProfiles> <activeProfile>github</activeProfile> </activeProfiles> <profiles> <profile> <id>github</id> <repositories> <repository> <id>central-repo</id> <url>https://repo.maven.apache.org/maven2</url> <releases> <enabled>true</enabled> </releases> <snapshots> <enabled>false</enabled> </snapshots> </repository> </repositories> <pluginRepositories> <pluginRepository> <id>central-plugin-repository</id> <url>https://repo.maven.apache.org/maven2</url> <releases> <enabled>true</enabled> </releases> <snapshots> <enabled>false</enabled> </snapshots> </pluginRepository> </pluginRepositories> </profile> </profiles> <servers/> <mirrors/> <pluginGroups/> </settings>" > ~/.m2/settings.xml
 
     - name: Compile with Sanity checks
       run: mvn help:system -U -ntp --batch-mode --show-version --fail-at-end clean install -DfailIfNoTests=false -DskipTests -Pstyle,rat
       env:
-        MAVEN_OPTS: -Xmx2048m
+        MAVEN_OPTS: -Xmx2048m
diff --git a/.github/workflows/main-push-build.yml b/.github/workflows/main-push-build.yml
@@ -21,8 +21,8 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ~/.m2
-        key: ${{ runner.os }}-pr-main-m2-${{ hashFiles('**/pom.xml') }}
-        restore-keys: ${{ runner.os }}-pr-main-m2
+        key: ${{ runner.os }}-main-m2-${{ hashFiles('**/pom.xml') }}
+        restore-keys: ${{ runner.os }}-main-m2
 
     - name: maven-settings-xml-action
       run: echo "<settings xmlns=\"http://maven.apache.org/SETTINGS/1.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd\"> <activeProfiles> <activeProfile>github</activeProfile> </activeProfiles> <profiles> <profile> <id>github</id> <repositories> <repository> <id>central-repo</id> <url>https://repo.maven.apache.org/maven2</url> <releases> <enabled>true</enabled> </releases> <snapshots> <enabled>false</enabled> </snapshots> </repository> </repositories> <pluginRepositories> <pluginRepository> <id>central-plugin-repository</id> <url>https://repo.maven.apache.org/maven2</url> <releases> <enabled>true</enabled> </releases> <snapshots> <enabled>false</enabled> </snapshots> </pluginRepository> </pluginRepositories> </profile> </profiles> <servers/> <mirrors/> <pluginGroups/> </settings>" > ~/.m2/settings.xml
@@ -52,4 +52,4 @@ jobs:
           Found some uncommited changes (from BOM regeneration) after running build on TomEE main
         labels: |
           dependencies
-        assignees: cesarhernandezgt,dblevins,jeanouii,jgallimore,rzo1
+        assignees: cesarhernandezgt,dblevins,jeanouii,jgallimore,rzo1
diff --git a/.github/workflows/tomee-8.x-pull-request-build.yml b/.github/workflows/tomee-8.x-pull-request-build.yml
diff --git a/.github/workflows/tomee-8.x-push-build.yml b/.github/workflows/tomee-8.x-push-build.yml
diff --git a/README.adoc b/README.adoc
@@ -120,5 +120,3 @@ Releases] (*)
 === License
 
 link:LICENSE[Apache License 2.0]
-
-
diff --git a/arquillian/arquillian-common/pom.xml b/arquillian/arquillian-common/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>arquillian</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.0.0-SNAPSHOT</version>
+    <version>10.0.0-M1-SNAPSHOT</version>
   </parent>
 
   <artifactId>arquillian-common</artifactId>

diff --git a/arquillian/arquillian-openejb-embedded/pom.xml b/arquillian/arquillian-openejb-embedded/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>arquillian</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.0.0-SNAPSHOT</version>
+    <version>10.0.0-M1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/...mbedded/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBInjectionEnricher.java b/...mbedded/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBInjectionEnricher.java
@@ -61,7 +61,7 @@ public void enrich(final Object testInstance) {
                 try {
                     final BeanManager bm = appContext.getWebBeansContext().getBeanManagerImpl();
                     final AnnotatedType<?> at = bm.createAnnotatedType(clazz);
-                    bm.createInjectionTarget(at);
+                    bm.getInjectionTargetFactory(at);
                     final CreationalContext<Object> cc = bm.createCreationalContext(null);
                     OWBInjector.inject(bm, testInstance, cc);
                     cc.release();

diff --git a/arquillian/arquillian-openejb-transaction-provider/pom.xml b/arquillian/arquillian-openejb-transaction-provider/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>arquillian</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.0.0-SNAPSHOT</version>
+    <version>10.0.0-M1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/arquillian/arquillian-tck/pom.xml b/arquillian/arquillian-tck/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>arquillian</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.0.0-SNAPSHOT</version>
+    <version>10.0.0-M1-SNAPSHOT</version>
   </parent>
 
   <artifactId>arquillian-tck</artifactId>

diff --git a/arquillian/arquillian-tomee-common/pom.xml b/arquillian/arquillian-tomee-common/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>arquillian</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.0.0-SNAPSHOT</version>
+    <version>10.0.0-M1-SNAPSHOT</version>
   </parent>
   <artifactId>arquillian-tomee-common</artifactId>
   <packaging>jar</packaging>
@@ -54,7 +54,6 @@
     <dependency>
       <groupId>org.apache.openwebbeans</groupId>
       <artifactId>openwebbeans-impl</artifactId>
-      <classifier>jakarta</classifier>
       <scope>provided</scope>
     </dependency>
 
@@ -79,7 +78,7 @@
     <dependency>
       <groupId>org.apache.xbean</groupId>
       <artifactId>xbean-finder-shaded</artifactId>
-      <version>${xbeanVersion}</version>
+      <version>${version.xbean}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/arquillian/arquillian-tomee-embedded/pom.xml b/arquillian/arquillian-tomee-embedded/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>arquillian</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.0.0-SNAPSHOT</version>
+    <version>10.0.0-M1-SNAPSHOT</version>
   </parent>
   <artifactId>arquillian-tomee-embedded</artifactId>
   <packaging>jar</packaging>
@@ -83,7 +83,7 @@
     <dependency>
       <groupId>org.apache.myfaces.core</groupId>
       <artifactId>myfaces-api</artifactId>
-      <version>${myfaces.version}</version>
+      <version>${version.myfaces}</version>
     </dependency>
 
     <dependency>
@@ -95,7 +95,7 @@
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>${commons-io.version}</version>
+      <version>${version.commons-io}</version>
       <scope>test</scope>
     </dependency>
 

diff --git a/arquillian/arquillian-tomee-moviefun-example/pom.xml b/arquillian/arquillian-tomee-moviefun-example/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.apache.tomee</groupId>
     <artifactId>arquillian</artifactId>
-    <version>10.0.0-SNAPSHOT</version>
+    <version>10.0.0-M1-SNAPSHOT</version>
   </parent>
   <artifactId>arquillian-tomee-moviefun-example</artifactId>
   <packaging>war</packaging>
@@ -66,12 +66,12 @@
                 <artifactItem>
                   <groupId>commons-logging</groupId>
                   <artifactId>commons-logging</artifactId>
-                  <version>${commons-logging.version}</version>
+                  <version>${version.commons-logging}</version>
                 </artifactItem>
                 <artifactItem>
                   <groupId>jakarta.servlet.jsp.jstl</groupId>
                   <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
-                  <version>2.0.0</version>
+                  <version>3.0.0</version>
                 </artifactItem>
                 <artifactItem>
                   <groupId>log4j</groupId>
@@ -81,12 +81,12 @@
                 <artifactItem>
                   <groupId>org.apache.myfaces.core</groupId>
                   <artifactId>myfaces-api</artifactId>
-                  <version>3.0.1</version>
+                  <version>4.0.1</version>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.tomee</groupId>
                   <artifactId>taglibs-shade</artifactId>
-                  <version>10.0.0-SNAPSHOT</version>
+                  <version>10.0.0-M1-SNAPSHOT</version>
                 </artifactItem>
               </artifactItems>
               <outputDirectory>
@@ -111,17 +111,17 @@
     <dependency>
       <groupId>org.apache.myfaces.core</groupId>
       <artifactId>myfaces-api</artifactId>
-      <version>${myfaces.version}</version>
+      <version>${version.myfaces}</version>
     </dependency>
     <dependency>
       <groupId>jakarta.servlet.jsp.jstl</groupId>
       <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
-      <version>2.0.0</version>
+      <version>3.0.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>taglibs-shade</artifactId>
-      <version>10.0.0-SNAPSHOT</version>
+      <version>10.0.0-M1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

diff --git a/...rquillian-tomee-moviefun-example/src/main/java/org/superbiz/moviefun/MovieController.java b/...rquillian-tomee-moviefun-example/src/main/java/org/superbiz/moviefun/MovieController.java
@@ -20,8 +20,8 @@
 import org.superbiz.moviefun.util.PaginationHelper;
 
 import jakarta.ejb.EJB;
-import jakarta.faces.bean.ManagedBean;
-import jakarta.faces.bean.SessionScoped;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Named;
 import jakarta.faces.component.UIComponent;
 import jakarta.faces.context.FacesContext;
 import jakarta.faces.convert.Converter;
@@ -32,7 +32,7 @@
 import java.io.Serializable;
 import java.util.ResourceBundle;
 
-@ManagedBean(name = "movieController")
+@Named("movieController")
 @SessionScoped
 public class MovieController implements Serializable {
 

diff --git a/...illian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesHtmlUnitTest.java b/...illian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesHtmlUnitTest.java
@@ -22,6 +22,7 @@
 import org.apache.tomee.embedded.EmbeddedTomEEContainer;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import jakarta.ejb.embeddable.EJBContainer;
@@ -75,6 +76,21 @@ 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();
         HtmlPage page = webClient.getPage("http://localhost:9999/moviefun/setup");
Original file line number	Diff line number	Diff line change
Expand Up		@@ -120,5 +120,3 @@ Releases] (*)
		=== License

		link:LICENSE[Apache License 2.0]