diff --git a/bbb-video/settings.gradle b/bbb-video/settings.gradle new file mode 100644 index 000000000000..a6a06e25a42c --- /dev/null +++ b/bbb-video/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'bbb-video' diff --git a/bbb-voice/settings.gradle b/bbb-voice/settings.gradle new file mode 100644 index 000000000000..ab03d9f17261 --- /dev/null +++ b/bbb-voice/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'bbb-voice' diff --git a/bigbluebutton-apps/settings.gradle b/bigbluebutton-apps/settings.gradle new file mode 100644 index 000000000000..bcbee0f555c1 --- /dev/null +++ b/bigbluebutton-apps/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'bigbluebutton-apps' diff --git a/bigbluebutton-web/pres-checker/build.gradle b/bigbluebutton-web/pres-checker/build.gradle index dfb9bee22f6f..5548c1b6f7b7 100755 --- a/bigbluebutton-web/pres-checker/build.gradle +++ b/bigbluebutton-web/pres-checker/build.gradle @@ -1,37 +1,39 @@ apply plugin: 'java' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +sourceCompatibility = '1.8' +targetCompatibility = '1.8' -version = '0.0.1' +version '0.0.1' +jar.enabled = true archivesBaseName = 'bbb-pres-check' task resolveDeps(type: Copy) { - into('lib') - from configurations.default - from configurations.default.allArtifacts.file + into('lib') + from configurations.default + from configurations.default.allArtifacts.file + doLast { println '[bbb:task] Resolved dependencies for pres-checker application' } } repositories { - mavenCentral() - mavenLocal() + jcenter() + mavenLocal() } dependencies { - compile 'org.apache.poi:poi:4.0.0@jar' - compile 'org.apache.poi:poi-ooxml:4.0.0@jar' - compile 'org.apache.poi:poi-ooxml-schemas:4.0.0@jar' - compile 'commons-io:commons-io:2.6@jar' - compile 'org.apache.commons:commons-lang3:3.8.1@jar' - compile 'org.apache.commons:commons-collections4:4.2@jar' - compile 'org.apache.xmlbeans:xmlbeans:3.0.2@jar' + compile 'org.apache.poi:poi:4.0.0@jar' + compile 'org.apache.poi:poi-ooxml:4.0.0@jar' + compile 'org.apache.poi:poi-ooxml-schemas:4.0.0@jar' + compile 'commons-io:commons-io:2.6@jar' + compile 'org.apache.commons:commons-lang3:3.8.1@jar' + compile 'org.apache.commons:commons-collections4:4.2@jar' + compile 'org.apache.xmlbeans:xmlbeans:3.0.2@jar' } jar { - manifest.mainAttributes("Permissions": "all-permissions") - manifest.mainAttributes("Codebase": "*") - manifest.mainAttributes("Application-Name": "BigBlueButton Presentation Checker") - manifest.mainAttributes("Application-Library-Allowable-Codebase": "*") - manifest.mainAttributes("Caller-Allowable-Codebase": "*") - manifest.mainAttributes("Trusted-Only": "true") + manifest.mainAttributes("Permissions": "all-permissions") + manifest.mainAttributes("Codebase": "*") + manifest.mainAttributes("Application-Name": "BigBlueButton Presentation Checker") + manifest.mainAttributes("Application-Library-Allowable-Codebase": "*") + manifest.mainAttributes("Caller-Allowable-Codebase": "*") + manifest.mainAttributes("Trusted-Only": "true") } diff --git a/bigbluebutton-web/pres-checker/settings.gradle b/bigbluebutton-web/pres-checker/settings.gradle new file mode 100644 index 000000000000..bc516dd0ac01 --- /dev/null +++ b/bigbluebutton-web/pres-checker/settings.gradle @@ -0,0 +1 @@ +rootProject.name = "bbb-pres-check" diff --git a/bigbluebutton-web/src/main/webapp/WEB-INF/freemarker/api-errors.ftlx b/bigbluebutton-web/src/main/webapp/WEB-INF/freemarker/api-errors.ftlx index 979f25814e23..26ab06e34db6 100644 --- a/bigbluebutton-web/src/main/webapp/WEB-INF/freemarker/api-errors.ftlx +++ b/bigbluebutton-web/src/main/webapp/WEB-INF/freemarker/api-errors.ftlx @@ -12,5 +12,6 @@ +