Grizzly 2.4.0

Change-Id: Ic26a353c1bfe6f604782f6c16f2d89d4c851ab65

Author: pavelbucek

bundles/jaxrs-ri/pom.xml

@@ -301,9 +301,9 @@
                             jersey.repackaged.org.objectweb.asm.*;version=${project.version}
                         </Export-Package>
                         <Import-Package><![CDATA[
-                            javax.servlet.annotation.*;resolution:=optional;version="$<range;[==,+);${servlet3.version}>",
-                            javax.servlet.descriptor.*;resolution:=optional;version="$<range;[==,+);${servlet3.version}>",
-                            javax.servlet.*;version="[2.4,4.0)",
+                            javax.servlet.annotation.*;resolution:=optional;version="[2.4,5.0)",
+                            javax.servlet.descriptor.*;resolution:=optional;version="[2.4,5.0)",
+                            javax.servlet.*;version="[2.4,5.0)",
                             javax.persistence.*;resolution:=optional,
                             javax.validation.*;resolution:=optional;version="${range;[==,3);${javax.validation.api.version}}",
                             sun.misc.*;resolution:=optional,

containers/grizzly2-servlet/pom.xml

@@ -59,7 +59,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>${servlet3.version}</version>
+            <version>${servlet4.version}</version>
         </dependency>
 
         <dependency>

pom.xml

@@ -1802,21 +1802,6 @@
         </dependencies>
     </dependencyManagement>
 
-    <!-- TODO: This repository declaration only speeds up turnaround when adopting new JAX-RS milestone builds. -->
-    <!-- TODO: Should be removed before 2.26 final release. -->
-    <repositories>
-        <repository>
-            <id>java.net-releases</id>
-            <url>https://maven.java.net/content/repositories/releases</url>
-        </repository>
-        <repository>
-            <id>yasson-releases</id>
-            <name>Yasson Releases repository</name>
-            <url>https://repo.eclipse.org/content/repositories/yasson-releases</url>
-        </repository>
-
-    </repositories>
-
     <properties>
         <archetype.mvn.plugin.version>2.4</archetype.mvn.plugin.version>
 
@@ -1863,8 +1848,8 @@
         <freemarker.version>2.3.23</freemarker.version>
         <gae.version>1.8.4</gae.version>
         <gpg.mvn.plugin.version>1.6</gpg.mvn.plugin.version>
-        <grizzly.client.version>1.11</grizzly.client.version>
-        <grizzly2.version>2.4.0-beta8</grizzly2.version>
+        <grizzly.client.version>1.13</grizzly.client.version>
+        <grizzly2.version>2.4.0</grizzly2.version>
         <guava.version>18.0</guava.version>
         <hamcrest.version>1.3</hamcrest.version>
         <xmlunit.version>1.6</xmlunit.version>
@@ -1918,6 +1903,7 @@
         <rome.version>1.0</rome.version>
         <servlet2.version>2.4</servlet2.version>
         <servlet3.version>3.0.1</servlet3.version>
+        <servlet4.version>4.0.0-b07</servlet4.version>
         <simple.version>6.0.1</simple.version>
         <slf4j.version>1.7.12</slf4j.version>
         <spring4.version>4.3.4.RELEASE</spring4.version>

test-framework/providers/grizzly2/pom.xml

@@ -56,6 +56,12 @@
     <description>Jersey Test Framework - Grizzly2 container</description>
 
     <dependencies>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>${servlet4.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.glassfish.jersey.test-framework</groupId>
             <artifactId>jersey-test-framework-core</artifactId>

tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/PackageScanningTest.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012-2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012-2017 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -90,7 +90,7 @@ public static Option[] configuration() {
 
                 mavenBundle().groupId("org.glassfish.jersey.media").artifactId("jersey-media-sse").versionAsInProject(),
 
-                mavenBundle().groupId("javax.servlet").artifactId("javax.servlet-api").version("3.1.0"),
+                mavenBundle().groupId("javax.servlet").artifactId("javax.servlet-api").versionAsInProject(),
                 mavenBundle().groupId("org.glassfish.grizzly").artifactId("grizzly-http-servlet").versionAsInProject(),
                 mavenBundle().groupId("org.glassfish.jersey.containers").artifactId("jersey-container-servlet-core")
                         .versionAsInProject(),