Skip to content

Start Tyrus 2.3 for EE12 #956

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

Merged
arjantijms merged 4 commits into from
Mar 1, 2026
Merged

Start Tyrus 2.3 for EE12 #956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
94d2dd4
Initial uptake of EE12 components and adjusting code for it
arjantijms Mar 1, 2026
c3d5c17
Set version to 2.3.99-SNAPSHOT
arjantijms Mar 1, 2026
2a7518f
Set EE4J parent to 2.0.0
arjantijms Mar 1, 2026
3b0e4cb
Update jenkins build file
arjantijms Mar 1, 2026
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
2 changes: 1 addition & 1 deletion NOTICE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ The project maintains the following source code repositories:
## Third-party Content
This project leverages the following third party content:

jakarta.enterprise.cdi-api Version 4.1.0
jakarta.enterprise.cdi-api Version 5.0.0.Alpha3
* License: Apache License, 2.0
* Copyright 2010, Red Hat, Inc., and individual contributors

Expand Down
25 changes: 14 additions & 11 deletions archetypes/echo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,29 @@

-->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.glassfish.tyrus.archetypes</groupId>
<artifactId>tyrus-archetypes-project</artifactId>
<version>2.2.99-SNAPSHOT</version>
<version>2.3.99-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>tyrus-archetype-echo</artifactId>

<name>Tyrus Echo Archetype</name>
<description>
An archetype which contains a Tyrus echo application.
</description>
<artifactId>tyrus-archetype-echo</artifactId>
<name>Tyrus Echo Archetype</name>

<build>
<resources>
<resource>
<directory>${basedir}/src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -55,11 +64,5 @@
</executions>
</plugin>
</plugins>
<resources>
<resource>
<directory>${basedir}/src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
</build>
</project>
4 changes: 2 additions & 2 deletions archetypes/echo/src/main/resources/archetype-resources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@
</dependency>
</dependencies>
<properties>
<websocket-api.version>2.2.0</websocket-api.version>
<java.version>11</java.version>
<websocket-api.version>2.3.0-M2</websocket-api.version>
<java.version>21</java.version>
<tyrus.version>${project.version}</tyrus.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.plugin.version>3.14.0</maven.compiler.plugin.version>
Expand Down
6 changes: 4 additions & 2 deletions archetypes/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,19 @@

-->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.glassfish.tyrus</groupId>
<artifactId>tyrus-project</artifactId>
<version>2.2.99-SNAPSHOT</version>
<version>2.3.99-SNAPSHOT</version>
</parent>

<groupId>org.glassfish.tyrus.archetypes</groupId>
<artifactId>tyrus-archetypes-project</artifactId>
<packaging>pom</packaging>

<name>tyrus-archetypes</name>
<description>
A module containing archetypes for generating Tyrus-based applications.
Expand Down
9 changes: 4 additions & 5 deletions bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,21 @@

-->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.9</version>
<version>2.0.0</version>
</parent>

<groupId>org.glassfish.tyrus</groupId>
<artifactId>tyrus-bom</artifactId>
<version>2.2.99-SNAPSHOT</version>
<version>2.3.99-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Tyrus BOM</name>

<name>Tyrus BOM</name>
<description>Tyrus Bill of Materials (BOM)</description>

<!-- TODO: Can be removed after it would be removed from parent too -->
Expand Down
2 changes: 1 addition & 1 deletion bundles/client-jdk/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.glassfish.tyrus.bundles</groupId>
<artifactId>tyrus-bundles</artifactId>
<version>2.2.99-SNAPSHOT</version>
<version>2.3.99-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion bundles/client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.glassfish.tyrus.bundles</groupId>
<artifactId>tyrus-bundles</artifactId>
<version>2.2.99-SNAPSHOT</version>
<version>2.3.99-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion bundles/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.tyrus</groupId>
<artifactId>tyrus-project</artifactId>
<version>2.2.99-SNAPSHOT</version>
<version>2.3.99-SNAPSHOT</version>
</parent>

<groupId>org.glassfish.tyrus.bundles</groupId>
Expand Down
2 changes: 1 addition & 1 deletion bundles/samples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.tyrus.bundles</groupId>
<artifactId>tyrus-bundles</artifactId>
<version>2.2.99-SNAPSHOT</version>
<version>2.3.99-SNAPSHOT</version>
</parent>

<artifactId>tyrus-samples</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion bundles/websocket-ri-archive/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.tyrus.bundles</groupId>
<artifactId>tyrus-bundles</artifactId>
<version>2.2.99-SNAPSHOT</version>
<version>2.3.99-SNAPSHOT</version>
</parent>

<artifactId>websocket-ri-archive</artifactId>
Expand Down
11 changes: 5 additions & 6 deletions bundles/websocket-ri-bundle/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,23 @@
<parent>
<groupId>org.glassfish.tyrus.bundles</groupId>
<artifactId>tyrus-bundles</artifactId>
<version>2.2.99-SNAPSHOT</version>
<version>2.3.99-SNAPSHOT</version>
</parent>

<artifactId>websocket-ri-bundle</artifactId>
<name>Tyrus Websocket RI Bundle</name>
<packaging>bundle</packaging>

<dependencies>
<!-- Jakarta EE APIs -->
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<groupId>jakarta.cdi</groupId>
<artifactId>jakarta.cdi-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -50,22 +51,20 @@
<artifactId>jakarta.xml.bind-api</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-framework</artifactId>
<version>${grizzly.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-http-server</artifactId>
<version>${grizzly.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.glassfish.tyrus</groupId>
<artifactId>tyrus-container-glassfish-ejb</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion bundles/websocket-risrc-licensee/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.tyrus.bundles</groupId>
<artifactId>tyrus-bundles</artifactId>
<version>2.2.99-SNAPSHOT</version>
<version>2.3.99-SNAPSHOT</version>
</parent>

<artifactId>websocket-risrc-licensee</artifactId>
Expand Down
9 changes: 6 additions & 3 deletions client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2011, 2025 Oracle and/or its affiliates. All rights reserved.
Expand All @@ -16,16 +17,18 @@

-->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.glassfish.tyrus</groupId>
<artifactId>tyrus-project</artifactId>
<version>2.2.99-SNAPSHOT</version>
<version>2.3.99-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>tyrus-client</artifactId>
<packaging>bundle</packaging>

<name>Tyrus Client</name>

<dependencies>
Expand Down
16 changes: 9 additions & 7 deletions containers/glassfish/cdi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2013, 2025 Oracle and/or its affiliates. All rights reserved.
Expand All @@ -16,17 +17,17 @@

-->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.glassfish.tyrus</groupId>
<artifactId>tyrus-containers-glassfish-project</artifactId>
<version>2.2.99-SNAPSHOT</version>
<version>2.3.99-SNAPSHOT</version>
</parent>

<packaging>bundle</packaging>
<artifactId>tyrus-container-glassfish-cdi</artifactId>
<packaging>bundle</packaging>

<name>Tyrus CDI Component Provider</name>

Expand All @@ -36,8 +37,8 @@
<artifactId>tyrus-core</artifactId>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<groupId>jakarta.cdi</groupId>
<artifactId>jakarta.cdi-api</artifactId>
<exclusions>
<exclusion>
<groupId>jakarta.inject</groupId>
Expand All @@ -51,6 +52,7 @@
<version>${inject.api.version}</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
Expand All @@ -61,10 +63,10 @@
<configuration>
<instructions>
<Export-Package>org.glassfish.tyrus.gf.cdi;version=${project.version}</Export-Package>
<Import-Package>jakarta.enterprise.context.spi;version="[3.0,5)",jakarta.enterprise.inject.spi;version="[3.0,5)",*</Import-Package>
<Import-Package>jakarta.enterprise.context.spi;version="[3.0,6)",jakarta.enterprise.inject.spi;version="[3.0,6)",*</Import-Package>
</instructions>
<unpackBundle>true</unpackBundle>
<excludeDependencies>jakarta.enterprise.cdi-api</excludeDependencies>
<excludeDependencies>jakarta.cdi.jakarta.cdi-api</excludeDependencies>
</configuration>
</plugin>
</plugins>
Expand Down
8 changes: 5 additions & 3 deletions containers/glassfish/ejb/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2013, 2025 Oracle and/or its affiliates. All rights reserved.
Expand All @@ -16,17 +17,17 @@

-->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.glassfish.tyrus</groupId>
<artifactId>tyrus-containers-glassfish-project</artifactId>
<version>2.2.99-SNAPSHOT</version>
<version>2.3.99-SNAPSHOT</version>
</parent>

<packaging>bundle</packaging>
<artifactId>tyrus-container-glassfish-ejb</artifactId>
<packaging>bundle</packaging>

<name>Tyrus EJB Component Provider</name>

Expand All @@ -40,6 +41,7 @@
<artifactId>jakarta.ejb-api</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
Expand Down
9 changes: 6 additions & 3 deletions containers/glassfish/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2012, 2025 Oracle and/or its affiliates. All rights reserved.
Expand All @@ -16,16 +17,18 @@

-->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.glassfish.tyrus</groupId>
<artifactId>tyrus-containers-project</artifactId>
<version>2.2.99-SNAPSHOT</version>
<version>2.3.99-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>tyrus-containers-glassfish-project</artifactId>
<packaging>pom</packaging>

<name>Tyrus Containers For Glassfish</name>

<modules>
Expand Down
Loading