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

Merge pull request #16397 from zhem0004/grailsUpgradeBackport

Browse Source 
chore: Grails upgrade to 5.2.4
This commit is contained in:
Anton Georgiev 2023-01-05 13:12:07 -05:00 committed by GitHub
commit 2ce3451404
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -12,7 +12,7 @@ stages:
# define which docker image to use for builds
default:
image: gitlab.senfcall.de:5050/senfcall-public/docker-bbb-build:v2022-12-08-meteor-290
image: gitlab.senfcall.de:5050/senfcall-public/docker-bbb-build:v2022-12-29-grails-524
# This stage uses git to find out since when each package has been unmodified.
# it then checks an API endpoint on the package server to find out for which of

15
bbb-common-web/build.sbt
View File

@ -101,7 +101,14 @@ licenses := Seq("LGPL-3.0" -> url("http://opensource.org/licenses/LGPL-3.0"))
homepage := Some(url("http://www.bigbluebutton.org"))
libraryDependencies += "javax.validation" % "validation-api" % "2.0.1.Final"
libraryDependencies += "org.springframework.boot" % "spring-boot-starter-validation" % "2.7.1"
libraryDependencies += "org.glassfish" % "javax.el" % "3.0.1-b12"
libraryDependencies += "org.apache.httpcomponents" % "httpclient" % "4.5.13"
libraryDependencies ++= Seq(
"javax.validation" % "validation-api" % "2.0.1.Final",
"org.springframework.boot" % "spring-boot-starter-validation" % "2.7.1",
"org.springframework.data" % "spring-data-commons" % "2.7.6",
"org.glassfish" % "javax.el" % "3.0.1-b12",
"org.apache.httpcomponents" % "httpclient" % "4.5.13",
"org.postgresql" % "postgresql" % "42.2.16",
"org.hibernate" % "hibernate-core" % "5.6.1.Final",
"org.flywaydb" % "flyway-core" % "7.8.2",
"com.zaxxer" % "HikariCP" % "4.0.3"
)

15
bigbluebutton-web/build.gradle
View File

@ -25,8 +25,8 @@ apply plugin: "war"
apply plugin: "org.grails.grails-web"
apply plugin: "com.bertramlabs.asset-pipeline"
apply plugin: "org.grails.grails-gsp"
apply plugin:"com.github.erdi.webdriver-binaries"
apply plugin:"org.grails.plugins.views-json"
apply plugin: "com.github.erdi.webdriver-binaries"
apply plugin: "org.grails.plugins.views-json"
task resolveDeps(type: Copy) {
into('lib')
@ -59,12 +59,12 @@ dependencies {
implementation "org.springframework.boot:spring-boot:${springVersion}"
implementation "org.springframework.boot:spring-boot-starter-logging:${springVersion}"
implementation "org.springframework.boot:spring-boot-autoconfigure:${springVersion}"
implementation "org.grails:grails-core"
implementation "org.grails:grails-core:5.2.4"
implementation "org.springframework.boot:spring-boot-starter-actuator:${springVersion}"
implementation "org.springframework.boot:spring-boot-starter-tomcat:${springVersion}"
implementation "org.grails:grails-web-boot"
implementation "org.grails:grails-web-boot:5.2.0"
implementation "org.grails:grails-logging"
implementation "org.grails:grails-plugin-rest"
implementation "org.grails:grails-plugin-rest:5.2.0"
implementation "org.grails:grails-plugin-databinding"
implementation "org.grails:grails-plugin-i18n"
implementation "org.grails:grails-plugin-services"
@ -73,7 +73,7 @@ dependencies {
implementation 'org.grails.plugins:external-config:1.2.2'
//implementation "org.grails.plugins:cache"
implementation "org.grails.plugins:views-json:2.1.1"
implementation "org.grails.plugins:cache:5.0.1"
implementation "org.grails.plugins:cache"
implementation "org.apache.xmlbeans:xmlbeans:5.0.3"
implementation "org.grails:grails-gradle-plugin:5.1.4"
implementation "org.grails.plugins:async"
@ -95,6 +95,7 @@ dependencies {
implementation "org.json:json:20211205"
implementation "com.zaxxer:nuprocess:2.0.5"
implementation "net.java.dev.jna:jna:5.10.0"
implementation "org.springframework.data:spring-data-commons:2.7.6"
// https://mvnrepository.com/artifact/commons-fileupload/commons-fileupload
implementation group: 'commons-fileupload', name: 'commons-fileupload', version: '1.4'
@ -103,7 +104,7 @@ dependencies {
implementation "org.springframework.boot:spring-boot-starter-validation:${springVersion}"
//--- BigBlueButton Dependencies End
console "org.grails:grails-console"
console "org.grails:grails-console:5.2.0"
profile "org.grails.profiles:web"
runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:3.3.6"
testImplementation "org.grails:grails-gorm-testing-support"

2
bigbluebutton-web/gradle.properties
View File

@ -1,4 +1,4 @@
grailsVersion=5.0.1
grailsVersion=5.2.4
gormVersion=7.1.0
gradleWrapperVersion=7.3.1
grailsGradlePluginVersion=5.0.0