Skip to content
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

4.1 for Servlet 6.1 / EE 11 #2209

Merged
merged 2 commits into from
May 27, 2024
Merged

4.1 for Servlet 6.1 / EE 11 #2209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce35c04
Next version is 4.1.0 with Jakarta EE 11 dependencies
arjantijms May 27, 2024
62b6110
Updates for Servlet 6.1 compatibility
arjantijms May 27, 2024
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
12 changes: 6 additions & 6 deletions boms/bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright 2021, 2023 Contributors to the Eclipse Foundation.
Copyright 2021, 2024 Contributors to the Eclipse Foundation.
Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
Expand All @@ -24,13 +24,13 @@
<parent>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.8</version>
<version>1.0.9</version>
<relativePath />
</parent>

<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-bom</artifactId>
<version>4.0.1</version>
<version>4.1.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>grizzly-bom</name>
Expand Down Expand Up @@ -173,11 +173,11 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.1.2</version>
<version>3.2.5</version>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.6.0</version>
<version>3.6.3</version>
<configuration>
<additionalOptions>
<additionalOption>-Xdoclint:none</additionalOption>
Expand All @@ -196,7 +196,7 @@
</plugin>
<plugin>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.4.0</version>
<version>3.6.0</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down
6 changes: 3 additions & 3 deletions extras/bundles/grizzly-httpservice-bundle/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.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.2-SNAPSHOT</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -72,7 +72,7 @@
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.3.1</version>
<version>3.3.2</version>
<configuration>
<filesets>
<!-- Make sure we remove the fake source directory. -->
Expand All @@ -85,7 +85,7 @@

<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.0</version>
<version>3.6.1</version>
<executions>
<execution>
<id>src-dependencies</id>
Expand Down
2 changes: 1 addition & 1 deletion extras/bundles/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.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.2-SNAPSHOT</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion extras/connection-pool/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.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.2-SNAPSHOT</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions extras/grizzly-httpservice/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.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.2-SNAPSHOT</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -138,7 +138,7 @@
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.0</version>
<version>3.6.1</version>
<executions>
<execution>
<id>unpack_osgi_compendium_sources</id>
Expand Down
10 changes: 5 additions & 5 deletions extras/http-server-jaxws/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.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.2-SNAPSHOT</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand All @@ -41,24 +41,24 @@
<dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId>
<version>4.0.1</version>
<version>4.0.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.xml.ws</groupId>
<artifactId>jakarta.xml.ws-api</artifactId>
<version>4.0.0</version>
<version>4.0.2</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-osgi</artifactId>
<version>4.0.3</version>
<version>4.0.5</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.glassfish.metro</groupId>
<artifactId>webservices-osgi</artifactId>
<version>4.0.2</version>
<version>4.0.3</version>
<type>jar</type>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion extras/http-server-multipart/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.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.2-SNAPSHOT</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion extras/http-servlet-extras/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.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.2-SNAPSHOT</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion extras/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.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.2-SNAPSHOT</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion extras/tls-sni/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.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.2-SNAPSHOT</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
6 changes: 3 additions & 3 deletions modules/bundles/comet/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.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.2-SNAPSHOT</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

Expand All @@ -49,7 +49,7 @@
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.3.1</version>
<version>3.3.2</version>
<configuration>
<filesets>
<!-- Make sure we remove the fake source directory. -->
Expand All @@ -62,7 +62,7 @@

<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.0</version>
<version>3.6.1</version>
<executions>
<execution>
<id>src-dependencies</id>
Expand Down
6 changes: 3 additions & 3 deletions modules/bundles/core/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.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.2-SNAPSHOT</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

Expand All @@ -49,7 +49,7 @@
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.3.1</version>
<version>3.3.2</version>
<configuration>
<filesets>
<!-- Make sure we remove the fake source directory. -->
Expand All @@ -62,7 +62,7 @@

<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.0</version>
<version>3.6.1</version>
<executions>
<execution>
<id>src-dependencies</id>
Expand Down
6 changes: 3 additions & 3 deletions modules/bundles/http-all/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.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.2-SNAPSHOT</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -61,7 +61,7 @@
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.3.1</version>
<version>3.3.2</version>
<configuration>
<filesets>
<!-- Make sure we remove the fake source directory. -->
Expand All @@ -74,7 +74,7 @@

<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.0</version>
<version>3.6.1</version>
<executions>
<execution>
<id>src-dependencies</id>
Expand Down
6 changes: 3 additions & 3 deletions modules/bundles/http-servlet/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.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.2-SNAPSHOT</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -53,7 +53,7 @@
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.3.1</version>
<version>3.3.2</version>
<configuration>
<filesets>
<!-- Make sure we remove the fake source directory. -->
Expand All @@ -66,7 +66,7 @@

<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.0</version>
<version>3.6.1</version>
<executions>
<execution>
<id>src-dependencies</id>
Expand Down
6 changes: 3 additions & 3 deletions modules/bundles/http/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.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.2-SNAPSHOT</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -66,7 +66,7 @@
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.3.1</version>
<version>3.3.2</version>
<configuration>
<filesets>
<!-- Make sure we remove the fake source directory. -->
Expand All @@ -79,7 +79,7 @@

<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.0</version>
<version>3.6.1</version>
<executions>
<execution>
<id>src-dependencies</id>
Expand Down
2 changes: 1 addition & 1 deletion modules/bundles/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.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.2-SNAPSHOT</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
6 changes: 3 additions & 3 deletions modules/bundles/websockets/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.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.2-SNAPSHOT</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -59,7 +59,7 @@
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.3.1</version>
<version>3.3.2</version>
<configuration>
<filesets>
<!-- Make sure we remove the fake source directory. -->
Expand All @@ -72,7 +72,7 @@

<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.0</version>
<version>3.6.1</version>
<executions>
<execution>
<id>src-dependencies</id>
Expand Down
2 changes: 1 addition & 1 deletion modules/comet/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.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.2-SNAPSHOT</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions modules/grizzly/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.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.2-SNAPSHOT</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -90,7 +90,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.4.0</version>
<version>3.6.0</version>
<executions>
<execution>
<id>add-source</id>
Expand Down
2 changes: 1 addition & 1 deletion modules/http-ajp/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.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.2-SNAPSHOT</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
Loading
Loading