BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Match red5 application dependencies to the currently installed version.

Browse Source
This commit is contained in:
Ghazi Triki 2018-11-23 11:09:36 -02:00
parent d8588da28a
commit 6b6d35ceb2
8 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bbb-screenshare/app/deploy.sh
View File

@ -18,7 +18,7 @@ sudo cp target/webapp/WEB-INF/lib/bbb-screenshare-akka_2.12-0.0.3.jar \
target/webapp/WEB-INF/lib/config-1.3.3.jar \
target/webapp/WEB-INF/lib/gson-2.8.5.jar \
target/webapp/WEB-INF/lib/commons-pool2-2.6.0.jar \
target/webapp/WEB-INF/lib/spring-webmvc-4.3.20.RELEASE.jar \
target/webapp/WEB-INF/lib/spring-webmvc-4.3.12.RELEASE.jar \
target/webapp/WEB-INF/lib/rediscala_2.12-1.8.0.jar \
target/webapp/WEB-INF/lib/bbb-common-message_2.12-0.0.20-SNAPSHOT.jar \
target/webapp/WEB-INF/lib/lettuce-core-5.1.2.RELEASE.jar \

4
bbb-screenshare/app/project/Dependencies.scala
View File

@ -16,14 +16,14 @@ object Dependencies {
val gson = "2.8.5"
val jackson = "2.9.7"
val logback = "1.2.3"
val springVersion = "4.3.20.RELEASE"
val springVersion = "4.3.12.RELEASE"
val red5 = "1.0.10-M5"
val servlet = "2.5"
val ffmpeg = "4.0.2-1.4.3"
val openCv = "1.4.3"
// Apache Commons
val lang = "3.8.1"
val lang = "3.7"
val codec = "1.11"
val pool2 = "2.6.0"

12
bbb-video/build.gradle
View File

@ -34,10 +34,10 @@ dependencies {
providedCompile 'org.apache.mina:mina-integration-jmx:2.0.17@jar'
// Spring
providedCompile 'org.springframework:spring-web:4.3.20.RELEASE@jar'
providedCompile 'org.springframework:spring-beans:4.3.20.RELEASE@jar'
providedCompile 'org.springframework:spring-context:4.3.20.RELEASE@jar'
providedCompile 'org.springframework:spring-core:4.3.20.RELEASE@jar'
providedCompile 'org.springframework:spring-web:4.3.12.RELEASE@jar'
providedCompile 'org.springframework:spring-beans:4.3.12.RELEASE@jar'
providedCompile 'org.springframework:spring-context:4.3.12.RELEASE@jar'
providedCompile 'org.springframework:spring-core:4.3.12.RELEASE@jar'
// Red5
providedCompile 'org.red5:red5-server:1.0.10-M5@jar'
@ -54,14 +54,14 @@ dependencies {
// 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.3.20.RELEASE@jar'
providedCompile 'org.springframework:spring-aop:4.3.12.RELEASE@jar'
compile 'aopalliance:aopalliance:1.0@jar'
//redis
compile 'org.apache.commons:commons-pool2:2.6.0'
compile 'com.google.code.gson:gson:2.8.5'
compile 'org.apache.commons:commons-lang3:3.8.1'
providedCompile 'org.apache.commons:comcommons-lang3mons-lang3:3.7'
compile 'org.bigbluebutton:bbb-common-message_2.12:0.0.20-SNAPSHOT'
}

2
bbb-video/src/main/webapp/WEB-INF/bbb-redis-messaging.xml
View File

@ -59,8 +59,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
init-method="start" destroy-method="stop">
<property name="host" value="${redis.host}" />
<property name="port" value="${redis.port}" />
<property name="clientName" value="BbbRed5VideoSender" />
<property name="password" value="${redis.password:}" />
<property name="clientName" value="BbbRed5VideoSender" />
</bean>
<bean id="redisPublisher" class="org.bigbluebutton.red5.pubsub.MessagePublisher">

4
bbb-video/src/main/webapp/WEB-INF/red5-web.xml
View File

@ -35,8 +35,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
</property>
</bean>
<import resource="bbb-redis-messaging.xml"/>
<bean id="meetingManager" class="org.bigbluebutton.app.video.MeetingManager"/>
<bean id="connInvokerService" class="org.bigbluebutton.app.video.ConnectionInvokerService"
@ -61,5 +59,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<property name="meetingManager" ref="meetingManager"/>
<property name="connInvokerService" ref="connInvokerService"/>
</bean>
<import resource="bbb-redis-messaging.xml"/>
</beans>

1
bbb-video/src/main/webapp/WEB-INF/web.xml
View File

@ -29,7 +29,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<param-name>webAppRootKey</param-name>
<param-value>/video</param-value>
</context-param>
<listener>
<listener-class>org.red5.logging.ContextLoggingListener</listener-class>

12
bbb-voice/build.gradle
View File

@ -34,10 +34,10 @@ dependencies {
providedCompile 'org.apache.mina:mina-integration-jmx:2.0.17@jar'
// Spring
providedCompile 'org.springframework:spring-web:4.3.20.RELEASE@jar'
providedCompile 'org.springframework:spring-beans:4.3.20.RELEASE@jar'
providedCompile 'org.springframework:spring-context:4.3.20.RELEASE@jar'
providedCompile 'org.springframework:spring-core:4.3.20.RELEASE@jar'
providedCompile 'org.springframework:spring-web:4.3.12.RELEASE@jar'
providedCompile 'org.springframework:spring-beans:4.3.12.RELEASE@jar'
providedCompile 'org.springframework:spring-context:4.3.12.RELEASE@jar'
providedCompile 'org.springframework:spring-core:4.3.12.RELEASE@jar'
// Red5
providedCompile 'org.red5:red5-server:1.0.10-M5@jar'
@ -54,14 +54,14 @@ dependencies {
// 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.3.20.RELEASE@jar'
providedCompile 'org.springframework:spring-aop:4.3.12.RELEASE@jar'
compile 'aopalliance:aopalliance:1.0@jar'
//redis
compile 'org.apache.commons:commons-pool2:2.6.0'
compile 'com.google.code.gson:gson:2.8.5'
compile 'org.apache.commons:commons-lang3:3.8.1'
providedCompile 'org.apache.commons:commons-lang3:3.7'
compile 'org.bigbluebutton:bbb-common-message_2.12:0.0.20-SNAPSHOT'
}

12
bigbluebutton-apps/build.gradle
View File

@ -38,10 +38,10 @@ dependencies {
providedCompile 'org.apache.mina:mina-integration-jmx:2.0.17@jar'
// Spring
providedCompile 'org.springframework:spring-web:4.3.20.RELEASE@jar'
providedCompile 'org.springframework:spring-beans:4.3.20.RELEASE@jar'
providedCompile 'org.springframework:spring-context:4.3.20.RELEASE@jar'
providedCompile 'org.springframework:spring-core:4.3.20.RELEASE@jar'
providedCompile 'org.springframework:spring-web:4.3.12.RELEASE@jar'
providedCompile 'org.springframework:spring-beans:4.3.12.RELEASE@jar'
providedCompile 'org.springframework:spring-context:4.3.12.RELEASE@jar'
providedCompile 'org.springframework:spring-core:4.3.12.RELEASE@jar'
// Red5
providedCompile 'org.red5:red5-server:1.0.10-M5@jar'
@ -58,7 +58,7 @@ dependencies {
// 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.3.20.RELEASE@jar'
providedCompile 'org.springframework:spring-aop:4.3.12.RELEASE@jar'
compile 'aopalliance:aopalliance:1.0@jar'
// Testing
@ -68,7 +68,7 @@ dependencies {
compile 'org.apache.commons:commons-pool2:2.6.0'
compile 'com.google.code.gson:gson:2.8.5'
providedCompile 'org.apache.commons:commons-lang3:3.8.1'
providedCompile 'org.apache.commons:commons-lang3:3.7'
compile 'org.bigbluebutton:bbb-common-message_2.12:0.0.20-SNAPSHOT'
compile 'org.bigbluebutton:bbb-apps-common_2.12:0.0.4-SNAPSHOT'