Fixes piranhacloud#3733 - Move Grizzly dependency into the Piranha HT…

…TP Grizzly module
mnriem · May 25, 2024 · 14ad3b8 · 14ad3b8
1 parent bb074de
commit 14ad3b8
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 41 deletions.
diff --git a/COMPONENTS.md b/COMPONENTS.md
@@ -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 |
diff --git a/http/grizzly/pom.xml b/http/grizzly/pom.xml
@@ -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>
@@ -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>

diff --git a/pom.xml b/pom.xml
@@ -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>
@@ -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>

diff --git a/test/debug/pom.xml b/test/debug/pom.xml
@@ -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>