Preparation for 2.2.0

Signed-off-by: jansupol <[email protected]>
jansupol · Mar 28, 2024 · 20c27cf · 20c27cf
1 parent f814e4b
commit 20c27cf
Show file tree

Hide file tree

Showing 78 changed files with 204 additions and 119 deletions.
diff --git a/NOTICE.md b/NOTICE.md
@@ -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-M1
+jakarta.enterprise.cdi-api Version 4.1.0.RC1
 * License: Apache License, 2.0
 * Copyright 2010, Red Hat, Inc., and individual contributors
 

diff --git a/archetypes/echo/pom.xml b/archetypes/echo/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.archetypes</groupId>
         <artifactId>tyrus-archetypes-project</artifactId>
-        <version>2.1.99-SNAPSHOT</version>
+        <version>2.2.99-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <description>

diff --git a/archetypes/echo/src/main/resources/archetype-resources/pom.xml b/archetypes/echo/src/main/resources/archetype-resources/pom.xml
@@ -23,7 +23,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven.compiler.plugin}</version>
+                <version>${maven.compiler.plugin.version}</version>
                 <inherited>true</inherited>
                 <configuration>
                     <source>${java.version}</source>
@@ -67,11 +67,11 @@
         </dependency>
     </dependencies>
     <properties>
-        <websocket-api.version>2.2.0-M1</websocket-api.version>
+        <websocket-api.version>2.2.0</websocket-api.version>
         <java.version>11</java.version>
         <tyrus.version>${project.version}</tyrus.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.plugin>3.11.0</maven.compiler.plugin>
+        <maven.compiler.plugin.version>3.11.0</maven.compiler.plugin.version>
         <maven.war.plugin.version>3.4.0</maven.war.plugin.version>
     </properties>
 </project>
diff --git a/archetypes/echo/test/echo-service/pom.xml b/archetypes/echo/test/echo-service/pom.xml
@@ -0,0 +1,93 @@
+<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">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.example</groupId>
+    <artifactId>echo-service</artifactId>
+    <packaging>war</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <name>echo-service</name>
+
+    <parent>
+        <groupId>org.eclipse.ee4j</groupId>
+        <artifactId>project</artifactId>
+        <version>1.0.7</version>
+    </parent>
+
+    <build>
+        <finalName>echo-service</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.2</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.9.0</version>
+                <configuration>
+                    <source>11</source>
+                    <target>11</target>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>3.0.0</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>java</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <mainClass>com.example.Main</mainClass>
+                </configuration>
+            </plugin>            
+        </plugins>
+    </build>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.glassfish.tyrus</groupId>
+                <artifactId>tyrus-bom</artifactId>
+                <version>${tyrus.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>jakarta.websocket</groupId>
+            <artifactId>jakarta.websocket-api</artifactId>
+            <version>2.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.websocket</groupId>
+            <artifactId>jakarta.websocket-client-api</artifactId>
+            <version>2.1.0</version>
+        </dependency>
+
+        <!-- adds dependency on grizzly based client and server container - just for tests -->
+        <dependency>
+            <groupId>org.glassfish.tyrus.tests</groupId>
+            <artifactId>tyrus-test-tools</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <properties>
+        <websocket-api.version>2.1.0</websocket-api.version>
+        <tyrus.version>2.0-SNAPSHOT</tyrus.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+</project>
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-project</artifactId>
-        <version>2.1.99-SNAPSHOT</version>
+        <version>2.2.99-SNAPSHOT</version>
     </parent>
 
     <groupId>org.glassfish.tyrus.archetypes</groupId>

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -29,7 +29,7 @@
 
     <groupId>org.glassfish.tyrus</groupId>
     <artifactId>tyrus-bom</artifactId>
-    <version>2.1.99-SNAPSHOT</version>
+    <version>2.2.99-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Tyrus BOM</name>
 

diff --git a/bundles/client-jdk/pom.xml b/bundles/client-jdk/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.bundles</groupId>
         <artifactId>tyrus-bundles</artifactId>
-        <version>2.1.99-SNAPSHOT</version>
+        <version>2.2.99-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/bundles/client/pom.xml b/bundles/client/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.bundles</groupId>
         <artifactId>tyrus-bundles</artifactId>
-        <version>2.1.99-SNAPSHOT</version>
+        <version>2.2.99-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/bundles/pom.xml b/bundles/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-project</artifactId>
-        <version>2.1.99-SNAPSHOT</version>
+        <version>2.2.99-SNAPSHOT</version>
     </parent>
 
     <groupId>org.glassfish.tyrus.bundles</groupId>

diff --git a/bundles/samples/pom.xml b/bundles/samples/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.bundles</groupId>
         <artifactId>tyrus-bundles</artifactId>
-        <version>2.1.99-SNAPSHOT</version>
+        <version>2.2.99-SNAPSHOT</version>
     </parent>
 
     <artifactId>tyrus-samples</artifactId>

diff --git a/bundles/websocket-ri-archive/pom.xml b/bundles/websocket-ri-archive/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.bundles</groupId>
         <artifactId>tyrus-bundles</artifactId>
-        <version>2.1.99-SNAPSHOT</version>
+        <version>2.2.99-SNAPSHOT</version>
     </parent>
 
     <artifactId>websocket-ri-archive</artifactId>

diff --git a/bundles/websocket-ri-bundle/pom.xml b/bundles/websocket-ri-bundle/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.bundles</groupId>
         <artifactId>tyrus-bundles</artifactId>
-        <version>2.1.99-SNAPSHOT</version>
+        <version>2.2.99-SNAPSHOT</version>
     </parent>
 
     <artifactId>websocket-ri-bundle</artifactId>

diff --git a/bundles/websocket-risrc-licensee/pom.xml b/bundles/websocket-risrc-licensee/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.bundles</groupId>
         <artifactId>tyrus-bundles</artifactId>
-        <version>2.0.99-SNAPSHOT</version>
+        <version>2.2.99-SNAPSHOT</version>
     </parent>
 
     <artifactId>websocket-risrc-licensee</artifactId>

diff --git a/client/pom.xml b/client/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-project</artifactId>
-        <version>2.1.99-SNAPSHOT</version>
+        <version>2.2.99-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/containers/glassfish/cdi/pom.xml b/containers/glassfish/cdi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-containers-glassfish-project</artifactId>
-        <version>2.1.99-SNAPSHOT</version>
+        <version>2.2.99-SNAPSHOT</version>
     </parent>
 
     <packaging>bundle</packaging>

diff --git a/containers/glassfish/ejb/pom.xml b/containers/glassfish/ejb/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-containers-glassfish-project</artifactId>
-        <version>2.1.99-SNAPSHOT</version>
+        <version>2.2.99-SNAPSHOT</version>
     </parent>
 
     <packaging>bundle</packaging>

diff --git a/containers/glassfish/pom.xml b/containers/glassfish/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-containers-project</artifactId>
-        <version>2.1.99-SNAPSHOT</version>
+        <version>2.2.99-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/containers/grizzly-client/pom.xml b/containers/grizzly-client/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-containers-project</artifactId>
-        <version>2.1.99-SNAPSHOT</version>
+        <version>2.2.99-SNAPSHOT</version>
     </parent>
 
     <packaging>bundle</packaging>

diff --git a/containers/grizzly-server/pom.xml b/containers/grizzly-server/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-containers-project</artifactId>
-        <version>2.1.99-SNAPSHOT</version>
+        <version>2.2.99-SNAPSHOT</version>
     </parent>
 
     <packaging>bundle</packaging>

diff --git a/containers/inmemory/pom.xml b/containers/inmemory/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-containers-project</artifactId>
-        <version>2.1.99-SNAPSHOT</version>
+        <version>2.2.99-SNAPSHOT</version>
     </parent>
 
     <packaging>bundle</packaging>

diff --git a/containers/jdk-client/pom.xml b/containers/jdk-client/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-containers-project</artifactId>
-        <version>2.1.99-SNAPSHOT</version>
+        <version>2.2.99-SNAPSHOT</version>
     </parent>
 
     <packaging>bundle</packaging>

diff --git a/containers/pom.xml b/containers/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-project</artifactId>
-        <version>2.1.99-SNAPSHOT</version>
+        <version>2.2.99-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/containers/servlet/pom.xml b/containers/servlet/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-containers-project</artifactId>
-        <version>2.1.99-SNAPSHOT</version>
+        <version>2.2.99-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/core/pom.xml b/core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-project</artifactId>
-        <version>2.1.99-SNAPSHOT</version>
+        <version>2.2.99-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/docs/pom.xml b/docs/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-project</artifactId>
-        <version>2.1.99-SNAPSHOT</version>
+        <version>2.2.99-SNAPSHOT</version>
     </parent>
 
     <artifactId>tyrus-documentation</artifactId>

diff --git a/etc/jenkins/Jenkinsfile_ci_build b/etc/jenkins/Jenkinsfile_ci_build
@@ -8,12 +8,12 @@ pipeline {
     stages {
         stage('Jersey build') {
             parallel {
-                stage('JDK 11 ') {
+                stage('JDK 17 ') {
                     agent {
                         label 'centos-7'
                     }
                     tools {
-                        jdk 'openjdk-jdk11-latest'
+                        jdk 'openjdk-jdk17-latest'
                         maven 'apache-maven-latest'
                     }
                     steps {
@@ -22,26 +22,12 @@ pipeline {
                             '''
                     }
                 }
-//                stage('JDK 13 ') {
-//                    agent {
-//                        label 'centos-7'
-//                    }
-//                    tools {
-//                        jdk 'openjdk-jdk13-latest'
-//                        maven 'apache-maven-latest'
-//                    }
-//                    steps {
-//                        sh '''
-//                               mvn -U -C -Dtyrus.test.container.client=org.glassfish.tyrus.container.grizzly.client.GrizzlyClientContainer -Pbundles clean install -Dmaven.javadoc.skip=true
-//                            '''
-//                    }
-//                }
-                stage('JDK 17 ') {
+                stage('JDK 21 ') {
                     agent {
                         label 'centos-7'
                     }
                     tools {
-                        jdk 'openjdk-jdk17-latest'
+                        jdk 'openjdk-jdk21-latest'
                         maven 'apache-maven-latest'
                     }
                     steps {

diff --git a/ext/client-cli/pom.xml b/ext/client-cli/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.ext</groupId>
         <artifactId>tyrus-extensions-project</artifactId>
-        <version>2.1.99-SNAPSHOT</version>
+        <version>2.2.99-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/ext/client-java8/pom.xml b/ext/client-java8/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.ext</groupId>
         <artifactId>tyrus-extensions-project</artifactId>
-        <version>2.1.99-SNAPSHOT</version>
+        <version>2.2.99-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/ext/extension-deflate/pom.xml b/ext/extension-deflate/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.ext</groupId>
         <artifactId>tyrus-extensions-project</artifactId>
-        <version>2.1.99-SNAPSHOT</version>
+        <version>2.2.99-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>