chore: bump project to 16.0 (#475)

Also updates to Vaadin 25.0 and JakartaEE 11

Author: mcollovati

README.md

@@ -7,6 +7,7 @@ This is the official CDI integration for [Vaadin Flow](https://github.com/vaadin
 
 This branch is compatible with upcoming Vaadin platform versions. See other branches for other Vaadin versions:
 
+* 16.0 for Vaadin 25.0
 * 15.2 for Vaadin 24.8
 * 15.1 for Vaadin 24.4
 * 15.0 for Vaadin 24
@@ -18,14 +19,14 @@ This branch is compatible with upcoming Vaadin platform versions. See other bran
 * 2.0 for Vaadin Framework 8.0...8.1 versions
 * 1.0 for Vaadin Framework 7 versions
 
-## Using with Vaadin 10
+## Using with Vaadin
 
-To use CDI with Vaadin 10, you need to add the following dependency to your pom.xml:
+To use CDI with Vaadin, you need to add the following dependency to your pom.xml:
 ```xml
 <dependency>
   <groupdId>com.vaadin</groupId>
   <artifactId>vaadin-cdi</artifactId>
-  <version>15.1.0</version> <!-- Or the LATEST version -->
+  <version>15.2.0</version> <!-- Or the LATEST version -->
 </dependency>
 ```
 
@@ -56,14 +57,10 @@ Execute `mvn -pl vaadin-cdi-itest -Ptomee verify` in the root directory to run i
 
 Test can be executed against the following containers, activating the specific profile:
 
-* Wildfly Jakarta EE 9: `-Pwidfly`
-* Wildfly Jakarta EE 10: `-Pwidfly,jakartaee-10`
-* OpenLiberty Jakarta EE 9: `-Pliberty`
-* OpenLiberty Jakarta EE 10: `-Pliberty,jakartaee-10`
+* Wildfly Jakarta EE 10: `-Pwidfly`
+* OpenLiberty Jakarta EE 10: `-Pliberty`
 * Payara Jakarta EE 10: `-Ppayara`
-  (Payara does not support Jakarta EE 9)
-* TomEE Jakarta EE 9: `-Ptomee`
-  (TomEE does not yet support Jakarta EE 10)
+* TomEE Jakarta EE 10: `-Ptomee`
 
 ## Issue tracking
 

pom.xml

@@ -10,7 +10,7 @@
     </parent>
 
     <artifactId>vaadin-cdi-parent</artifactId>
-    <version>15.2-SNAPSHOT</version>
+    <version>16.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>vaadin-cdi-parent</name>
@@ -46,20 +46,20 @@
         <maven.javadoc.version>3.11.2</maven.javadoc.version>
         <driver.binary.downloader.maven.plugin.version>1.0.18</driver.binary.downloader.maven.plugin.version>
 
-        <vaadin.flow.version>24.8-SNAPSHOT</vaadin.flow.version>
+        <vaadin.flow.version>25.0-SNAPSHOT</vaadin.flow.version>
         <slf4j.version>2.0.17</slf4j.version>
-        <weld.version>5.1.5.Final</weld.version>
-        <arquillian.version>1.9.4.Final</arquillian.version>
+        <weld.version>6.0.3.Final</weld.version>
+        <arquillian.version>1.9.5.Final</arquillian.version>
         <shrinkwrap.resolver.version>3.3.4</shrinkwrap.resolver.version>
         <shrinkwrap.descriptors.version>2.0.0</shrinkwrap.descriptors.version>
-        <jakarta.enterprise.concurrent.api.version>3.0.4</jakarta.enterprise.concurrent.api.version>
-        <jakarta.servlet.api.version>6.0.0</jakarta.servlet.api.version>
-        <jakarta.enterprise.cdi.api.version>4.0.1</jakarta.enterprise.cdi.api.version>
-        <jakarta.annotation.api.version>2.1.1</jakarta.annotation.api.version>
+        <jakarta.enterprise.concurrent.api.version>3.1.1</jakarta.enterprise.concurrent.api.version>
+        <jakarta.servlet.api.version>6.1.0</jakarta.servlet.api.version>
+        <jakarta.enterprise.cdi.api.version>4.1.0</jakarta.enterprise.cdi.api.version>
+        <jakarta.annotation.api.version>3.0.0</jakarta.annotation.api.version>
         <junit.version>4.13.2</junit.version>
-        <junit5.version>5.9.1</junit5.version>
-        <mockito.version>5.17.0</mockito.version>
-        <weld.junit.version>4.0.0.Final</weld.junit.version>
+        <junit5.version>5.12.2</junit5.version>
+        <mockito.version>5.18.0</mockito.version>
+        <weld.junit.version>5.0.1.Final</weld.junit.version>
 
     </properties>
 

vaadin-cdi-itest/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.vaadin</groupId>
         <artifactId>vaadin-cdi-parent</artifactId>
-        <version>15.2-SNAPSHOT</version>
+        <version>16.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -15,11 +15,12 @@
         <maven.deploy.skip>true</maven.deploy.skip>
         <surefire.groups></surefire.groups>
         <surefire.excludedGroups>com.vaadin.cdi.itest.SlowTests</surefire.excludedGroups>
-        <apache-tomee.version>10.0.1</apache-tomee.version>
-        <wildfly.version>30.0.0.Final</wildfly.version>
-        <openliberty.version>23.0.0.10</openliberty.version>
+        <apache-tomee.version>10.1.0</apache-tomee.version>
+        <wildfly.version>36.0.1.Final</wildfly.version>
+        <openliberty.version>25.0.0.6</openliberty.version>
         <openliberty.template>jakartaee10</openliberty.template>
         <openliberty.runtimeArtifactGroupId>io.openliberty</openliberty.runtimeArtifactGroupId>
+        <maven-dependency-plugin.version>3.8.1</maven-dependency-plugin.version>
     </properties>
 
     <pluginRepositories>
@@ -128,6 +129,7 @@
                 -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-help-plugin</artifactId>
+                <version>3.5.1</version>
                 <configuration>
                     <output>${project.build.directory}/effective-pom.xml</output>
                 </configuration>
@@ -197,6 +199,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-dependency-plugin</artifactId>
+                        <version>${maven-dependency-plugin.version}</version>
                         <executions>
                             <execution>
                                 <id>unpack</id>
@@ -256,6 +259,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-dependency-plugin</artifactId>
+                        <version>${maven-dependency-plugin.version}</version>
                         <executions>
                             <execution>
                                 <id>unpack</id>
@@ -268,7 +272,7 @@
                                         <artifactItem>
                                             <groupId>fish.payara.distributions</groupId>
                                             <artifactId>payara</artifactId>
-                                            <version>6.2023.10</version>
+                                            <version>6.2025.6</version>
                                             <type>zip</type>
                                             <overWrite>false</overWrite>
                                             <outputDirectory>target</outputDirectory>
@@ -312,7 +316,7 @@
                     <plugin>
                         <groupId>io.openliberty.tools</groupId>
                         <artifactId>liberty-maven-plugin</artifactId>
-                        <version>3.11.3</version>
+                        <version>3.11.4</version>
                         <executions>
                             <execution>
                                 <id>create-server</id>

vaadin-cdi-itest/src/main/java/com/vaadin/cdi/itest/invaliddeployment/NormalScopedLabel.java

@@ -17,8 +17,8 @@
 package com.vaadin.cdi.itest.invaliddeployment;
 
 import com.vaadin.cdi.annotation.NormalUIScoped;
-import com.vaadin.flow.component.html.Label;
+import com.vaadin.flow.component.html.NativeLabel;
 
 @NormalUIScoped
-public class NormalScopedLabel extends Label {
+public class NormalScopedLabel extends NativeLabel {
 }

vaadin-cdi-itest/src/main/java/com/vaadin/cdi/itest/push/PushComponent.java

@@ -34,7 +34,7 @@
 import com.vaadin.cdi.util.ContextUtils;
 import com.vaadin.flow.component.UI;
 import com.vaadin.flow.component.html.Div;
-import com.vaadin.flow.component.html.Label;
+import com.vaadin.flow.component.html.NativeLabel;
 import com.vaadin.flow.component.html.NativeButton;
 
 @CdiComponent
@@ -85,9 +85,9 @@ private void print() {
     }
 
     private void printContextIsActive(Class<? extends Annotation> scope) {
-        Label label = new Label(ContextUtils.isContextActive(scope) + "");
+        NativeLabel label = new NativeLabel(ContextUtils.isContextActive(scope) + "");
         label.setId(scope.getName());
-        add(new Div(new Label(scope.getSimpleName() + ": "), label));
+        add(new Div(new NativeLabel(scope.getSimpleName() + ": "), label));
     }
 
     @PostConstruct

vaadin-cdi-itest/src/main/java/com/vaadin/cdi/itest/routecontext/DetailApartView.java

@@ -23,7 +23,7 @@
 import com.vaadin.cdi.annotation.RouteScopeOwner;
 import com.vaadin.cdi.annotation.RouteScoped;
 import com.vaadin.flow.component.html.Div;
-import com.vaadin.flow.component.html.Label;
+import com.vaadin.flow.component.html.NativeLabel;
 import com.vaadin.flow.router.AfterNavigationEvent;
 import com.vaadin.flow.router.AfterNavigationObserver;
 import com.vaadin.flow.router.Route;
@@ -40,11 +40,11 @@ public class DetailApartView extends AbstractCountedView implements AfterNavigat
     @Inject
     @RouteScopeOwner(DetailApartView.class)
     private ApartBean apartBean;
-    private Label apartLabel;
+    private NativeLabel apartLabel;
 
     @PostConstruct
     private void init() {
-        apartLabel = new Label();
+        apartLabel = new NativeLabel();
         apartLabel.setId(BEAN_LABEL);
         apartBean.setData("APART");
         add(

vaadin-cdi-itest/src/main/java/com/vaadin/cdi/itest/routecontext/DetailAssignedView.java

@@ -23,7 +23,7 @@
 import com.vaadin.cdi.annotation.RouteScopeOwner;
 import com.vaadin.cdi.annotation.RouteScoped;
 import com.vaadin.flow.component.html.Div;
-import com.vaadin.flow.component.html.Label;
+import com.vaadin.flow.component.html.NativeLabel;
 import com.vaadin.flow.router.AfterNavigationEvent;
 import com.vaadin.flow.router.AfterNavigationObserver;
 import com.vaadin.flow.router.Route;
@@ -41,11 +41,11 @@ public class DetailAssignedView extends AbstractCountedView implements AfterNavi
     @Inject
     @RouteScopeOwner(MasterView.class)
     private AssignedBean assignedBean;
-    private Label assignedLabel;
+    private NativeLabel assignedLabel;
 
     @PostConstruct
     private void init() {
-        assignedLabel = new Label();
+        assignedLabel = new NativeLabel();
         assignedLabel.setId(BEAN_LABEL);
         assignedBean.setData("ASSIGNED");
         add(

vaadin-cdi-itest/src/main/java/com/vaadin/cdi/itest/routecontext/EventObserverLayout.java

@@ -23,7 +23,7 @@
 import com.vaadin.cdi.annotation.CdiComponent;
 import com.vaadin.cdi.annotation.RouteScoped;
 import com.vaadin.flow.component.html.Div;
-import com.vaadin.flow.component.html.Label;
+import com.vaadin.flow.component.html.NativeLabel;
 import com.vaadin.flow.component.html.Span;
 import com.vaadin.flow.router.RouterLayout;
 
@@ -32,11 +32,11 @@
 public class EventObserverLayout extends Div implements RouterLayout {
 
     public static final String EVENTS_COUNTER_LABEL = "eventsCounter";
-    private final Label receivedEvents;
+    private final NativeLabel receivedEvents;
     private int counter = 0;
 
     public EventObserverLayout() {
-        receivedEvents = new Label();
+        receivedEvents = new NativeLabel();
         receivedEvents.setId(EVENTS_COUNTER_LABEL);
         add(receivedEvents);
     }

vaadin-cdi-itest/src/main/java/com/vaadin/cdi/itest/routecontext/EventView.java

@@ -26,7 +26,7 @@
 import com.vaadin.cdi.annotation.RouteScopeOwner;
 import com.vaadin.cdi.annotation.RouteScoped;
 import com.vaadin.flow.component.html.Div;
-import com.vaadin.flow.component.html.Label;
+import com.vaadin.flow.component.html.NativeLabel;
 import com.vaadin.flow.component.html.NativeButton;
 import com.vaadin.flow.router.Route;
 
@@ -41,7 +41,7 @@ public class EventView extends Div {
     @RouteScoped
     @RouteScopeOwner(EventView.class)
     @CdiComponent
-    public static class ObserverLabel extends Label {
+    public static class ObserverLabel extends NativeLabel {
         private void onPrintEvent(@Observes PrintEvent printEvent) {
             setText(printEvent.getMessage());
         }
@@ -61,7 +61,7 @@ public String getMessage() {
 
     @Inject
     @RouteScopeOwner(EventView.class)
-    private Label label;
+    private NativeLabel label;
     @Inject
     private Event<PrintEvent> printEventTrigger;
 

vaadin-cdi-itest/src/main/java/com/vaadin/cdi/itest/routecontext/MainLayout.java

@@ -17,7 +17,7 @@
 
 import com.vaadin.flow.component.AttachEvent;
 import com.vaadin.flow.component.html.Div;
-import com.vaadin.flow.component.html.Label;
+import com.vaadin.flow.component.html.NativeLabel;
 import com.vaadin.flow.router.RouterLayout;
 import com.vaadin.flow.router.RouterLink;
 
@@ -30,7 +30,7 @@ public class MainLayout extends Div implements RouterLayout {
     public static final String PARENT_NO_OWNER = "parent-no-owner";
     public static final String CHILD_NO_OWNER = "child-no-owner";
 
-    private Label uiIdLabel;
+    private NativeLabel uiIdLabel;
 
     public MainLayout() {
         add(new RouterLink(PRESERVE, PreserveOnRefreshView.class),
@@ -45,7 +45,7 @@ protected void onAttach(AttachEvent attachEvent) {
         if (uiIdLabel != null) {
             remove(uiIdLabel);
         }
-        uiIdLabel = new Label(attachEvent.getUI().getUIId() + "");
+        uiIdLabel = new NativeLabel(attachEvent.getUI().getUIId() + "");
         uiIdLabel.setId(UIID);
         add(uiIdLabel);
     }