Author: solomax
Date: Thu Jul 14 06:47:32 2016
New Revision: 1752590
URL: http://svn.apache.org/viewvc?rev=1752590&view=rev
Log:
[OPENMEETINGS-1373] red5 version is updated to 1.0.8-M4
Modified:
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
openmeetings/application/branches/3.2.x/openmeetings-server/pom.xml
openmeetings/application/branches/3.2.x/pom.xml
Modified:
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java?rev=1752590&r1=1752589&r2=1752590&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
Thu Jul 14 06:47:32 2016
@@ -151,7 +151,7 @@ public class CoreScreenShare implements
break;
case rtmps:
RTMPSScreenShare client = new
RTMPSScreenShare(this);
-
client.setKeystoreBytes(Hex.decodeHex(args[9].toCharArray()));
+ //NOT in use since 1.0.8-M3
client.setKeystoreBytes(Hex.decodeHex(args[9].toCharArray()));
client.setKeyStorePassword(args[10]);
instance = client;
break;
Modified: openmeetings/application/branches/3.2.x/openmeetings-server/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-server/pom.xml?rev=1752590&r1=1752589&r2=1752590&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-server/pom.xml
(original)
+++ openmeetings/application/branches/3.2.x/openmeetings-server/pom.xml Thu Jul
14 06:47:32 2016
@@ -129,7 +129,7 @@
<id>prepare-red5-server</id>
<activation>
<file>
-
<missing>red5-server/red5-server-1.0.8-M2.zip</missing> <!-- TODO should be
in-sync with global property -->
+
<missing>red5-server/red5-server-1.0.8-M4.zip</missing> <!-- TODO should be
in-sync with global property -->
</file>
</activation>
<build>
Modified: openmeetings/application/branches/3.2.x/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/pom.xml?rev=1752590&r1=1752589&r2=1752590&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/pom.xml (original)
+++ openmeetings/application/branches/3.2.x/pom.xml Thu Jul 14 06:47:32 2016
@@ -44,8 +44,8 @@
<wicket.version>7.3.0</wicket.version>
<wicketju.version>7.3.0</wicketju.version>
<wickets.version>7.3.0</wickets.version>
- <red5-server.version>1.0.8-M2</red5-server.version>
- <red5-client.version>1.0.8-M2</red5-client.version>
+ <red5-server.version>1.0.8-M4</red5-server.version>
+ <red5-client.version>1.0.8-M4</red5-client.version>
<commons-transaction.version>1.2</commons-transaction.version>
<ical4j.version>2.0-beta1</ical4j.version>
<cxf.version>3.1.6</cxf.version>
@@ -55,7 +55,7 @@
<site.basedir>${project.basedir}</site.basedir>
<skip.site.copy>true</skip.site.copy>
<src.pack.skip>false</src.pack.skip>
- <tomcat.version>8.0.35</tomcat.version>
+ <tomcat.version>8.0.36</tomcat.version>
<derby.version>10.12.1.1</derby.version>
</properties>
<modules>
