Please review these pom.xml diffs for changing the nucleus dependencies
on specific grizzly modules to the combined grizzly module,
nucleus-grizzly-all, which is shipped with nucleus. This is to fix issue
GLASSFISH-17649.
Thanks.
Tom
Index: nucleus/cluster/cli/pom.xml
===================================================================
--- nucleus/cluster/cli/pom.xml (revision 51642)
+++ nucleus/cluster/cli/pom.xml (working copy)
@@ -67,7 +67,7 @@
<archive>
<!-- XXX - which of these are needed? -->
<manifestEntries>
- <Class-Path>config-api.jar internal-api.jar config-types.jar
grizzly-config.jar cluster-l10n.jar</Class-Path>
+ <Class-Path>config-api.jar internal-api.jar config-types.jar
cluster-l10n.jar</Class-Path>
</manifestEntries>
</archive>
</configuration>
Index: nucleus/admin/config-api/pom.xml
===================================================================
--- nucleus/admin/config-api/pom.xml (revision 51642)
+++ nucleus/admin/config-api/pom.xml (working copy)
@@ -171,7 +171,8 @@
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
- <artifactId>grizzly-config</artifactId>
+ <artifactId>nucleus-grizzly-all</artifactId>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</project>
Index: nucleus/common/internal-api/pom.xml
===================================================================
--- nucleus/common/internal-api/pom.xml (revision 51642)
+++ nucleus/common/internal-api/pom.xml (working copy)
@@ -111,9 +111,10 @@
<artifactId>common-util</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.glassfish.grizzly</groupId>
- <artifactId>grizzly-http-server</artifactId>
+ <artifactId>nucleus-grizzly-all</artifactId>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</project>
Index: nucleus/common/glassfish-api/pom.xml
===================================================================
--- nucleus/common/glassfish-api/pom.xml (revision 51642)
+++ nucleus/common/glassfish-api/pom.xml (working copy)
@@ -82,12 +82,9 @@
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
- <artifactId>grizzly-framework</artifactId>
+ <artifactId>nucleus-grizzly-all</artifactId>
+ <version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.glassfish.grizzly</groupId>
- <artifactId>grizzly-http-server</artifactId>
- </dependency>
<dependency>
<groupId>org.glassfish.external</groupId>
Index: nucleus/core/kernel/pom.xml
===================================================================
--- nucleus/core/kernel/pom.xml (revision 51642)
+++ nucleus/core/kernel/pom.xml (working copy)
@@ -184,17 +184,10 @@
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
- <artifactId>grizzly-framework</artifactId>
+ <artifactId>nucleus-grizzly-all</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.glassfish.grizzly</groupId>
- <artifactId>grizzly-http-server</artifactId>
- </dependency>
- <dependency>
- <groupId>org.glassfish.grizzly</groupId>
- <artifactId>grizzly-config</artifactId>
- </dependency>
- <dependency>
<groupId>org.glassfish.common</groupId>
<artifactId>common-util</artifactId>
<version>${project.version}</version>