Merge "Remove Grizzly"

diff --combined pom.xml
index 0ea91c1,70563ef..10497d1
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -57,7 -57,7 +57,7 @@@
                </description>
  
                <properties>
 -                              <maven.build.timestamp.format>yyyy.MM.dd'T'hh.mm.ss'Z'</maven.build.timestamp.format>
 +                              <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
                                <clamp.project.version>${project.version}</clamp.project.version>
                                <clamp.build.timestamp>${maven.build.timestamp}</clamp.build.timestamp>
                                <maven.compiler.source>1.8</maven.compiler.source>
@@@ -331,6 -331,10 +331,10 @@@
                                                                                <groupId>commons-io</groupId>
                                                                                <artifactId>commons-io</artifactId>
                                                                </exclusion>
+                                                               <exclusion>
+                                                                               <artifactId>grizzly-http</artifactId>
+                                                                               <groupId>org.glassfish.grizzly</groupId>
+                                                               </exclusion>
                                                </exclusions>
                                </dependency>
                                <dependency>