vaadin · rodolforfq · Jun 23, 2026 · Jun 14, 2026 · Jun 22, 2026 · Jun 22, 2026
diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml
@@ -0,0 +1,65 @@
+name: Validation
+
+on:
+  pull_request:
+    paths-ignore:
+      - '**/*.md'
+      - '.travis*'
+      - '.gitignore'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  validate:
+    name: Compile & static checks
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    steps:
+      - uses: actions/checkout@v5
+      - uses: actions/setup-java@v5
+        with:
+          distribution: temurin
+          java-version: '21'
+          cache: maven
+      - name: Compile
+        run: mvn -B -ntp -fae compile test-compile
+
+  tests:
+    name: Tests (${{ matrix.profile }})
+    needs: validate
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    strategy:
+      fail-fast: false
+      matrix:
+        profile: [wildfly]
+    steps:
+      - uses: actions/checkout@v5
+      - uses: actions/setup-java@v5
+        with:
+          distribution: temurin
+          java-version: '21'
+          cache: maven
+
+      - name: Set vaadin proKey
+        env:
+          TB_LICENSE: ${{secrets.TB_LICENSE}}
+        run: |
+          mkdir -p ~/.vaadin/
+          echo '{"username":"'`echo $TB_LICENSE | cut -d / -f1`'","proKey":"'`echo $TB_LICENSE | cut -d / -f2`'"}' > ~/.vaadin/proKey
+
+      - name: Run tests (${{ matrix.profile }})
+        run: mvn -B -ntp verify -P${{ matrix.profile }}
+      - name: Upload surefire reports
+        if: failure()
+        uses: actions/upload-artifact@v6
+        with:
+          name: surefire-reports-${{ matrix.profile }}
+          path: vaadin-cdi/target/surefire-reports/
+          if-no-files-found: ignore
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,10 @@ nbactions.xml
 .iml
 *.iml
 *.log
+*.class
+/build
+# Package Files #
+*.jar
+*.war
+*.ear
+target/
diff --git a/.project b/.project
@@ -14,4 +14,15 @@
 	<natures>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1781474857981</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/.travis-settings.xml b/.travis-settings.xml
diff --git a/.travis.after_success.sh b/.travis.after_success.sh
diff --git a/.travis.yml b/.travis.yml
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "java.configuration.updateBuildConfiguration": "interactive"
+}
diff --git a/README.md b/README.md
@@ -1,41 +1,71 @@
-Vaadin CDI
-======================
+[![Published on Vaadin  Directory](https://img.shields.io/badge/Vaadin%20Directory-published-00b4f0.svg)](https://vaadin.com/directory/component/vaadin-cdi)
+[![Stars on Vaadin Directory](https://img.shields.io/vaadin-directory/star/vaadin-cdi.svg)](https://vaadin.com/directory/component/vaadin-cdi)
 
-Vaadin CDI is the official CDI integration for [Vaadin Framework](https://github.com/vaadin/framework).
-This branch is Vaadin Framework 7 compatible. See other branches for other framework versions:
-* master for Vaadin 10
+# Vaadin CDI
+
+This is the official CDI integration for [Vaadin Flow](https://github.com/vaadin/flow).
+
+This branch is compatible with upcoming Vaadin platform versions. See other branches for other Vaadin versions:
+
+* 16.1 for Vaadin 25.2
+* 16.0 for Vaadin 25.0 and 25.1
+* 15.2 for Vaadin 24.8
+* 15.1 for Vaadin 24.4
+* 15.0 for Vaadin 24
+* 14.1 for Vaadin 23.3
+* 13.1 for Vaadin 22.1
+* 11.3 for Vaadin 14.10
+* 10.0 for Vaadin 10
+* 4.0 for Vaadin 8 Extended Maintenance with Jakarta
 * 3.0 for Vaadin 8.2+
 * 2.0 for Vaadin Framework 8.0...8.1 versions
+* 1.9 for Vaadin Framework 7 Extended Maintenance with Jakarta
 * 1.0 for Vaadin Framework 7 versions
 
-Download release
-----
+## Using with Vaadin
+
+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.2.0</version> <!-- Or the LATEST version -->
+</dependency>
+```
+
+Since the current release version is a prerelease, you need to also include the prerelease Maven repository:
+
+```xml
+<repositories>
+  <repository>
+    <id>Vaadin prereleases</id>
+    <url>https://maven.vaadin.com/vaadin-prereleases</url>
+  </repository>
+</repositories>
+```
+
+## Getting started
+
+**NOTE: This is still WIP.** The easiest way for starting a project is to go to [vaadin.com/start](https://vaadin.com/start) and select the _Project Base with CDI_ to get an empty project with everything setup ready for you.
+
+**NOTE: This is still WIP.** There is a tutorial also available in https://github.com/vaadin/flow-cdi-tutorial that helps you get started with Vaadin 10 and CDI.
+
+## Building the project
 
-Official releases of this add-on are available at Vaadin Directory. For Maven instructions, download and reviews, go to https://vaadin.com/addon/vaadin-cdi.
+Execute `mvn clean install -DskipTests` in the root directory to build vaadin-cdi.
 
-Building the project
-----
-Execute `mvn clean install` in the root directory to build vaadin-cdi.
+## Run integration tests
 
-Issue tracking
-----
-If you find an issue, please report it in the GitHub issue tracker: https://github.com/vaadin/cdi/issues
+Execute `mvn -pl vaadin-cdi -Pwildfly verify` in the root directory to run integration tests.
 
-Contributions
-----
-Contributions to the project can be done through pull requests in GitHub.
+Test can be executed against the following containers, activating the specific profile:
 
+* Wildfly Jakarta EE 10: `-Pwidfly`
 
-Copyright 2012-2017 Vaadin Ltd.
+## Issue tracking
 
-Licensed under the Apache License, Version 2.0 (the "License"); you may not
-use this file except in compliance with the License. You may obtain a copy of
-the License at
+If you find an issue, please report it in the [GitHub issue tracker](https://github.com/vaadin/cdi/issues).
 
-http://www.apache.org/licenses/LICENSE-2.0
+## Contributions
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-License for the specific language governing permissions and limitations under
-the License.
+The contributing docs can be found here: https://vaadin.com/docs-beta/latest/guide/contributing/overview/
diff --git a/assembly/MANIFEST.MF b/assembly/MANIFEST.MF
@@ -0,0 +1,7 @@
+Manifest-Version: 1.0
+Vaadin-Package-Version: 1
+Vaadin-Addon: ${Vaadin-Addon}
+Vaadin-License-Title: ${Vaadin-License-Title}
+Implementation-Vendor: ${Implementation-Vendor}
+Implementation-Title: ${Implementation-Title}
+Implementation-Version: ${Implementation-Version}
diff --git a/assembly/assembly.xml b/assembly/assembly.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly
+	xmlns="https://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="https://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 https://maven.apache.org/xsd/assembly-1.1.2.xsd">
+	<id>addon</id>
+
+	<!-- Note: the base directory for this assembly descriptor is one of the 
+		license specific subprojects -->
+
+	<formats>
+		<format>zip</format>
+	</formats>
+
+	<!-- Do not use because we must put META-INF/MANIFEST.MF there. -->
+	<includeBaseDirectory>false</includeBaseDirectory>
+
+	<fileSets>
+		<fileSet>
+			<directory>.</directory>
+			<includes>
+				<include>license-*.txt</include>
+				<include>licensing.txt</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>target</directory>
+			<outputDirectory></outputDirectory>
+			<includes>
+				<include>*.jar</include>
+                <include>*.pdf</include>
+			</includes>
+		</fileSet>
+	</fileSets>
+
+	<files>
+		<!-- This is vaadin.com/directory related manifest needed in the zip package -->
+		<file>
+			<source>assembly/MANIFEST.MF</source>
+			<outputDirectory>META-INF</outputDirectory>
+			<filtered>true</filtered>
+		</file>
+	</files>
+</assembly>
diff --git a/checkstyle/header b/checkstyle/header
@@ -0,0 +1,10 @@
+/*
+ * Vaadin CDI Integration
+ *
+ * Copyright (C) 2012-2026 Vaadin Ltd
+ *
+ * This program is available under Vaadin Commercial License and Service Terms.
+ *
+ * See <https://vaadin.com/commercial-license-and-service-terms> for the full
+ * license.
+ */
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,3 +7,10 @@ nbactions.xml @@
     .iml
     *.iml
     *.log
+    *.class
+    /build
+    # Package Files #
+    *.jar
+    *.war
+    *.ear
+    target/