diff --git a/bbb-video/build.gradle b/bbb-video/build.gradle index e0e4166fc0e6ff5d5aad0d3d033b6717bb795ef5..a1b0f2e0b08167435d92a00132d4e3b77d409a3d 100755 --- a/bbb-video/build.gradle +++ b/bbb-video/build.gradle @@ -69,26 +69,27 @@ dependencies { providedCompile 'org.apache.mina:mina-integration-jmx:2.0.8@jar' // Spring - providedCompile 'org.springframework:spring-web:4.0.7.RELEASE@jar' + providedCompile 'org.springframework:spring-web:4.0.8.RELEASE@jar' providedCompile 'org.springframework:spring-beans:4.0.7.RELEASE@jar' providedCompile 'org.springframework:spring-context:4.0.7.RELEASE@jar' providedCompile 'org.springframework:spring-core:4.0.7.RELEASE@jar' // Red5 - providedCompile 'org/red5:red5-server:1.0.4-SNAPSHOT@jar' - providedCompile 'org.red5:red5-io:1.0.4-SNAPSHOT@jar' + providedCompile 'org/red5:red5-server:1.0.4-RELEASE@jar' + providedCompile 'org.red5:red5-io:1.0.4-RELEASE@jar' + providedCompile 'org/red5:red5-server-common:1.0.4-RELEASE@jar' // Logging providedCompile 'ch.qos.logback:logback-core:1.1.2@jar' providedCompile 'ch.qos.logback:logback-classic:1.1.2@jar' - providedCompile 'org.slf4j:log4j-over-slf4j:1.7.7@jar' - providedCompile 'org.slf4j:jcl-over-slf4j:1.7.7@jar' - providedCompile 'org.slf4j:jul-to-slf4j:1.7.7@jar' - providedCompile 'org.slf4j:slf4j-api:1.7.7@jar' + providedCompile 'org.slf4j:log4j-over-slf4j:1.7.9@jar' + providedCompile 'org.slf4j:jcl-over-slf4j:1.7.9@jar' + providedCompile 'org.slf4j:jul-to-slf4j:1.7.9@jar' + providedCompile 'org.slf4j:slf4j-api:1.7.9@jar' // Needed for the JVM shutdown hook but needs to be put into red5/lib dir. // Otherwise we get exception on aop utils class not found. - providedCompile 'org.springframework:spring-aop:4.0.7.RELEASE@jar' + providedCompile 'org.springframework:spring-aop:4.0.8.RELEASE@jar' compile 'aopalliance:aopalliance:1.0@jar' // Java Concurrency In Practice diff --git a/bbb-voice/build.gradle b/bbb-voice/build.gradle index 396de936e077ad2ccd6452281453a91606889725..01a7103b4a82cd1663caa3733b3d833198ebf6a6 100755 --- a/bbb-voice/build.gradle +++ b/bbb-voice/build.gradle @@ -69,26 +69,27 @@ dependencies { providedCompile 'org.apache.mina:mina-integration-jmx:2.0.8@jar' // Spring - providedCompile 'org.springframework:spring-web:4.0.7.RELEASE@jar' - providedCompile 'org.springframework:spring-beans:4.0.7.RELEASE@jar' - providedCompile 'org.springframework:spring-context:4.0.7.RELEASE@jar' - providedCompile 'org.springframework:spring-core:4.0.7.RELEASE@jar' + providedCompile 'org.springframework:spring-web:4.0.8.RELEASE@jar' + providedCompile 'org.springframework:spring-beans:4.0.8.RELEASE@jar' + providedCompile 'org.springframework:spring-context:4.0.8.RELEASE@jar' + providedCompile 'org.springframework:spring-core:4.0.8.RELEASE@jar' // Red5 - providedCompile 'org/red5:red5-server:1.0.4-SNAPSHOT@jar' - providedCompile 'org.red5:red5-io:1.0.4-SNAPSHOT@jar' - + providedCompile 'org/red5:red5-server:1.0.4-RELEASE@jar' + providedCompile 'org.red5:red5-io:1.0.4-RELEASE@jar' + providedCompile 'org/red5:red5-server-common:1.0.4-RELEASE@jar' + // Logging providedCompile 'ch.qos.logback:logback-core:1.1.2@jar' providedCompile 'ch.qos.logback:logback-classic:1.1.2@jar' - providedCompile 'org.slf4j:log4j-over-slf4j:1.7.7@jar' - providedCompile 'org.slf4j:jcl-over-slf4j:1.7.7@jar' - providedCompile 'org.slf4j:jul-to-slf4j:1.7.7@jar' - providedCompile 'org.slf4j:slf4j-api:1.7.7@jar' + providedCompile 'org.slf4j:log4j-over-slf4j:1.7.9@jar' + providedCompile 'org.slf4j:jcl-over-slf4j:1.7.9@jar' + providedCompile 'org.slf4j:jul-to-slf4j:1.7.9@jar' + providedCompile 'org.slf4j:slf4j-api:1.7.9@jar' // Needed for the JVM shutdown hook but needs to be put into red5/lib dir. // Otherwise we get exception on aop utils class not found. - providedCompile 'org.springframework:spring-aop:4.0.7.RELEASE@jar' + providedCompile 'org.springframework:spring-aop:4.0.8.RELEASE@jar' compile 'aopalliance:aopalliance:1.0@jar' // Java Concurrency In Practice diff --git a/bigbluebutton-apps/build.gradle b/bigbluebutton-apps/build.gradle index 377dd28830e74873d1414ac39f2cc2afe5690111..563b191d5f4260fafe0a1eb954808390354d45ce 100755 --- a/bigbluebutton-apps/build.gradle +++ b/bigbluebutton-apps/build.gradle @@ -67,21 +67,22 @@ dependencies { providedCompile 'org.apache.mina:mina-integration-jmx:2.0.8@jar' // Spring - providedCompile 'org.springframework:spring-web:4.0.7.RELEASE@jar' - providedCompile 'org.springframework:spring-beans:4.0.7.RELEASE@jar' - providedCompile 'org.springframework:spring-context:4.0.7.RELEASE@jar' - providedCompile 'org.springframework:spring-core:4.0.7.RELEASE@jar' + providedCompile 'org.springframework:spring-web:4.0.8.RELEASE@jar' + providedCompile 'org.springframework:spring-beans:4.0.8.RELEASE@jar' + providedCompile 'org.springframework:spring-context:4.0.8.RELEASE@jar' + providedCompile 'org.springframework:spring-core:4.0.8.RELEASE@jar' // Red5 - providedCompile 'org/red5:red5-server:1.0.4-SNAPSHOT@jar' + providedCompile 'org/red5:red5-server:1.0.4-RELEASE@jar' + providedCompile 'org/red5:red5-server-common:1.0.4-RELEASE@jar' // Logging providedCompile 'ch.qos.logback:logback-core:1.1.2@jar' providedCompile 'ch.qos.logback:logback-classic:1.1.2@jar' - providedCompile 'org.slf4j:log4j-over-slf4j:1.7.7@jar' - providedCompile 'org.slf4j:jcl-over-slf4j:1.7.7@jar' - providedCompile 'org.slf4j:jul-to-slf4j:1.7.7@jar' - providedCompile 'org.slf4j:slf4j-api:1.7.7@jar' + providedCompile 'org.slf4j:log4j-over-slf4j:1.7.9@jar' + providedCompile 'org.slf4j:jcl-over-slf4j:1.7.9@jar' + providedCompile 'org.slf4j:jul-to-slf4j:1.7.9@jar' + providedCompile 'org.slf4j:slf4j-api:1.7.9@jar' compile "redis.clients:jedis:2.1.0" compile "org.codehaus.jackson:jackson-core-asl:$jacksonVersion" diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java index 371b8d2b296390fd64d926cb4a3053af4f5e0202..6daf37f176b7bd8170c60643325e3bf75857c7b2 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java @@ -22,7 +22,6 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; import java.util.Set; -import org.red5.server.api.Red5; import org.bigbluebutton.conference.meeting.messaging.red5.ConnectionInvokerService; import org.bigbluebutton.conference.service.recorder.RecorderApplication; import org.bigbluebutton.core.api.IBigBlueButtonInGW; @@ -31,9 +30,10 @@ import org.red5.server.adapter.IApplication; import org.red5.server.adapter.MultiThreadedApplicationAdapter; import org.red5.server.api.IClient; import org.red5.server.api.IConnection; -import org.red5.server.api.IContext; +import org.red5.server.api.Red5; import org.red5.server.api.scope.IScope; import org.slf4j.Logger; + import com.google.gson.Gson; public class BigBlueButtonApplication extends MultiThreadedApplicationAdapter { diff --git a/deskshare/app/build.gradle b/deskshare/app/build.gradle index 6baef85baa0b94169d8fa358f7bdd2cea84f6d52..532eaba930ea8fec01127a2921387d6eb8e331cf 100755 --- a/deskshare/app/build.gradle +++ b/deskshare/app/build.gradle @@ -75,27 +75,28 @@ dependencies { providedCompile 'org.apache.mina:mina-integration-jmx:2.0.8@jar' // Spring - providedCompile 'org.springframework:spring-web:4.0.7.RELEASE@jar' - providedCompile 'org.springframework:spring-beans:4.0.7.RELEASE@jar' - providedCompile 'org.springframework:spring-context:4.0.7.RELEASE@jar' - providedCompile 'org.springframework:spring-core:4.0.7.RELEASE@jar' + providedCompile 'org.springframework:spring-web:4.0.8.RELEASE@jar' + providedCompile 'org.springframework:spring-beans:4.0.8.RELEASE@jar' + providedCompile 'org.springframework:spring-context:4.0.8.RELEASE@jar' + providedCompile 'org.springframework:spring-core:4.0.8.RELEASE@jar' // Red5 - providedCompile 'org/red5:red5-server:1.0.4-SNAPSHOT@jar' - providedCompile 'org.red5:red5-io:1.0.4-SNAPSHOT@jar' + providedCompile 'org/red5:red5-server:1.0.4-RELEASE@jar' + providedCompile 'org.red5:red5-io:1.0.4-RELEASE@jar' + providedCompile 'org/red5:red5-server-common:1.0.4-RELEASE@jar' // Logging providedCompile 'ch.qos.logback:logback-core:1.1.2@jar' providedCompile 'ch.qos.logback:logback-classic:1.1.2@jar' - providedCompile 'org.slf4j:log4j-over-slf4j:1.7.7@jar' - providedCompile 'org.slf4j:jcl-over-slf4j:1.7.7@jar' - providedCompile 'org.slf4j:jul-to-slf4j:1.7.7@jar' - providedCompile 'org.slf4j:slf4j-api:1.7.7@jar' + providedCompile 'org.slf4j:log4j-over-slf4j:1.7.9@jar' + providedCompile 'org.slf4j:jcl-over-slf4j:1.7.9@jar' + providedCompile 'org.slf4j:jul-to-slf4j:1.7.9@jar' + providedCompile 'org.slf4j:slf4j-api:1.7.9@jar' // Needed for the JVM shutdown hook but needs to be put into red5/lib dir. // Otherwise we get exception on aop utils class not found. - providedCompile 'org.springframework:spring-aop:4.0.7.RELEASE@jar' + providedCompile 'org.springframework:spring-aop:4.0.8.RELEASE@jar' providedCompile 'aopalliance:aopalliance:1.0@jar' // Testing diff --git a/deskshare/build.gradle b/deskshare/build.gradle index ec2c584c31a5a60a45911b5e991c720fed9792c6..c932e0b49c1527054e03404837627e9e3fb043c3 100755 --- a/deskshare/build.gradle +++ b/deskshare/build.gradle @@ -73,26 +73,27 @@ dependencies { compile 'org.apache.mina:mina-integration-jmx:2.0.8@jar' // Spring - compile 'org.springframework:spring-web:4.0.7.RELEASE@jar' - compile 'org.springframework:spring-beans:4.0.7.RELEASE@jar' - compile 'org.springframework:spring-context:4.0.7.RELEASE@jar' - compile 'org.springframework:spring-core:4.0.7.RELEASE@jar' + compile 'org.springframework:spring-web:4.0.8.RELEASE@jar' + compile 'org.springframework:spring-beans:4.0.8.RELEASE@jar' + compile 'org.springframework:spring-context:4.0.8.RELEASE@jar' + compile 'org.springframework:spring-core:4.0.8.RELEASE@jar' // Red5 - compile 'org/red5:red5-server:1.0.4-SNAPSHOT@jar' - compile 'org.red5:red5-io:1.0.4-SNAPSHOT@jar' + compile 'org/red5:red5-server:1.0.4-RELEASE@jar' + compile 'org.red5:red5-io:1.0.4-RELEASE@jar' + compile 'org/red5:red5-server-common:1.0.4-RELEASE@jar' // Logging compile 'ch.qos.logback:logback-core:1.1.2@jar' compile 'ch.qos.logback:logback-classic:1.1.2@jar' - compile 'org.slf4j:log4j-over-slf4j:1.7.7@jar' - compile 'org.slf4j:jcl-over-slf4j:1.7.7@jar' - compile 'org.slf4j:jul-to-slf4j:1.7.7@jar' - compile 'org.slf4j:slf4j-api:1.7.7@jar' + compile 'org.slf4j:log4j-over-slf4j:1.7.9@jar' + compile 'org.slf4j:jcl-over-slf4j:1.7.9@jar' + compile 'org.slf4j:jul-to-slf4j:1.7.9@jar' + compile 'org.slf4j:slf4j-api:1.7.9@jar' // Needed for the JVM shutdown hook but needs to be put into red5/lib dir. // Otherwise we get exception on aop utils class not found. - compile 'org.springframework:spring-aop:4.0.7.RELEASE@jar' + compile 'org.springframework:spring-aop:4.0.8.RELEASE@jar' compile 'aopalliance:aopalliance:1.0@jar' // Testing