diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml
index 7d8e4245dbdf97cda16d5edd3ad53bd7c766e942..8cb64540366a951202e26fd37fa9ccdb263c6ba7 100755
--- a/logback-classic/pom.xml
+++ b/logback-classic/pom.xml
@@ -117,12 +117,6 @@
       <version>${slf4j.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jms_1.1_spec</artifactId>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketReceiver.java b/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketReceiver.java
index 3e49699dbae2204443596a078530ad743e5579e1..c803907af31b418e1f66ee78b42c5b27bf8c7e56 100644
--- a/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketReceiver.java
+++ b/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketReceiver.java
@@ -28,6 +28,7 @@ import javax.net.SocketFactory;
 
 import ch.qos.logback.classic.Logger;
 import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.net.server.HardenedLoggingEventInputStream;
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.net.DefaultSocketConnector;
 import ch.qos.logback.core.net.AbstractSocketAppender;
@@ -153,9 +154,10 @@ public class SocketReceiver extends ReceiverBase implements Runnable, SocketConn
     }
 
     private void dispatchEvents(LoggerContext lc) {
+        ObjectInputStream ois = null;
         try {
             socket.setSoTimeout(acceptConnectionTimeout);
-            ObjectInputStream ois = new ObjectInputStream(socket.getInputStream());
+            ois = new HardenedLoggingEventInputStream(socket.getInputStream());
             socket.setSoTimeout(0);
             addInfo(receiverId + "connection established");
             while (true) {
@@ -172,6 +174,7 @@ public class SocketReceiver extends ReceiverBase implements Runnable, SocketConn
         } catch (ClassNotFoundException ex) {
             addInfo(receiverId + "unknown event class: " + ex);
         } finally {
+            CloseUtil.closeQuietly(ois);
             CloseUtil.closeQuietly(socket);
             socket = null;
             addInfo(receiverId + "connection closed");
diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/net/PackageTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/net/PackageTest.java
index 884fa2c05a3775d2177d32d96ec53d5459b5f497..f03e8fc7dbc5c023accb7f951a681b67dfcce7f2 100644
--- a/logback-classic/src/test/java/ch/qos/logback/classic/net/PackageTest.java
+++ b/logback-classic/src/test/java/ch/qos/logback/classic/net/PackageTest.java
@@ -18,7 +18,7 @@ import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
 @RunWith(Suite.class)
-@SuiteClasses({ SyslogAppenderTest.class, DilutedSMTPAppenderTest.class, JMSQueueAppenderTest.class, JMSTopicAppenderTest.class, SMTPAppender_GreenTest.class,
+@SuiteClasses({ SyslogAppenderTest.class, DilutedSMTPAppenderTest.class, SMTPAppender_GreenTest.class,
         SMTPAppender_SubethaSMTPTest.class, SocketReceiverTest.class, SSLSocketReceiverTest.class })
 public class PackageTest {
 }
\ No newline at end of file
diff --git a/logback-core/pom.xml b/logback-core/pom.xml
index b83d5fae3600ae02cf626eded9c5c4e6e5c2b263..7925f6177856950d19a18e0adc120becbc8e5865 100755
--- a/logback-core/pom.xml
+++ b/logback-core/pom.xml
@@ -34,12 +34,6 @@
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jms_1.1_spec</artifactId>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
diff --git a/logback-core/src/test/java/ch/qos/logback/core/net/PackageTest.java b/logback-core/src/test/java/ch/qos/logback/core/net/PackageTest.java
index 45a8d7cd6c10cedbbf586be631d19cadb2aa2318..29f146af44b2edbc69f5a6df4610632cc11ad69a 100644
--- a/logback-core/src/test/java/ch/qos/logback/core/net/PackageTest.java
+++ b/logback-core/src/test/java/ch/qos/logback/core/net/PackageTest.java
@@ -17,7 +17,7 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
 @RunWith(Suite.class)
-@Suite.SuiteClasses({ AbstractSocketAppenderTest.class, DefaultSocketConnectorTest.class, AbstractSSLSocketAppenderTest.class,
+@Suite.SuiteClasses({ DefaultSocketConnectorTest.class, AbstractSSLSocketAppenderTest.class,
         ch.qos.logback.core.net.server.PackageTest.class, ch.qos.logback.core.net.ssl.PackageTest.class })
 public class PackageTest {
 }
diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html
index df4162c5a2abefd51ea4601bec2e08e7a08b9862..4899968d730d05a38077c992e440bc9781ae24e0 100755
--- a/logback-site/src/site/pages/news.html
+++ b/logback-site/src/site/pages/news.html
@@ -40,6 +40,10 @@
     href="https://jira.qos.ch/browse/LOGBACK-1247">LOGBACK-1247</a> by
     Jakob Bergendahl who also provided the relevant pull request.
     </p>
+
+    <p>Removed <code>JMSQueueAppender</code> and
+    <code>JMSTopicAppender</code>. These appenders were undocumented
+    and had no apparent users.</p>
     
     <p>Remove comment in logback-classic's
     <code>META-INF/services/javax.servlet.ServletContainerInitializer</code>
diff --git a/pom.xml b/pom.xml
index 72e7fe3b13b39fca3c61cfeda7f7f28b7c598c3a..484833020f1a9dc6648f17427f59e397b1be7050 100755
--- a/pom.xml
+++ b/pom.xml
@@ -190,11 +190,6 @@
         <artifactId>jetty-server</artifactId>
         <version>${jetty.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jms_1.1_spec</artifactId>
-        <version>1.0</version>
-      </dependency>
 
       <dependency>
         <groupId>javax.servlet</groupId>
@@ -211,7 +206,7 @@
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-core</artifactId>
-        <version>1.10.19</version>
+        <version>2.7.9</version>
       </dependency>
     </dependencies>
   </dependencyManagement>