Permalink
Browse files

New version and dependency upgrades, fixes #243

  • Loading branch information...
christianbauer committed Oct 5, 2018
1 parent d29bc3f commit c1a9b8bf37a36a45b9924902179f9b23950b7340
View
@@ -27,7 +27,7 @@ Then [download the Cling distribution](https://github.com/4thline/cling/releases
<dependency>
<groupId>org.fourthline.cling</groupId>
<artifactId>cling-core</artifactId>
<version>2.1.1</version>
<version>2.1.2</version>
</dependency>
</dependencies>
```
@@ -96,7 +96,7 @@ If your build fails with Android/dex packaging errors, you forgot the clean.
<dependency>
<groupId>org.fourthline.cling</groupId>
<artifactId>cling-core</artifactId>
<version>2.1.2-SNAPSHOT</version>
<version>2.1.2</version>
</dependency>
</dependencies>
````
@@ -105,8 +105,8 @@ Building OS X Workbench DMG
---
hdiutil create -srcfolder \
workbench/target/cling-workbench-2.1.2-SNAPSHOT/Cling\ Workbench.app \
workbench/target/cling-workbench-2.1.2-SNAPSHOT/Cling\ Workbench.dmg
workbench/target/cling-workbench-2.1.2/Cling\ Workbench.app \
workbench/target/cling-workbench-2.1.2/Cling\ Workbench.dmg
Publishing a release
--------------------
@@ -118,7 +118,7 @@ Update Maven repository:
````
mvn clean install
mvn deploy
mvn clean deploy -DskipTests
````
## Projects and applications using Cling
View
@@ -7,7 +7,7 @@
<parent>
<groupId>org.fourthline.cling</groupId>
<artifactId>cling</artifactId>
<version>2.1.2-SNAPSHOT</version>
<version>2.1.2</version>
</parent>
<name>Cling Core</name>
@@ -92,7 +92,7 @@
<dependency>
<groupId>org.fourthline.cling</groupId>
<artifactId>cling-core</artifactId>
<version>2.1.2-SNAPSHOT</version>
<version>2.1.2</version>
</dependency>
</dependencies>]]></pre>
@@ -178,7 +178,7 @@ protected void invalidMessage(RemoteGENASubscription sub,
service.getManager().getPropertyChangeSupport().firePropertyChange("Status", false, true);
assertEquals(callback.getSubscription().getCurrentSequence().getValue(), Long.valueOf(2)); // It's the NEXT sequence!
assert callback.getSubscription().getSubscriptionId().startsWith("uuid:");
assertTrue(callback.getSubscription().getSubscriptionId().startsWith("uuid:"));
// Actually, the local subscription we are testing here has an "unlimited" duration
assertEquals(callback.getSubscription().getActualDurationSeconds(), Integer.MAX_VALUE);
@@ -187,7 +187,7 @@ protected void invalidMessage(RemoteGENASubscription sub,
assertEquals(testAssertions.size(), 4);
for (Boolean testAssertion : testAssertions) {
assert testAssertion;
assertTrue(testAssertion);
}
assertEquals(upnpService.getRouter().getSentStreamRequestMessages().size(), 0);
@@ -39,7 +39,6 @@
import org.fourthline.cling.model.types.UnsignedIntegerFourBytes;
import org.fourthline.cling.protocol.ProtocolCreationException;
import org.fourthline.cling.test.data.SampleData;
import org.fourthline.cling.transport.RouterException;
import org.seamless.util.URIUtil;
import org.testng.annotations.Test;
@@ -49,7 +48,7 @@
import java.util.List;
import java.util.concurrent.Semaphore;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.*;
public class OutgoingSubscriptionLifecycleTest {
@@ -98,7 +97,7 @@ public void established(GENASubscription subscription) {
@Override
public void ended(GENASubscription subscription, CancelReason reason, UpnpResponse responseStatus) {
assert reason == null;
assertNull(reason);
assertEquals(responseStatus.getStatusCode(), UpnpResponse.Status.OK.getStatusCode());
testAssertions.add(true);
}
@@ -119,7 +118,7 @@ public void eventsMissed(GENASubscription subscription, int numberOfMissedEvents
// Subscription process OK?
for (Boolean testAssertion : testAssertions) {
assert testAssertion;
assertTrue(testAssertion);
}
// Simulate received event
@@ -136,11 +135,11 @@ public void eventsMissed(GENASubscription subscription, int numberOfMissedEvents
callback.end();
assert callback.getSubscription() == null;
assertNull(callback.getSubscription());
assertEquals(testAssertions.size(), 3);
for (Boolean testAssertion : testAssertions) {
assert testAssertion;
assertTrue(testAssertion);
}
List<StreamRequestMessage> sentMessages = upnpService.getRouter().getSentStreamRequestMessages();
@@ -302,7 +301,7 @@ public void run() {
assertEquals(1, notificationCalled.size());
for (Boolean testAssertion : testAssertions) {
assert testAssertion;
assertTrue(testAssertion);
}
}
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fourthline.cling</groupId>
<artifactId>cling-demo-android</artifactId>
<version>2.1.2-SNAPSHOT</version>
<version>2.1.2</version>
</parent>
<name>Cling Demo Android Browser</name>
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fourthline.cling</groupId>
<artifactId>cling-demo-android</artifactId>
<version>2.1.2-SNAPSHOT</version>
<version>2.1.2</version>
</parent>
<name>Cling Demo Android Light</name>
View
@@ -6,7 +6,7 @@
<parent>
<groupId>org.fourthline.cling</groupId>
<artifactId>cling-demo</artifactId>
<version>2.1.2-SNAPSHOT</version>
<version>2.1.2</version>
</parent>
<name>Cling Demo Android</name>
View
@@ -7,7 +7,7 @@
<parent>
<groupId>org.fourthline.cling</groupId>
<artifactId>cling</artifactId>
<version>2.1.2-SNAPSHOT</version>
<version>2.1.2</version>
</parent>
<name>Cling Demo</name>
View
@@ -7,7 +7,7 @@
<parent>
<artifactId>cling</artifactId>
<groupId>org.fourthline.cling</groupId>
<version>2.1.2-SNAPSHOT</version>
<version>2.1.2</version>
</parent>
<name>Cling Distribution</name>
@@ -57,24 +57,24 @@ DEPENDENCIES
Required dependencies of Cling Core (included with this distribution):
+- org.fourthline.cling:cling-core:jar:2.1.2-SNAPSHOT
+- org.seamless:seamless-util:jar:1.1.1
+- org.seamless:seamless-http:jar:1.1.1
\- org.seamless:seamless-xml:jar:1.1.1
+- org.fourthline.cling:cling-core:jar:2.1.2
+- org.seamless:seamless-util:jar:1.1.2
+- org.seamless:seamless-http:jar:1.1.2
\- org.seamless:seamless-xml:jar:1.1.2
Additional dependencies of Cling Core on Android (not included):
+- org.eclipse.jetty:jetty-server:jar:8.1.8.v20121106
+- org.eclipse.jetty:jetty-server:jar:8.1.22.v20160922
| +- org.eclipse.jetty.orbit:javax.servlet:jar:3.0.0.v201112011016
| +- org.eclipse.jetty:jetty-continuation:jar:8.1.8.v20121106
| \- org.eclipse.jetty:jetty-http:jar:8.1.8.v20121106
| \- org.eclipse.jetty:jetty-io:jar:8.1.8.v20121106
| \- org.eclipse.jetty:jetty-util:jar:8.1.8.v20121106
+- org.eclipse.jetty:jetty-servlet:jar:8.1.8.v20121106
| \- org.eclipse.jetty:jetty-security:jar:8.1.8.v20121106
+- org.eclipse.jetty:jetty-client:jar:8.1.8.v20121106
+- org.slf4j:slf4j-jdk14:jar:1.6.1 (or any other SLF4J implementation)
\- org.slf4j:slf4j-api:jar:1.6.1
| +- org.eclipse.jetty:jetty-continuation:jar:8.1.22.v20160922
| \- org.eclipse.jetty:jetty-http:jar:8.1.22.v20160922
| \- org.eclipse.jetty:jetty-io:jar:8.1.22.v20160922
| \- org.eclipse.jetty:jetty-util:jar:8.1.22.v20160922
+- org.eclipse.jetty:jetty-servlet:jar:8.1.22.v20160922
| \- org.eclipse.jetty:jetty-security:jar:8.1.22.v20160922
+- org.eclipse.jetty:jetty-client:jar:8.1.22.v20160922
+- org.slf4j:slf4j-jdk14:jar:1.7.25 (or any other SLF4J implementation)
\- org.slf4j:slf4j-api:jar:1.7.25
WARNING: Jetty JAR files each contain an 'about.html' file, you will get
an error when trying to package your application with APK. Use the Android
View
@@ -7,7 +7,7 @@
<parent>
<groupId>org.fourthline.cling</groupId>
<artifactId>cling</artifactId>
<version>2.1.2-SNAPSHOT</version>
<version>2.1.2</version>
</parent>
<name>Cling MediaRenderer</name>
@@ -51,7 +51,7 @@ java -Djna.library.path=/usr/lib -jar cling-mediarenderer.jar</pre>
<ul>
<li>
<a href="http://www.4thline.org/m2/org/fourthline/cling/cling-mediarenderer/2.1.2-SNAPSHOT/cling-mediarenderer-2.1.2-SNAPSHOT-standalone.jar">JDK 1.6 desktop application (any OS)</a>
<a href="http://www.4thline.org/m2/org/fourthline/cling/cling-mediarenderer/2.1.2/cling-mediarenderer-2.1.2-standalone.jar">JDK 1.6 desktop application (any OS)</a>
</li>
<li>
<a href="http://www.4thline.org/projects/download/">Cling main distribution (incl. Cling Core library)</a>
View
@@ -26,7 +26,7 @@
<groupId>org.fourthline.cling</groupId>
<artifactId>cling</artifactId>
<packaging>pom</packaging>
<version>2.1.2-SNAPSHOT</version>
<version>2.1.2</version>
<modules>
<module>core</module>
@@ -73,7 +73,7 @@
<distributionManagement>
<repository>
<id>4thline.org</id>
<url>scpexe://4thline.org/webroot/vhosts/8080/4thline.org/m2/</url>
<url>scpexe://4thline/data/website/docroot/m2/</url>
</repository>
</distributionManagement>
@@ -84,7 +84,7 @@
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<seamless.version>1.1.1</seamless.version>
<seamless.version>1.1.2</seamless.version>
<lemma.version>1.1.1</lemma.version>
<testng.version>6.14.3</testng.version>
<android.version>4.1.1.4</android.version>
@@ -258,12 +258,11 @@
</pluginManagement>
<!-- Required for we-don't-care-about-compatibility-Maven3 'deploy' goal -->
<extensions>
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh-external</artifactId>
<version>1.0-beta-7</version>
<version>3.2.0</version>
</extension>
</extensions>
View
@@ -7,7 +7,7 @@
<parent>
<groupId>org.fourthline.cling</groupId>
<artifactId>cling</artifactId>
<version>2.1.2-SNAPSHOT</version>
<version>2.1.2</version>
</parent>
<name>Cling Support</name>
@@ -100,7 +100,7 @@
<dependency>
<groupId>org.fourthline.cling</groupId>
<artifactId>cling-support</artifactId>
<version>2.1.2-SNAPSHOT</version>
<version>2.1.2</version>
</dependency>
</dependencies>]]></pre>
View
@@ -7,7 +7,7 @@
<parent>
<artifactId>cling</artifactId>
<groupId>org.fourthline.cling</groupId>
<version>2.1.2-SNAPSHOT</version>
<version>2.1.2</version>
</parent>
<name>Cling Website</name>
@@ -19,7 +19,7 @@
</p>
<p>
The current release of Cling is <em>2.1.2-SNAPSHOT (xxxx-xx-xx)</em>: <a href="/projects/download/">Download</a>
The current release of Cling is <em>2.1.2 (xxxx-xx-xx)</em>: <a href="/projects/download/">Download</a>
</p>
<p>
View
@@ -7,7 +7,7 @@
<parent>
<groupId>org.fourthline.cling</groupId>
<artifactId>cling</artifactId>
<version>2.1.2-SNAPSHOT</version>
<version>2.1.2</version>
</parent>
<name>Cling Workbench</name>
@@ -28,7 +28,7 @@
<ul>
<li>
<a href="/m2/org/fourthline/cling/cling-workbench/2.1.2-SNAPSHOT/cling-workbench-2.1.2-SNAPSHOT-standalone.jar">JDK 1.6 desktop application (any OS)</a>
<a href="/m2/org/fourthline/cling/cling-workbench/2.1.2/cling-workbench-2.1.2-standalone.jar">JDK 1.6 desktop application (any OS)</a>
</li>
<li>
<a href="/projects/download/">Cling main distribution (incl. Cling Core library)</a>

0 comments on commit c1a9b8b

Please sign in to comment.