Integ: Grizzly 2.4.0 (#22089)

Author: rlubke

nucleus/grizzly/config/src/test/java/org/glassfish/grizzly/config/GrizzlyConfigTest.java

@@ -57,7 +57,6 @@
 import org.glassfish.grizzly.memory.ByteBufferManager;
 import org.glassfish.grizzly.memory.HeapMemoryManager;
 import org.glassfish.grizzly.memory.MemoryManager;
-import org.glassfish.grizzly.memory.PooledMemoryManager;
 import org.glassfish.grizzly.nio.NIOTransport;
 import org.glassfish.grizzly.strategies.SameThreadIOStrategy;
 import org.glassfish.grizzly.strategies.WorkerThreadIOStrategy;
@@ -151,7 +150,7 @@ public void testDefaultBufferConfiguration() throws Exception {
             GenericGrizzlyListener genericGrizzlyListener =
                     (GenericGrizzlyListener) getListener(grizzlyConfig, "http-listener-1");
             MemoryManager mm = genericGrizzlyListener.getTransport().getMemoryManager();
-            assertEquals(PooledMemoryManager.class.getName(), mm.getClass().getName());
+            assertEquals(HeapMemoryManager.class.getName(), mm.getClass().getName());
         } finally {
             if (grizzlyConfig != null) {
                 grizzlyConfig.shutdownNetwork();

nucleus/pom.xml

@@ -129,7 +129,7 @@
         <javax.validation.osgi.version.lowerbound>1.1.0</javax.validation.osgi.version.lowerbound>
         <management-api.version>1.1-rev-1</management-api.version>
         <servlet-api.version>4.0.0-b07</servlet-api.version>
-        <grizzly.version>2.4.0-beta13</grizzly.version>
+        <grizzly.version>2.4.0</grizzly.version>
         <grizzly.npn.version>1.7</grizzly.npn.version>
         <jboss.logging.annotation.version>2.0.1.Final</jboss.logging.annotation.version>
         <!-- Ensure that appserver/pom.xml's javax.validation property is of same value as the one below -->