From cae165f2a92042b9c5781fe0fe26bed54278a2d3 Mon Sep 17 00:00:00 2001 From: Ghazi Triki Date: Wed, 9 Jan 2019 15:39:12 +0100 Subject: [PATCH] Update red5 app gradle version and build files. --- bbb-video/build.gradle | 119 ++++++++++++++------------- bbb-voice/build.gradle | 101 ++++++++++++----------- bigbluebutton-apps/build.gradle | 138 ++++++++++++++++---------------- 3 files changed, 186 insertions(+), 172 deletions(-) diff --git a/bbb-video/build.gradle b/bbb-video/build.gradle index 78aa01e7b88c..5f77a2c76b39 100755 --- a/bbb-video/build.gradle +++ b/bbb-video/build.gradle @@ -1,20 +1,24 @@ -apply plugin: 'java' -apply plugin: 'war' -apply plugin: 'eclipse' +plugins { + id 'java' + id 'war' + id 'eclipse' + id 'idea' +} -version = '0.9.0' +version = '0.10.0' jar.enabled = true -archivesBaseName = 'video' +archivesBaseName = 'video' task resolveDeps(type: Copy) { into('lib') from configurations.default from configurations.default.allArtifacts.file + doLast { println '[bbb:task] Resolved dependencies for video application' } } repositories { - mavenCentral() - mavenLocal() + jcenter() + mavenLocal() } configurations { @@ -25,59 +29,60 @@ configurations { } dependencies { - // Servlet - providedCompile 'javax.servlet:servlet-api:2.5@jar' - - // Mina - 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' - 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-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' - providedCompile 'ch.qos.logback:logback-classic:1.2.3@jar' - providedCompile 'org.slf4j:log4j-over-slf4j:1.7.25@jar' - providedCompile 'org.slf4j:jcl-over-slf4j:1.7.25@jar' - providedCompile 'org.slf4j:jul-to-slf4j:1.7.25@jar' - providedCompile 'org.slf4j:slf4j-api:1.7.25@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.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' - - providedCompile 'org.apache.commons:commons-lang3:3.7' - compile 'org.bigbluebutton:bbb-common-message_2.12:0.0.20-SNAPSHOT' + // Servlet + providedCompile 'javax.servlet:servlet-api:2.5' + + // Mina + providedCompile 'org.apache.mina:mina-core:2.0.19' + providedCompile 'org.apache.mina:mina-integration-beans:2.0.19' + providedCompile 'org.apache.mina:mina-integration-jmx:2.0.19' + + // Spring + providedCompile 'org.springframework:spring-web:4.3.12.RELEASE' + providedCompile 'org.springframework:spring-beans:4.3.12.RELEASE' + providedCompile 'org.springframework:spring-context:4.3.12.RELEASE' + providedCompile 'org.springframework:spring-core:4.3.12.RELEASE' + + // Red5 + providedCompile 'org.red5:red5-server:1.0.10-M9' + providedCompile 'org.red5:red5-server-common:1.0.10-M9' + providedCompile 'org.red5:red5-io:1.0.10-M9' + + // Logging + providedCompile 'ch.qos.logback:logback-core:1.2.3' + providedCompile 'ch.qos.logback:logback-classic:1.2.3' + providedCompile 'org.slf4j:log4j-over-slf4j:1.7.25' + providedCompile 'org.slf4j:jcl-over-slf4j:1.7.25' + providedCompile 'org.slf4j:jul-to-slf4j:1.7.25' + providedCompile 'org.slf4j:slf4j-api:1.7.25' + + // 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.12.RELEASE' + compile 'aopalliance:aopalliance:1.0' + + 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.7' + compile 'org.bigbluebutton:bbb-common-message_2.12:0.0.20-SNAPSHOT' } war.doLast { - ant.unzip(src: war.archivePath, dest: "$buildDir/video") + ant.unzip(src: war.archivePath, dest: "$buildDir/video") + println '[bbb:task] WAR file ready for video application' } - -task deploy() << { - def red5AppsDir = '/usr/share/red5/webapps' - def videoDir = new File("${red5AppsDir}/video") - println "Deleting $videoDir" - if (videoDir.exists()) ant.delete(dir: videoDir) - ant.mkdir(dir: videoDir) - ant.copy(todir: videoDir) { - fileset(dir: "$buildDir/video") +task deploy { + doLast { + def red5AppsDir = '/usr/share/red5/webapps' + def videoDir = new File("${red5AppsDir}/video") + println "Deleting $videoDir" + if (videoDir.exists()) ant.delete(dir: videoDir) + ant.mkdir(dir: videoDir) + ant.copy(todir: videoDir) { + fileset(dir: "$buildDir/video") + } + println '[bbb:task] WAR file deployed for video application' } -} - +} diff --git a/bbb-voice/build.gradle b/bbb-voice/build.gradle index 4e46e8040b25..2d7e150f24e3 100755 --- a/bbb-voice/build.gradle +++ b/bbb-voice/build.gradle @@ -1,20 +1,24 @@ -apply plugin: 'java' -apply plugin: 'war' -apply plugin: 'eclipse' +plugins { + id 'java' + id 'war' + id 'eclipse' + id 'idea' +} -version = '0.9.0' +version = '0.10.0' jar.enabled = true -archivesBaseName = 'sip' +archivesBaseName = 'sip' task resolveDeps(type: Copy) { into('lib') from configurations.default from configurations.default.allArtifacts.file + doLast { println '[bbb:task] Resolved dependencies for sip application' } } repositories { - mavenCentral() - mavenLocal() + jcenter() + mavenLocal() } configurations { @@ -25,57 +29,60 @@ configurations { } dependencies { - // Servlet - providedCompile 'javax.servlet:servlet-api:2.5@jar' + // Servlet + providedCompile 'javax.servlet:servlet-api:2.5' - // Mina - 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' + // Mina + providedCompile 'org.apache.mina:mina-core:2.0.19' + providedCompile 'org.apache.mina:mina-integration-beans:2.0.19' + providedCompile 'org.apache.mina:mina-integration-jmx:2.0.19' - // Spring - 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' + // Spring + providedCompile 'org.springframework:spring-web:4.3.12.RELEASE' + providedCompile 'org.springframework:spring-beans:4.3.12.RELEASE' + providedCompile 'org.springframework:spring-context:4.3.12.RELEASE' + providedCompile 'org.springframework:spring-core:4.3.12.RELEASE' - // Red5 - 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' + // Red5 + providedCompile 'org.red5:red5-server:1.0.10-M9' + providedCompile 'org.red5:red5-server-common:1.0.10-M9' + providedCompile 'org.red5:red5-io:1.0.10-M9' - // Logging - providedCompile 'ch.qos.logback:logback-core:1.2.3@jar' - providedCompile 'ch.qos.logback:logback-classic:1.2.3@jar' - providedCompile 'org.slf4j:log4j-over-slf4j:1.7.25@jar' - providedCompile 'org.slf4j:jcl-over-slf4j:1.7.25@jar' - providedCompile 'org.slf4j:jul-to-slf4j:1.7.25@jar' - providedCompile 'org.slf4j:slf4j-api:1.7.25@jar' + // Logging + providedCompile 'ch.qos.logback:logback-core:1.2.3' + providedCompile 'ch.qos.logback:logback-classic:1.2.3' + providedCompile 'org.slf4j:log4j-over-slf4j:1.7.25' + providedCompile 'org.slf4j:jcl-over-slf4j:1.7.25' + providedCompile 'org.slf4j:jul-to-slf4j:1.7.25' + providedCompile 'org.slf4j:slf4j-api:1.7.25' - // 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.12.RELEASE@jar' - compile 'aopalliance:aopalliance:1.0@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.3.12.RELEASE' + compile 'aopalliance:aopalliance:1.0' - //redis - compile 'org.apache.commons:commons-pool2:2.6.0' - compile 'com.google.code.gson:gson:2.8.5' + 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.7' - compile 'org.bigbluebutton:bbb-common-message_2.12:0.0.20-SNAPSHOT' + providedCompile 'org.apache.commons:commons-lang3:3.7' + compile 'org.bigbluebutton:bbb-common-message_2.12:0.0.20-SNAPSHOT' } war.doLast { - ant.unzip(src: war.archivePath, dest: "$buildDir/sip") + ant.unzip(src: war.archivePath, dest: "$buildDir/sip") + println '[bbb:task] WAR file ready for sip application' } -task deploy() << { - def red5AppsDir = '/usr/share/red5/webapps' - def sipDir = new File("${red5AppsDir}/sip") - println "Deleting $sipDir" - if (sipDir.exists()) ant.delete(dir: sipDir) - ant.mkdir(dir: sipDir) - ant.copy(todir: sipDir) { - fileset(dir: "$buildDir/sip") +task deploy { + doLast { + def red5AppsDir = '/usr/share/red5/webapps' + def sipDir = new File("${red5AppsDir}/sip") + println "Deleting $sipDir" + if (sipDir.exists()) ant.delete(dir: sipDir) + ant.mkdir(dir: sipDir) + ant.copy(todir: sipDir) { + fileset(dir: "$buildDir/sip") + } + println '[bbb:task] WAR file deployed for sip application' } } diff --git a/bigbluebutton-apps/build.gradle b/bigbluebutton-apps/build.gradle index 0433b262ca05..0b1913b6b673 100755 --- a/bigbluebutton-apps/build.gradle +++ b/bigbluebutton-apps/build.gradle @@ -1,24 +1,25 @@ -apply plugin: 'java' -apply plugin: 'war' -apply plugin: 'eclipse' -apply plugin: 'idea' +plugins { + id 'java' + id 'war' + id 'eclipse' + id 'idea' +} -version = '0.9.0' +version = '0.10.0' jar.enabled = true - def appName = 'bigbluebutton' - -archivesBaseName = appName +archivesBaseName = appName task resolveDeps(type: Copy) { into('lib') from configurations.default from configurations.default.allArtifacts.file + doLast { println '[bbb:task] Resolved dependencies for bigbluebutton application' } } repositories { - mavenCentral() - mavenLocal() + jcenter() + mavenLocal() } configurations { @@ -28,67 +29,68 @@ configurations { runtime.exclude group: "org.red5", module: "red5-io" } -dependencies { - // Servlet - providedCompile 'javax.servlet:servlet-api:2.5@jar' - - // Mina - 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' - 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-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' - providedCompile 'ch.qos.logback:logback-classic:1.2.3@jar' - providedCompile 'org.slf4j:log4j-over-slf4j:1.7.25@jar' - providedCompile 'org.slf4j:jcl-over-slf4j:1.7.25@jar' - providedCompile 'org.slf4j:jul-to-slf4j:1.7.25@jar' - providedCompile 'org.slf4j:slf4j-api:1.7.25@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.3.12.RELEASE@jar' - compile 'aopalliance:aopalliance:1.0@jar' - - // Testing - compile 'org.easymock:easymock:3.6@jar' - - //redis - 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.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' +dependencies { + // Servlet + providedCompile 'javax.servlet:servlet-api:2.5' + + // Mina + providedCompile 'org.apache.mina:mina-core:2.0.19' + providedCompile 'org.apache.mina:mina-integration-beans:2.0.19' + providedCompile 'org.apache.mina:mina-integration-jmx:2.0.19' + + // Spring + providedCompile 'org.springframework:spring-web:4.3.12.RELEASE' + providedCompile 'org.springframework:spring-beans:4.3.12.RELEASE' + providedCompile 'org.springframework:spring-context:4.3.12.RELEASE' + providedCompile 'org.springframework:spring-core:4.3.12.RELEASE' + + // Red5 + providedCompile 'org.red5:red5-server:1.0.10-M9' + providedCompile 'org.red5:red5-server-common:1.0.10-M9' + providedCompile 'org.red5:red5-io:1.0.10-M9' + + // Logging + providedCompile 'ch.qos.logback:logback-core:1.2.3' + providedCompile 'ch.qos.logback:logback-classic:1.2.3' + providedCompile 'org.slf4j:log4j-over-slf4j:1.7.25' + providedCompile 'org.slf4j:jcl-over-slf4j:1.7.25' + providedCompile 'org.slf4j:jul-to-slf4j:1.7.25' + providedCompile 'org.slf4j:slf4j-api:1.7.25' + + // 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.12.RELEASE' + compile 'aopalliance:aopalliance:1.0' + + // Testing + compile 'org.easymock:easymock:3.6' + + 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.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' } -test { - useTestNG() -} +test { useTestNG() } war.doLast { - ant.unzip(src: war.archivePath, dest: "$buildDir/$appName") + ant.unzip(src: war.archivePath, dest: "$buildDir/$appName") + println '[bbb:task] WAR file ready for bigbluebutton application' } - -task deploy() << { - def red5AppsDir = '/usr/share/red5/webapps' - def bbbDir = new File("${red5AppsDir}/$appName") - ant.delete(dir: bbbDir) - ant.mkdir(dir: bbbDir) - ant.copy(todir: bbbDir) { - fileset(dir: "$buildDir/$appName") - } -} +task deploy() { + doLast { + def red5AppsDir = '/usr/share/red5/webapps' + def bbbDir = new File("${red5AppsDir}/$appName") + println "Deleting $red5AppsDir" + ant.delete(dir: bbbDir) + ant.mkdir(dir: bbbDir) + ant.copy(todir: bbbDir) { + fileset(dir: "$buildDir/$appName") + } + println '[bbb:task] WAR file deployed for bigbluebutton application' + } +}