Update of dependencies.

Change-Id: I2ba93f930dd9625bbcdbb9bd8b2c958d52d025e1

Author: pavelbucek

examples/helloworld-spring-annotations/src/test/java/org/glassfish/jersey/examples/hello/spring/annotations/SpringRequestResourceTest.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014-2016 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
@@ -58,8 +58,7 @@ public class SpringRequestResourceTest extends JerseyTest {
     @Override
     protected Application configure() {
         ApplicationContext context = new AnnotationConfigApplicationContext(SpringAnnotationConfig.class);
-        return new JerseyConfig()
-                .property("contextConfig", context);
+        return new JerseyConfig().property("contextConfig", context);
     }
 
     @Test

ext/spring3/pom.xml

@@ -167,7 +167,7 @@
     </dependencies>
 
     <properties>
-        <spring3.version>3.2.3.RELEASE</spring3.version>
+        <spring3.version>3.2.17.RELEASE</spring3.version>
     </properties>
 
     <build>

media/json-jackson/src/main/java/org/glassfish/jersey/jackson/internal/JacksonObjectProvider.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015-2016 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
@@ -236,7 +236,7 @@ public void depositSchemaProperty(final PropertyWriter writer,
                                           final JsonObjectFormatVisitor objectVisitor,
                                           final SerializerProvider provider) throws JsonMappingException {
             if (include(writer.getName())) {
-                writer.depositSchemaProperty(objectVisitor);
+                writer.depositSchemaProperty(objectVisitor, provider);
             }
         }
 

pom.xml

@@ -1885,19 +1885,19 @@
         <easymock.version>3.3</easymock.version>
         <ejb.version>3.2</ejb.version>
         <gf.impl.version>4.0</gf.impl.version>
-        <fasterxml.classmate.version>1.2.0</fasterxml.classmate.version>
+        <fasterxml.classmate.version>1.3.3</fasterxml.classmate.version>
         <findbugs.glassfish.version>1.3</findbugs.glassfish.version>
         <findbugs.version>3.0.2</findbugs.version>
         <freemarker.version>2.3.23</freemarker.version>
         <gae.version>1.8.4</gae.version>
-        <grizzly.client.version>1.10</grizzly.client.version>
-        <grizzly2.version>2.3.23</grizzly2.version>
+        <grizzly.client.version>1.11</grizzly.client.version>
+        <grizzly2.version>2.3.28</grizzly2.version>
         <guava.version>18.0</guava.version>
         <hamcrest.version>1.3</hamcrest.version>
         <xmlunit.version>1.6</xmlunit.version>
         <hk2.version>2.5.0-b30</hk2.version>
-        <httpclient.version>4.5</httpclient.version>
-        <jackson.version>2.5.4</jackson.version>
+        <httpclient.version>4.5</httpclient.version> <!-- TODO: 4.5.2 doesn't work; apache client connector tests -->
+        <jackson.version>2.8.4</jackson.version>
         <jackson1.version>1.9.13</jackson1.version>
         <javassist.version>3.20.0-GA</javassist.version>
         <javax.annotation.version>1.2</javax.annotation.version>
@@ -1912,10 +1912,10 @@
         <jaxrs.api.spec.version>2.0</jaxrs.api.spec.version>
         <jaxrs.api.impl.version>2.0.1</jaxrs.api.impl.version>
         <jboss.logging.version>3.3.0.Final</jboss.logging.version>
-        <jersey1.version>1.19</jersey1.version>
+        <jersey1.version>1.19.3</jersey1.version>
         <jersey1.last.final.version>${jersey1.version}</jersey1.last.final.version>
-        <jettison.version>1.3.7</jettison.version>
-        <jetty.plugin.version>6.1.24</jetty.plugin.version>
+        <jettison.version>1.3.7</jettison.version> <!-- TODO: 1.3.8 doesn't work; AbstractJsonTest complexBeanWithAttributes -->
+        <jetty.plugin.version>6.1.26</jetty.plugin.version>
         <jetty.version>9.2.14.v20151106</jetty.version>
         <jetty.servlet.api.25.version>6.1.14</jetty.servlet.api.25.version>
         <jmh.version>1.10.2</jmh.version>
@@ -1937,15 +1937,15 @@
         <paxexam.mvn.plugin.version>1.2.4</paxexam.mvn.plugin.version>
         <rxjava.version>1.0.12</rxjava.version>
         <rome.version>1.0</rome.version>
-        <rxjava.version>1.0.12</rxjava.version>
+        <rxjava.version>1.2.3</rxjava.version>
         <servlet2.version>2.4</servlet2.version>
         <servlet3.version>3.0.1</servlet3.version>
         <simple.version>6.0.1</simple.version>
         <slf4j.version>1.7.12</slf4j.version>
-        <spring3.version>3.2.3.RELEASE</spring3.version>
+        <spring3.version>3.2.17.RELEASE</spring3.version>
         <validation.api.version>1.1.0.Final</validation.api.version>
-        <validation.impl.version>5.1.3.Final</validation.impl.version>
-        <weld.version>2.2.14.Final</weld.version>
+        <validation.impl.version>5.1.3.Final</validation.impl.version> <!-- 5.3.3.Final doesn't work - osgi bv tests -->
+        <weld.version>2.2.14.Final</weld.version> <!-- 2.4.1 doesn't work - bv tests -->
         <xerces.version>2.11.0</xerces.version>
         <xmlunit.version>1.6</xmlunit.version>
         <mockito.version>1.10.19</mockito.version>

tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/client/grizzlyconnector/NonBlockingTest.java

@@ -40,7 +40,9 @@
 
 package org.glassfish.jersey.tests.e2e.client.grizzlyconnector;
 
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -83,23 +85,29 @@ protected void configureClient(ClientConfig config) {
 
     @Test
     public void testNonBlockingConnector() throws Exception {
+        final CountDownLatch countDownLatch = new CountDownLatch(1);
+
         Future<String> future = target("test")
                 .request()
                 .async()
                 .get(new InvocationCallback<String>() {
                     @Override
                     public void completed(String response) {
                         invocationCallbackThreadName = Thread.currentThread().getName();
+                        countDownLatch.countDown();
                     }
 
                     @Override
                     public void failed(Throwable throwable) {
                         invocationCallbackThreadName = Thread.currentThread().getName();
+                        countDownLatch.countDown();
                     }
                 });
 
         String response = future.get();
         assertNotNull(response);
+        assertTrue("Invocation callback was not invoked",
+                countDownLatch.await(5, TimeUnit.SECONDS));
         assertTrue("Invocation callback is not executed on the NIO pool thread.",
                    !invocationCallbackThreadName.contains("jersey-client-async-executor"));
     }