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.

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

Fixes #3733 - Move Grizzly dependency into the Piranha HTTP Grizzly m… #3734

Merged
merged 1 commit into from
May 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 6 additions & 3 deletions COMPONENTS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
| Name | Version |
|------|---------|
| RedHat Weld | 5.1.2.Final |
| Name | Version |
|-----------------------|---------------|
| Eclipse Grizzly | 4.0.2 |
| Eclipse Grizzly NPN | 2.0.0 |
| RedHat Weld | 5.1.2.Final |
| RedHat Undertow | 2.3.12.Final |
11 changes: 7 additions & 4 deletions http/grizzly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>cloud.piranha.http</groupId>
<artifactId>project</artifactId>
<version>24.6.0-SNAPSHOT</version>
</parent>

<artifactId>piranha-http-grizzly</artifactId>
<packaging>jar</packaging>

<name>Piranha - HTTP - Grizzly Integration</name>

<properties>
<grizzly.version>4.0.2</grizzly.version>
<grizzly-npn-api.version>2.0.0</grizzly-npn-api.version>
</properties>
<dependencies>
<!-- compile -->
<dependency>
Expand All @@ -25,17 +25,20 @@
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-http-server</artifactId>
<version>${grizzly.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-http2</artifactId>
<version>${grizzly.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-npn-api</artifactId>
<scope>compile</scope>
<version>${grizzly-npn-api.version}</version>
</dependency>
<!-- test -->
<dependency>
Expand Down
20 changes: 0 additions & 20 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,6 @@
<crac.version>0.1.3</crac.version>
<eclipse.jaxb.version>4.0.5</eclipse.jaxb.version>
<free-port-finder.version>1.1.1</free-port-finder.version>
<grizzly.version>4.0.2</grizzly.version>
<grizzly-npn-api.version>2.0.0</grizzly-npn-api.version>
<hazelcast.version>5.3.6</hazelcast.version>
<htmlunit.version>2.70.0</htmlunit.version>
<hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
Expand Down Expand Up @@ -208,24 +206,6 @@
<version>${angus.activation.version}</version>
</dependency>


<!-- Eclipse Grizzly -->
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-http-server</artifactId>
<version>${grizzly.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-http2</artifactId>
<version>${grizzly.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-npn-api</artifactId>
<version>${grizzly-npn-api.version}</version>
</dependency>

<!-- Eclipse JAXB -->
<dependency>
<groupId>org.glassfish.jaxb</groupId>
Expand Down
14 changes: 0 additions & 14 deletions test/debug/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -404,20 +404,6 @@
<artifactId>maven-plugin-annotations</artifactId>
</dependency>

<!-- Eclipse Grizzly -->
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-http-server</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-http2</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-npn-api</artifactId>
</dependency>

<!-- Eclipse JAXB -->
<dependency>
<groupId>org.glassfish.jaxb</groupId>
Expand Down
Loading