diff --git a/bbb-common-message/project/Dependencies.scala b/bbb-common-message/project/Dependencies.scala index c8d886208a730623e74fade96419511c92e62676..814cbc71cf62d6d8799f9db91fc582f086c8eb03 100644 --- a/bbb-common-message/project/Dependencies.scala +++ b/bbb-common-message/project/Dependencies.scala @@ -17,7 +17,7 @@ object Dependencies { val gson = "2.8.5" val jackson = "2.9.7" val sl4j = "1.7.25" - val red5 = "1.0.10-M5" + val red5 = "1.0.10-M9" val pool = "2.6.0" // Redis diff --git a/bbb-screenshare/app/project/Dependencies.scala b/bbb-screenshare/app/project/Dependencies.scala index 447f11e573748718d87aa46a0e05c95e78e7b0a1..28749e54ecb99990585a7eebc96d5c8c97bf8f15 100644 --- a/bbb-screenshare/app/project/Dependencies.scala +++ b/bbb-screenshare/app/project/Dependencies.scala @@ -17,7 +17,7 @@ object Dependencies { val jackson = "2.9.7" val logback = "1.2.3" val springVersion = "4.3.12.RELEASE" - val red5 = "1.0.10-M5" + val red5 = "1.0.10-M9" val servlet = "2.5" val ffmpeg = "4.0.2-1.4.3" val openCv = "1.4.3" diff --git a/bbb-video/build.gradle b/bbb-video/build.gradle index a174e2254606d89c26178d1069e5ac98cc8e2a12..78aa01e7b88cc37f9c7818b8189c5d7c80687e31 100755 --- a/bbb-video/build.gradle +++ b/bbb-video/build.gradle @@ -29,9 +29,9 @@ dependencies { providedCompile 'javax.servlet:servlet-api:2.5@jar' // Mina - providedCompile 'org.apache.mina:mina-core:2.0.17@jar' - providedCompile 'org.apache.mina:mina-integration-beans:2.0.17@jar' - providedCompile 'org.apache.mina:mina-integration-jmx:2.0.17@jar' + providedCompile 'org.apache.mina:mina-core:2.0.19@jar' + providedCompile 'org.apache.mina:mina-integration-beans:2.0.19@jar' + providedCompile 'org.apache.mina:mina-integration-jmx:2.0.19@jar' // Spring providedCompile 'org.springframework:spring-web:4.3.12.RELEASE@jar' @@ -40,9 +40,9 @@ dependencies { providedCompile 'org.springframework:spring-core:4.3.12.RELEASE@jar' // Red5 - providedCompile 'org.red5:red5-server:1.0.10-M5@jar' - providedCompile 'org.red5:red5-server-common:1.0.10-M5@jar' - providedCompile 'org.red5:red5-io:1.0.10-M5@jar' + providedCompile 'org.red5:red5-server:1.0.10-M9@jar' + providedCompile 'org.red5:red5-server-common:1.0.10-M9@jar' + providedCompile 'org.red5:red5-io:1.0.10-M9@jar' // Logging providedCompile 'ch.qos.logback:logback-core:1.2.3@jar' diff --git a/bbb-voice/build.gradle b/bbb-voice/build.gradle index 8828b83c349c1b22150e5d4b425191e86d16ee29..4e46e8040b25face30c3de8fea561c0e2b1b7f71 100755 --- a/bbb-voice/build.gradle +++ b/bbb-voice/build.gradle @@ -29,9 +29,9 @@ dependencies { providedCompile 'javax.servlet:servlet-api:2.5@jar' // Mina - providedCompile 'org.apache.mina:mina-core:2.0.17@jar' - providedCompile 'org.apache.mina:mina-integration-beans:2.0.17@jar' - providedCompile 'org.apache.mina:mina-integration-jmx:2.0.17@jar' + providedCompile 'org.apache.mina:mina-core:2.0.19@jar' + providedCompile 'org.apache.mina:mina-integration-beans:2.0.19@jar' + providedCompile 'org.apache.mina:mina-integration-jmx:2.0.19@jar' // Spring providedCompile 'org.springframework:spring-web:4.3.12.RELEASE@jar' @@ -40,9 +40,9 @@ dependencies { providedCompile 'org.springframework:spring-core:4.3.12.RELEASE@jar' // Red5 - providedCompile 'org.red5:red5-server:1.0.10-M5@jar' - providedCompile 'org.red5:red5-server-common:1.0.10-M5@jar' - providedCompile 'org.red5:red5-io:1.0.10-M5@jar' + providedCompile 'org.red5:red5-server:1.0.10-M9@jar' + providedCompile 'org.red5:red5-server-common:1.0.10-M9@jar' + providedCompile 'org.red5:red5-io:1.0.10-M9@jar' // Logging providedCompile 'ch.qos.logback:logback-core:1.2.3@jar' diff --git a/bigbluebutton-apps/build.gradle b/bigbluebutton-apps/build.gradle index df9dbcd3cf6a98e021ac262074a385a87b31a3ce..0433b262ca0540b0f0155674fb743dfbe3c9be60 100755 --- a/bigbluebutton-apps/build.gradle +++ b/bigbluebutton-apps/build.gradle @@ -33,9 +33,9 @@ dependencies { providedCompile 'javax.servlet:servlet-api:2.5@jar' // Mina - providedCompile 'org.apache.mina:mina-core:2.0.17@jar' - providedCompile 'org.apache.mina:mina-integration-beans:2.0.17@jar' - providedCompile 'org.apache.mina:mina-integration-jmx:2.0.17@jar' + providedCompile 'org.apache.mina:mina-core:2.0.19@jar' + providedCompile 'org.apache.mina:mina-integration-beans:2.0.19@jar' + providedCompile 'org.apache.mina:mina-integration-jmx:2.0.19@jar' // Spring providedCompile 'org.springframework:spring-web:4.3.12.RELEASE@jar' @@ -44,9 +44,9 @@ dependencies { providedCompile 'org.springframework:spring-core:4.3.12.RELEASE@jar' // Red5 - providedCompile 'org.red5:red5-server:1.0.10-M5@jar' - providedCompile 'org.red5:red5-server-common:1.0.10-M5@jar' - providedCompile 'org.red5:red5-io:1.0.10-M5@jar' + providedCompile 'org.red5:red5-server:1.0.10-M9@jar' + providedCompile 'org.red5:red5-server-common:1.0.10-M9@jar' + providedCompile 'org.red5:red5-io:1.0.10-M9@jar' // Logging providedCompile 'ch.qos.logback:logback-core:1.2.3@jar' diff --git a/video-broadcast/build.gradle b/video-broadcast/build.gradle index 9501c6e62a02489b98d1abf806c202d33609d433..88b40f6a86efff493d965864302f33d50393d9b1 100755 --- a/video-broadcast/build.gradle +++ b/video-broadcast/build.gradle @@ -22,9 +22,9 @@ dependencies { providedCompile 'javax.servlet:servlet-api:2.5@jar' // Mina - providedCompile 'org.apache.mina:mina-core:2.0.17@jar' - providedCompile 'org.apache.mina:mina-integration-beans:2.0.17@jar' - providedCompile 'org.apache.mina:mina-integration-jmx:2.0.17@jar' + providedCompile 'org.apache.mina:mina-core:2.0.19@jar' + providedCompile 'org.apache.mina:mina-integration-beans:2.0.19@jar' + providedCompile 'org.apache.mina:mina-integration-jmx:2.0.19@jar' // Spring providedCompile 'org.springframework:spring-web:4.3.12.RELEASE@jar' @@ -33,9 +33,9 @@ dependencies { providedCompile 'org.springframework:spring-core:4.3.12.RELEASE@jar' // Red5 - providedCompile 'org.red5:red5-server:1.0.10-M5@jar' - providedCompile 'org.red5:red5-server-common:1.0.10-M5@jar' - providedCompile 'org.red5:red5-io:1.0.10-M5@jar' + providedCompile 'org.red5:red5-server:1.0.10-M9@jar' + providedCompile 'org.red5:red5-server-common:1.0.10-M9@jar' + providedCompile 'org.red5:red5-io:1.0.10-M9@jar' // Logging providedCompile 'ch.qos.logback:logback-core:1.2.3@jar' @@ -62,7 +62,7 @@ dependencies { compile 'commons-pool:commons-pool:1.5.6' compile 'com.google.code.gson:gson:1.7.1' - compile 'org.bigbluebutton:bbb-common-message_2.12:0.0.19-SNAPSHOT' + compile 'org.bigbluebutton:bbb-common-message_2.12:0.0.20-SNAPSHOT' } diff --git a/video-broadcast/deploy.sh b/video-broadcast/deploy.sh new file mode 100755 index 0000000000000000000000000000000000000000..b7cab36a4bc4e2ff6e2b72d8bb9bf36079ce3149 --- /dev/null +++ b/video-broadcast/deploy.sh @@ -0,0 +1,10 @@ +#!/bin/bash +# deploying 'bigbluebutton-apps' to /usr/share/red5/webapps + +sudo chmod -R 777 /usr/share/red5/webapps/* + +gradle clean +gradle resolveDeps +gradle war deploy + +sudo chown -R red5:red5 /usr/share/red5/webapps diff --git a/video-broadcast/src/main/resources/logback-video.xml b/video-broadcast/src/main/resources/logback-video-broadcast.xml similarity index 100% rename from video-broadcast/src/main/resources/logback-video.xml rename to video-broadcast/src/main/resources/logback-video-broadcast.xml