Fixed build

auxor · Oct 21, 2014 · 404bb93 · 404bb93
1 parent a167415
commit 404bb93
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -6,12 +6,10 @@ https://github.com/4thline/cling/blob/master/distribution/src/dist/README.txt
 Building Cling
 ---------------------
 
-* Install Maven 3.1.1 or newer.
+* Install Maven 3.2.3 or newer.
 
 * Install the Android SDK and set the ANDROID_HOME environment variable to the SDK install directory.
 
-* Copy the Android SDK's Maven extras `$ANDROID_HOME/extras/android/m2repository` to your local Maven repository `~/.m2`.
-
 * Clone the Cling source:
 
 ````

diff --git a/core/src/test/java/example/registry/RegistryListenerTest.java b/core/src/test/java/example/registry/RegistryListenerTest.java
@@ -30,6 +30,7 @@
 import org.fourthline.cling.registry.Registry;
 import org.fourthline.cling.test.data.SampleData;
 import org.testng.annotations.Test;
+import org.xml.sax.SAXParseException;
 
 import static org.testng.Assert.assertEquals;
 
@@ -166,9 +167,10 @@ public StreamResponseMessage[] getStreamResponseMessages() {
                         }
                         return new StreamResponseMessage[]{
                             new StreamResponseMessage(deviceDescriptorXML, ContentTypeHeader.DEFAULT_CONTENT_TYPE_UTF8),
-                            null,
-                            null,
-                            null // Don't return any service descriptors, make it fail
+                            new StreamResponseMessage(
+                                "<?xml>THIS SHOULD BE SERVER DESCRIPTOR XML, BUT WE WANT IT TO FAIL WITH SAXParseException.",
+                                ContentTypeHeader.DEFAULT_CONTENT_TYPE_UTF8
+                            ),
                         };
                     }
                 };
@@ -212,7 +214,8 @@ public class FailureQuickstartRegistryListener extends DefaultRegistryListener {
 
         @Override
         public void remoteDeviceDiscoveryFailed(Registry registry, RemoteDevice device, Exception ex) {
-            valid = true;
+            if(ex.getCause() instanceof SAXParseException)
+                valid = true;
         }
     }
 

diff --git a/pom.xml b/pom.xml
@@ -77,17 +77,12 @@
         <jetty.version>8.1.8.v20121106</jetty.version>
         <cdi.api.version>1.0-SP4</cdi.api.version>
         <ejb.api.version>3.0</ejb.api.version>
-        <servlet.api.version>2.5</servlet.api.version>
-        <resteasy.version>2.0.1.GA</resteasy.version>
         <slf4j.version>1.6.1</slf4j.version>
-        <slf4j.bridge.version>1.5.11</slf4j.bridge.version>
         <jna.version>3.2.5</jna.version>
         <gstreamer.version>1.4</gstreamer.version>
         <args4j.version>2.0.12</args4j.version>
         <weld.version>1.1.10.Final</weld.version>
         <javassist.version>3.14.0-GA</javassist.version>
-        <commons.codec.version>1.4</commons.codec.version>
-        <commons.logging.version>1.1.1</commons.logging.version>
         <kxml.version>2.3.0</kxml.version>
 
     </properties>