Merge pull request #18680 from antobinary/26-java17nodejs18

build: Upgrade to Java17, NodeJS 18

.github/workflows/automated-tests.yml

@@ -120,7 +120,7 @@ jobs:
       - name: Install BBB
         run: |
             sudo sh -c '
-            cd /root/ && wget -q https://ubuntu.bigbluebutton.org/bbb-install-2.6.sh -O bbb-install.sh
+            cd /root/ && wget -nv https://raw.githubusercontent.com/bigbluebutton/bbb-install/master/bbb-install-2.6.sh -O bbb-install.sh
             cat bbb-install.sh | sed "s|> /etc/apt/sources.list.d/bigbluebutton.list||g" | bash -s -- -v focal-26-dev -s bbb-ci.test -j -d /certs/
             bbb-conf --salt bbbci
             echo "NODE_EXTRA_CA_CERTS=/usr/local/share/ca-certificates/bbb-dev/bbb-dev-ca.crt" >> /usr/share/meteor/bundle/bbb-html5-with-roles.conf

.gitlab-ci.yml

@@ -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-29-grails-524
+  image: bigbluebutton/bbb-build:v2.6.x-release--2023-08-30-211201
 
 # 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

akka-bbb-apps/build.sbt

@@ -18,7 +18,7 @@ val compileSettings = Seq(
     "-Xlint",
     "-Ywarn-dead-code",
     "-language:_",
-    "-target:11",
+    "-release:17",
     "-encoding", "UTF-8"
   ),
   javacOptions ++= List(
@@ -76,4 +76,4 @@ daemonGroup in Linux := group
 
 javaOptions in Universal ++= Seq("-J-Xms130m", "-J-Xmx256m", "-Dconfig.file=/etc/bigbluebutton/bbb-apps-akka.conf", "-Dlogback.configurationFile=conf/logback.xml")
 
-debianPackageDependencies in Debian ++= Seq("java11-runtime-headless", "bash")
+debianPackageDependencies in Debian ++= Seq("java17-runtime-headless", "bash")

akka-bbb-fsesl/build.sbt

@@ -18,7 +18,7 @@ val compileSettings = Seq(
     "-Xlint",
     "-Ywarn-dead-code",
     "-language:_",
-    "-target:11",
+    "-release:17",
     "-encoding", "UTF-8"
   ),
   javacOptions ++= List(
@@ -77,4 +77,4 @@ daemonGroup in Linux := group
 
 javaOptions in Universal ++= Seq("-J-Xms130m", "-J-Xmx256m", "-Dconfig.file=/etc/bigbluebutton/bbb-fsesl-akka.conf", "-Dlogback.configurationFile=conf/logback.xml")
 
-debianPackageDependencies in Debian ++= Seq("java11-runtime-headless", "bash", "bbb-freeswitch-core")
+debianPackageDependencies in Debian ++= Seq("java17-runtime-headless", "bash", "bbb-freeswitch-core")

bbb-common-message/build.sbt

@@ -12,7 +12,7 @@ val compileSettings = Seq(
     "-Xlint",
     "-Ywarn-dead-code",
     "-language:_",
-    "-target:11",
+    "-release:17",
     "-encoding", "UTF-8"
   ),
   javacOptions ++= List(

bbb-common-web/build.sbt

@@ -11,7 +11,7 @@ val compileSettings = Seq(
     "-Xlint",
     "-Ywarn-dead-code",
     "-language:_",
-    "-target:11",
+    "-release:17",
     "-encoding", "UTF-8"
   ),
   javacOptions ++= List(

bbb-export-annotations/package-lock.json

@@ -21,8 +21,8 @@
         "eslint-config-google": "^0.14.0"
       },
       "engines": {
-        "node": "^16.16.0",
-        "npm": "^8.5.0"
+        "node": ">=16",
+        "npm": ">=8.5"
       }
     },
     "node_modules/@eslint/eslintrc": {

bbb-export-annotations/package.json

@@ -20,7 +20,7 @@
     "eslint-config-google": "^0.14.0"
   },
   "engines": {
-    "node": "^16.16.0",
-    "npm": "^8.5.0"
+    "node": ">=16",
+    "npm": ">=8.5"
   }
 }

bbb-fsesl-client/build.sbt

@@ -13,7 +13,7 @@ val compileSettings = Seq(
     "-Xlint",
     "-Ywarn-dead-code",
     "-language:_",
-    "-target:11",
+    "-release:17",
     "-encoding", "UTF-8"
   ),
   javacOptions ++= List(

bigbluebutton-html5/imports/startup/server/index.js

@@ -29,11 +29,6 @@ process.on('uncaughtException', (err) => {
   process.exit(1);
 });
 
-process.on('uncaughtException', (err) => {
-  Logger.error(`uncaughtException: ${err}`);
-  process.exit(1);
-});
-
 const formatMemoryUsage = (data) => `${Math.round(data / 1024 / 1024 * 100) / 100} MB`
 
 const serverHealth = () => {

bigbluebutton-web/gradle.properties

@@ -1,7 +1,7 @@
 grailsVersion=5.3.2
-gormVersion=7.1.0
+gormVersion=7.3.1
 gradleWrapperVersion=7.3.1
 grailsGradlePluginVersion=5.0.0
-groovyVersion=3.0.9
+groovyVersion=3.0.11
 tomcatEmbedVersion=9.0.78
 springVersion=2.7.12

build/packages-template/bbb-web/after-install.sh

@@ -66,7 +66,7 @@ bbb_config() {
   touch /var/log/bigbluebutton/bbb-web.log
   chown bigbluebutton:bigbluebutton /var/log/bigbluebutton/bbb-web.log
 
-  update-java-alternatives -s java-1.11.0-openjdk-amd64
+  update-java-alternatives -s java-1.17.0-openjdk-amd64
 
   # Restart bbb-web to deploy new 
   startService bbb-web.service || echo "bbb-web.service could not be registered or started"

build/packages-template/bbb-web/build.sh

@@ -26,8 +26,6 @@ echo 'resolvers += "Artima Maven Repository" at "https://repo.artima.com/release
 
 ##
 
-# [ $DISTRO == "centos6" ] && JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk-1.11.0.91-1.b14.el6.x86_64
-
 EPHEMERAL_VERSION=0.0.$(date +%s)-SNAPSHOT
 sed -i "s|\(version := \)\".*|\1\"$EPHEMERAL_VERSION\"|g" bbb-common-message/build.sbt
 find -name build.gradle -exec sed -i "s|\(.*org.bigbluebutton.*bbb-common-message[^:]*\):.*|\1:$EPHEMERAL_VERSION\"|g" {} \;

build/packages-template/bbb-web/opts-focal.sh

@@ -1,3 +1,3 @@
 . ./opts-global.sh
 
-OPTS="$OPTS -t deb -d zip,unzip,imagemagick,redis-server,xpdf-utils,bbb-libreoffice-docker,psmisc,fonts-crosextra-carlito,fonts-crosextra-caladea,fonts-noto,openjdk-11-jdk,file"
+OPTS="$OPTS -t deb -d zip,unzip,imagemagick,redis-server,xpdf-utils,bbb-libreoffice-docker,psmisc,fonts-crosextra-carlito,fonts-crosextra-caladea,fonts-noto,openjdk-17-jdk,file"

build/packages-template/bbb-webrtc-sfu/after-install.sh

@@ -43,6 +43,11 @@ case "$1" in
     touch /var/log/bbb-webrtc-sfu/bbb-webrtc-sfu.log
 
     yq w -i $TARGET recordWebcams true
+
+
+    echo "Resetting mcs-address from localhost to 127.0.0.1"
+    yq w -i $TARGET mcs-address 127.0.0.1
+    
     if id bigbluebutton > /dev/null 2>&1 ; then
       chown -R bigbluebutton:bigbluebutton /usr/local/bigbluebutton/bbb-webrtc-sfu /var/log/bbb-webrtc-sfu/
     else

docs/docs/development/dev-guide.md

@@ -133,7 +133,7 @@ vi ~/.profile
 Add the following line at the end of the file
 
 ```bash
-export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
+export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
 ```
 
 Reload your profile (this will happen automatically when you next login, but we'll do it explicitly here to load the new environment variable).
@@ -146,7 +146,7 @@ Do a quick test to ensure JAVA_HOME is set.
 
 ```bash
 $ echo $JAVA_HOME
-/usr/lib/jvm/java-11-openjdk-amd64
+/usr/lib/jvm/java-17-openjdk-amd64
 ```
 
 In the next step, you need to install a number of tools using sdkman.
@@ -156,7 +156,7 @@ curl -s "https://get.sdkman.io" | bash
 source "$HOME/.sdkman/bin/sdkman-init.sh"
 
 sdk install gradle 7.3.1
-sdk install grails 5.0.1
+sdk install grails 5.3.2
 sdk install sbt 1.6.2
 sdk install maven 3.5.0
 ```

docs/docs/new-features.md

@@ -180,8 +180,13 @@ Allows for quicker, more efficient search and retrieval of recording data.
 
 Under the hood, BigBlueButton 2.6 installs on Ubuntu 20.04 64-bit, and the following key components have been upgraded
 - Meteor 2.13
-- Grails 5.2.4
+- Grails 5.3.2
 - Spring 2.7.12
+- NodeJS 18 (up from 16) for `bbb-pads`, `bbb-export-annotations`, `bbb-webrtc-sfu`, `bbb-etherpad`, `bbb-webhooks`
+- Java 17 (up from 11) for `bbb-common-message`, `bbb-common-web`, `bigbluebutton-web`, `akka-bbb-apps`, `bbb-fsesl-client`, and `akka-bbb-fsesl`
+- Grails 5.3.2
+- GORM 7.3.1
+- Groovy 3.0.11
 
 For full details on what is new in BigBlueButton 2.6, see the release notes.