Skip to content

Commit

Permalink
Preparation for 2.2.0 (eclipse-ee4j#895)
Browse files Browse the repository at this point in the history 
* Preparation for 2.2.0

Signed-off-by: jansupol <[email protected]>
  • Loading branch information
@jansupol
jansupol authored Mar 28, 2024
1 parent 3621d15 commit d985c58
Show file tree
Hide file tree
Showing 76 changed files with 110 additions and 119 deletions.
2 changes: 1 addition & 1 deletion archetypes/echo/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions archetypes/echo/src/main/resources/archetype-resources/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
2 changes: 1 addition & 1 deletion archetypes/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion bom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion bundles/client-jdk/pom.xml
View file
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.1.99-SNAPSHOT</version>
<version>2.2.99-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion bundles/client/pom.xml
View file
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.1.99-SNAPSHOT</version>
<version>2.2.99-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion bundles/pom.xml
View file
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.1.99-SNAPSHOT</version>
<version>2.2.99-SNAPSHOT</version>
</parent>

<groupId>org.glassfish.tyrus.bundles</groupId>
Expand Down
2 changes: 1 addition & 1 deletion bundles/samples/pom.xml
View file
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.1.99-SNAPSHOT</version>
<version>2.2.99-SNAPSHOT</version>
</parent>

<artifactId>tyrus-samples</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion bundles/websocket-ri-archive/pom.xml
View file
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.1.99-SNAPSHOT</version>
<version>2.2.99-SNAPSHOT</version>
</parent>

<artifactId>websocket-ri-archive</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion bundles/websocket-ri-bundle/pom.xml
View file
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.1.99-SNAPSHOT</version>
<version>2.2.99-SNAPSHOT</version>
</parent>

<artifactId>websocket-ri-bundle</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion bundles/websocket-risrc-licensee/pom.xml
View file
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.0.99-SNAPSHOT</version>
<version>2.2.99-SNAPSHOT</version>
</parent>

<artifactId>websocket-risrc-licensee</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion containers/glassfish/cdi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion containers/glassfish/ejb/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion containers/glassfish/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion containers/grizzly-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion containers/grizzly-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion containers/inmemory/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion containers/jdk-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion containers/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion containers/servlet/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion docs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
26 changes: 6 additions & 20 deletions etc/jenkins/Jenkinsfile_ci_build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,45 +8,31 @@ 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 {
sh '''
mvn -U -C -Dtyrus.test.container.client=org.glassfish.tyrus.container.grizzly.client.GrizzlyClientContainer -Pbundles clean install -Dmaven.javadoc.skip=true
mvn -U -C -Dtyrus.test.container.client=org.glassfish.tyrus.container.grizzly.client.GrizzlyClientContainer -Pbundles clean install -Dmaven.javadoc.skip=true -Pstaging
'''
}
}
// 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 {
sh '''
mvn -U -C -Dtyrus.test.container.client=org.glassfish.tyrus.container.grizzly.client.GrizzlyClientContainer -Pbundles clean install -Dmaven.javadoc.skip=true
mvn -U -C -Dtyrus.test.container.client=org.glassfish.tyrus.container.grizzly.client.GrizzlyClientContainer -Pbundles clean install -Dmaven.javadoc.skip=true -Pstaging
'''
}
}
Expand Down
2 changes: 1 addition & 1 deletion ext/client-cli/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ext/client-java8/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ext/extension-deflate/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ext/monitoring-jmx/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,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>

<artifactId>tyrus-monitoring-jmx</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ext/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
33 changes: 17 additions & 16 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

<groupId>org.glassfish.tyrus</groupId>
<artifactId>tyrus-project</artifactId>
<version>2.1.99-SNAPSHOT</version>
<version>2.2.99-SNAPSHOT</version>
<packaging>pom</packaging>
<name>tyrus</name>
<description>Tyrus is the reference implementation of Java API for WebSocket (JSR-356)</description>
Expand Down Expand Up @@ -101,44 +101,44 @@
</contributors>

<properties>
<websocket-api.version>2.2.0-M1</websocket-api.version>

<annotation-api.version>3.0.0-M1</annotation-api.version>
<websocket-api.version>2.2.0</websocket-api.version>
<annotation-api.version>3.0.0</annotation-api.version>
<activation.api.version>2.1.3</activation.api.version> <!-- inherited from JAX-B -->
<cdi-api.version>4.1.0.RC1</cdi-api.version>
<ejb-api.version>4.0.1</ejb-api.version>
<grizzly.version>4.0.2</grizzly.version>
<glassfish.version>7.0.13</glassfish.version>
<glassfish.version>8.0.0-M3</glassfish.version>
<inject.api.version>2.0.1</inject.api.version><!-- inherited from CDI, do not update unless inline with it -->
<jaxb.api.version>4.0.1</jaxb.api.version>
<jaxb.ri.version>4.0.4</jaxb.ri.version>
<jaxb.api.version>4.0.2</jaxb.api.version>
<jaxb.ri.version>4.0.5</jaxb.ri.version>
<jline.version>2.14.5</jline.version>
<json-api.version>2.1.3</json-api.version>
<json-impl.version>1.1.5</json-impl.version>
<servlet.api.version>6.1.0-M2</servlet.api.version>
<json-impl.version>1.1.6</json-impl.version>
<servlet.api.version>6.1.0</servlet.api.version>
<spring.boot.version>2.6.7</spring.boot.version>


<maven.compiler.plugin>3.11.0</maven.compiler.plugin>
<java.version>11</java.version>
<maven.compiler.plugin.version>3.11.0</maven.compiler.plugin.version>
<maven-javadoc-plugin.version>3.6.2</maven-javadoc-plugin.version>
<maven.surefire.plugin.version>3.2.1</maven.surefire.plugin.version>
<maven.war.plugin.version>3.4.0</maven.war.plugin.version>

<api_package>jakarta.websocket</api_package>
<impl_namespace>org.glassfish</impl_namespace>
<spec_version>0.0</spec_version>
<new_spec_version>2.1</new_spec_version>
<new_impl_version>2.1</new_impl_version>
<new_spec_version>2.2</new_spec_version>
<new_impl_version>2.2</new_impl_version>
<build_number>11</build_number>
<spec_impl_version>2.1.0</spec_impl_version>
<spec_impl_version>2.2.0</spec_impl_version>
<impl_version>0.0.0</impl_version>

<impljar.extensionName>${api_package}</impljar.extensionName>
<impljar.bundle.symbolicName>${impl_namespace}.${api_package}</impljar.bundle.symbolicName>
<packages.private>org.glassfish.*</packages.private>

<!-- Non Final properties for impl jar -->
<apijar.bundle.version>2.1.1</apijar.bundle.version>
<apijar.bundle.version>2.2.0</apijar.bundle.version>
<impljar.bundle.specversion>${spec_version}.99.b${build_number}</impljar.bundle.specversion>
<impljar.maven.version>${new_impl_version}-b${build_number}</impljar.maven.version>
<impljar.bundle.version>${spec_version}.99.b${build_number}</impljar.bundle.version>
Expand Down Expand Up @@ -382,9 +382,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven.compiler.plugin.version}</version>
<configuration>
<source>11</source>
<target>11</target>
<source>${java.version}</source>
<target>${java.version}</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
Expand Down
Loading

0 comments on commit d985c58

Please sign in to comment.