Merge commit '11458c95'

changelog.html

@@ -75,6 +75,12 @@ Upcoming changes</a>
   <li class=rfe>
     Added <code>RobustMapConverter</code>.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-22398">issue 22398</a>)
+  <li class='major bug'>
+    JNLP slaves now satisfies stricter requirements imposed by JDK7u45.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-20204">issue 20204</a>)
+  <li class=bug>
+    Fixed NPE executing <tt>Pipe.EOF</tt> with <tt>ProxyWriter</tt>
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-20769">issue 20769</a>)
 </ul>
 </div><!--=TRUNK-END=-->
 

pom.xml

@@ -172,7 +172,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.jenkins-ci.main</groupId>
         <artifactId>remoting</artifactId>
-        <version>2.33</version>
+        <version>2.35</version>
       </dependency>
 
       <dependency>