From 2820178b83ac691ef072690e5a44c1c446040965 Mon Sep 17 00:00:00 2001
From: Ghazi Triki <ghazi.triki@riadvice.tn>
Date: Sun, 5 Aug 2018 22:36:56 +0100
Subject: [PATCH] Updated JVM projects dependencies and configuration.
---
akka-bbb-apps/build.sbt | 26 +++++------
akka-bbb-apps/project/plugins.sbt | 12 ++---
akka-bbb-fsesl/build.sbt | 38 ++++++++++------
akka-bbb-fsesl/project/plugins.sbt | 12 +++--
akka-bbb-transcode/project/plugins.sbt | 4 ++
bbb-apps-common/build.sbt | 18 ++++----
bbb-apps-common/{publish.sh => deploy.sh} | 1 -
bbb-apps-common/project/plugins.sbt | 4 +-
bbb-common-message/build.sbt | 8 ++--
bbb-common-message/deploy.sh | 2 +-
bbb-common-message/project/plugins.sbt | 7 +--
bbb-common-web/build.sbt | 49 ++++++++++-----------
bbb-common-web/project/plugins.sbt | 8 ++--
bbb-fsesl-client/build.gradle | 16 +++----
bbb-fsesl-client/build.sbt | 8 ++--
bbb-fsesl-client/deploy.sh | 2 +
bbb-fsesl-client/project/plugins.sbt | 7 ++-
bbb-screenshare/app/build.sbt | 18 ++++----
bbb-screenshare/app/deploy.sh | 6 +--
bbb-screenshare/app/project/plugins.sbt | 27 +++++++-----
bbb-voice/build.gradle | 12 ++---
bigbluebutton-apps/build.gradle | 10 ++---
bigbluebutton-apps/deploy.sh | 2 +-
bigbluebutton-web/build.gradle | 2 +-
bigbluebutton-web/pres-checker/build.gradle | 8 ++--
labs/vertx-akka/project/plugins.sbt | 4 ++
26 files changed, 164 insertions(+), 147 deletions(-)
rename bbb-apps-common/{publish.sh => deploy.sh} (97%)
mode change 100755 => 100644
create mode 100644 bbb-fsesl-client/deploy.sh
diff --git a/akka-bbb-apps/build.sbt b/akka-bbb-apps/build.sbt
index 0dfa9f4685..af6c93edc0 100755
--- a/akka-bbb-apps/build.sbt
+++ b/akka-bbb-apps/build.sbt
@@ -6,7 +6,7 @@ organization := "org.bigbluebutton"
version := "0.0.2"
-scalaVersion := "2.12.2"
+scalaVersion := "2.12.6"
scalacOptions ++= Seq(
"-unchecked",
@@ -38,15 +38,15 @@ testOptions in Test += Tests.Argument(TestFrameworks.Specs2, "html", "console",
testOptions in Test += Tests.Argument(TestFrameworks.ScalaTest, "-h", "target/scalatest-reports")
-val akkaVersion = "2.5.1"
-val scalaTestVersion = "3.0.1"
+val akkaVersion = "2.5.14"
+val scalaTestVersion = "3.0.5"
libraryDependencies ++= {
Seq(
- "ch.qos.logback" % "logback-classic" % "1.0.13" % "runtime",
+ "ch.qos.logback" % "logback-classic" % "1.2.3" % "runtime",
"junit" % "junit" % "4.11",
- "commons-codec" % "commons-codec" % "1.10",
- "org.apache.commons" % "commons-lang3" % "3.2"
+ "commons-codec" % "commons-codec" % "1.11",
+ "org.apache.commons" % "commons-lang3" % "3.7"
)
}
@@ -66,14 +66,14 @@ libraryDependencies += "com.typesafe.akka" % "akka-slf4j_2.12" % akkaVersion
// https://mvnrepository.com/artifact/com.github.etaty/rediscala_2.12
libraryDependencies += "com.github.etaty" % "rediscala_2.12" % "1.8.0"
-libraryDependencies += "com.softwaremill.quicklens" %% "quicklens" % "1.4.8"
-libraryDependencies += "com.google.code.gson" % "gson" % "2.8.0"
-libraryDependencies += "joda-time" % "joda-time" % "2.9.9"
-libraryDependencies += "io.spray" % "spray-json_2.12" % "1.3.3"
+libraryDependencies += "com.softwaremill.quicklens" %% "quicklens" % "1.4.11"
+libraryDependencies += "com.google.code.gson" % "gson" % "2.8.5"
+libraryDependencies += "joda-time" % "joda-time" % "2.10"
+libraryDependencies += "io.spray" % "spray-json_2.12" % "1.3.4"
libraryDependencies += "org.parboiled" % "parboiled-scala_2.12" % "1.1.8"
// https://mvnrepository.com/artifact/com.fasterxml.jackson.module/jackson-module-scala_2.12
-libraryDependencies += "com.fasterxml.jackson.module" % "jackson-module-scala_2.12" % "2.8.8"
+libraryDependencies += "com.fasterxml.jackson.module" % "jackson-module-scala_2.12" % "2.9.6"
// For generating test reports
@@ -87,7 +87,7 @@ libraryDependencies += "org.scalactic" % "scalactic_2.12" % "3.0.3" % "test"
// https://mvnrepository.com/artifact/org.scalatest/scalatest_2.12
libraryDependencies += "org.scalatest" % "scalatest_2.12" % scalaTestVersion % "test"
-libraryDependencies += "org.mockito" % "mockito-core" % "2.7.22" % "test"
+libraryDependencies += "org.mockito" % "mockito-core" % "2.21.0" % "test"
@@ -143,5 +143,3 @@ mappings in Universal <+= (packageBin in Compile, sourceDirectory ) map { (_, sr
val logConf = src / "main" / "resources" / "logback.xml"
logConf -> "conf/logback.xml"
}
-
-debianPackageDependencies in Debian ++= Seq("java7-runtime-headless", "bash")
diff --git a/akka-bbb-apps/project/plugins.sbt b/akka-bbb-apps/project/plugins.sbt
index e6f83d0330..ec155bbffc 100755
--- a/akka-bbb-apps/project/plugins.sbt
+++ b/akka-bbb-apps/project/plugins.sbt
@@ -1,9 +1,11 @@
-addSbtPlugin("io.spray" % "sbt-revolver" % "0.7.2")
+addSbtPlugin("io.spray" % "sbt-revolver" % "0.9.1")
-//addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.3.0")
-
-addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.6.0")
+addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.2")
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.2.0")
-addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.0.0")
+addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.6")
+
+addSbtPlugin("net.vonbuchholtz" % "sbt-dependency-check" % "0.2.7")
+
+addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
diff --git a/akka-bbb-fsesl/build.sbt b/akka-bbb-fsesl/build.sbt
index 36275f0e26..319345d682 100755
--- a/akka-bbb-fsesl/build.sbt
+++ b/akka-bbb-fsesl/build.sbt
@@ -6,7 +6,7 @@ organization := "org.bigbluebutton"
version := "0.0.1"
-scalaVersion := "2.12.2"
+scalaVersion := "2.12.6"
scalacOptions ++= Seq(
"-unchecked",
@@ -37,17 +37,17 @@ testOptions in Test += Tests.Argument(TestFrameworks.Specs2, "html", "console",
testOptions in Test += Tests.Argument(TestFrameworks.ScalaTest, "-h", "target/scalatest-reports")
-val akkaVersion = "2.5.1"
+val akkaVersion = "2.5.14"
val scalaTestV = "2.2.6"
libraryDependencies ++= {
Seq(
- "ch.qos.logback" % "logback-classic" % "1.0.3",
+ "ch.qos.logback" % "logback-classic" % "1.2.3" % "runtime",
"junit" % "junit" % "4.11",
- "commons-codec" % "commons-codec" % "1.10",
- "joda-time" % "joda-time" % "2.3",
- "org.apache.commons" % "commons-lang3" % "3.2"
+ "commons-codec" % "commons-codec" % "1.11",
+ "joda-time" % "joda-time" % "2.10",
+ "org.apache.commons" % "commons-lang3" % "3.7"
)}
@@ -56,9 +56,9 @@ libraryDependencies += "org.bigbluebutton" % "bbb-common-message_2.12" % "0.0.19
libraryDependencies += "org.bigbluebutton" % "bbb-fsesl-client" % "0.0.6"
// https://mvnrepository.com/artifact/org.scala-lang/scala-library
-libraryDependencies += "org.scala-lang" % "scala-library" % "2.12.2"
+libraryDependencies += "org.scala-lang" % "scala-library" % scalaVersion.value
// https://mvnrepository.com/artifact/org.scala-lang/scala-compiler
-libraryDependencies += "org.scala-lang" % "scala-compiler" % "2.12.2"
+libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value
// https://mvnrepository.com/artifact/com.typesafe.akka/akka-actor_2.12
libraryDependencies += "com.typesafe.akka" % "akka-actor_2.12" % akkaVersion
@@ -72,19 +72,29 @@ libraryDependencies += "com.github.etaty" % "rediscala_2.12" % "1.8.0"
// For generating test reports
libraryDependencies += "org.pegdown" % "pegdown" % "1.6.0" % "test"
// https://mvnrepository.com/artifact/com.typesafe.akka/akka-testkit_2.12
-libraryDependencies += "com.typesafe.akka" % "akka-testkit_2.12" % "2.5.1" % "test"
+libraryDependencies += "com.typesafe.akka" % "akka-testkit_2.12" % "2.5.14" % "test"
// https://mvnrepository.com/artifact/org.scalactic/scalactic_2.12
-libraryDependencies += "org.scalactic" % "scalactic_2.12" % "3.0.3" % "test"
+libraryDependencies += "org.scalactic" % "scalactic_2.12" % "3.0.5" % "test"
// https://mvnrepository.com/artifact/org.scalatest/scalatest_2.12
-libraryDependencies += "org.scalatest" % "scalatest_2.12" % "3.0.3" % "test"
+libraryDependencies += "org.scalatest" % "scalatest_2.12" % "3.0.5" % "test"
-libraryDependencies += "org.mockito" % "mockito-core" % "2.7.22" % "test"
+libraryDependencies += "org.mockito" % "mockito-core" % "2.21.0" % "test"
seq(Revolver.settings: _*)
-scalariformSettings
+import com.typesafe.sbt.SbtScalariform
+
+import scalariform.formatter.preferences._
+import com.typesafe.sbt.SbtScalariform.ScalariformKeys
+
+SbtScalariform.defaultScalariformSettings
+
+ScalariformKeys.preferences := ScalariformKeys.preferences.value
+ .setPreference(AlignSingleLineCaseStatements, true)
+ .setPreference(DoubleIndentClassDeclaration, true)
+ .setPreference(AlignParameters, true)
//-----------
// Packaging
@@ -123,4 +133,4 @@ mappings in Universal <+= (packageBin in Compile, sourceDirectory ) map { (_, sr
logConf -> "conf/logback.xml"
}
-debianPackageDependencies in Debian ++= Seq("java7-runtime-headless", "bash")
+debianPackageDependencies in Debian ++= Seq("java8-runtime-headless", "bash")
diff --git a/akka-bbb-fsesl/project/plugins.sbt b/akka-bbb-fsesl/project/plugins.sbt
index 87ef644864..56e1e39f39 100755
--- a/akka-bbb-fsesl/project/plugins.sbt
+++ b/akka-bbb-fsesl/project/plugins.sbt
@@ -1,7 +1,11 @@
-addSbtPlugin("io.spray" % "sbt-revolver" % "0.7.2")
+addSbtPlugin("io.spray" % "sbt-revolver" % "0.9.1")
-addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.3.0")
+addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.2")
-addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.2.0")
+addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.2.4")
-addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.0.0")
+addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.6")
+
+addSbtPlugin("net.vonbuchholtz" % "sbt-dependency-check" % "0.2.7")
+
+addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
diff --git a/akka-bbb-transcode/project/plugins.sbt b/akka-bbb-transcode/project/plugins.sbt
index 87ef644864..6fabc00590 100755
--- a/akka-bbb-transcode/project/plugins.sbt
+++ b/akka-bbb-transcode/project/plugins.sbt
@@ -5,3 +5,7 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.3.0")
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.2.0")
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.0.0")
+
+addSbtPlugin("net.vonbuchholtz" % "sbt-dependency-check" % "0.2.7")
+
+addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
diff --git a/bbb-apps-common/build.sbt b/bbb-apps-common/build.sbt
index 355f55b53d..693e0e360c 100755
--- a/bbb-apps-common/build.sbt
+++ b/bbb-apps-common/build.sbt
@@ -5,7 +5,7 @@ organization := "org.bigbluebutton"
version := "0.0.3-SNAPSHOT"
-scalaVersion := "2.12.2"
+scalaVersion := "2.12.6"
scalacOptions ++= Seq(
"-unchecked",
@@ -26,14 +26,13 @@ testOptions in Test += Tests.Argument(TestFrameworks.Specs2, "html", "console",
testOptions in Test += Tests.Argument(TestFrameworks.ScalaTest, "-h", "target/scalatest-reports")
-val scalaV = "2.12.2"
-val akkaVersion = "2.5.1"
+val akkaVersion = "2.5.14"
val scalaTestV = "2.2.6"
// https://mvnrepository.com/artifact/org.scala-lang/scala-library
-libraryDependencies += "org.scala-lang" % "scala-library" % "2.12.2"
+libraryDependencies += "org.scala-lang" % "scala-library" % scalaVersion.value
// https://mvnrepository.com/artifact/org.scala-lang/scala-compiler
-libraryDependencies += "org.scala-lang" % "scala-compiler" % "2.12.2"
+libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value
// https://mvnrepository.com/artifact/com.typesafe.akka/akka-actor_2.12
libraryDependencies += "com.typesafe.akka" % "akka-actor_2.12" % "2.5.1"
@@ -43,18 +42,17 @@ libraryDependencies += "com.typesafe.akka" % "akka-slf4j_2.12" % "2.5.1"
// https://mvnrepository.com/artifact/com.github.etaty/rediscala_2.12
libraryDependencies += "com.github.etaty" % "rediscala_2.12" % "1.8.0"
-libraryDependencies += "com.softwaremill.quicklens" %% "quicklens" % "1.4.8"
+libraryDependencies += "com.softwaremill.quicklens" %% "quicklens" % "1.4.11"
libraryDependencies += "org.bigbluebutton" % "bbb-common-message_2.12" % "0.0.19-SNAPSHOT"
-libraryDependencies += "com.google.code.gson" % "gson" % "2.8.0"
+libraryDependencies += "com.google.code.gson" % "gson" % "2.8.5"
libraryDependencies += "redis.clients" % "jedis" % "2.9.0"
// https://mvnrepository.com/artifact/org.apache.commons/commons-lang3
-libraryDependencies += "org.apache.commons" % "commons-lang3" % "3.5"
-libraryDependencies += "commons-io" % "commons-io" % "2.4"
-libraryDependencies += "org.apache.commons" % "commons-pool2" % "2.3"
+libraryDependencies += "org.apache.commons" % "commons-lang3" % "3.7"
libraryDependencies += "commons-io" % "commons-io" % "2.4"
+libraryDependencies += "org.apache.commons" % "commons-pool2" % "2.6.0"
libraryDependencies += "org.slf4j" % "slf4j-api" % "1.7.23" % "provided"
diff --git a/bbb-apps-common/publish.sh b/bbb-apps-common/deploy.sh
old mode 100755
new mode 100644
similarity index 97%
rename from bbb-apps-common/publish.sh
rename to bbb-apps-common/deploy.sh
index 948f563417..ccba754eaa
--- a/bbb-apps-common/publish.sh
+++ b/bbb-apps-common/deploy.sh
@@ -1,3 +1,2 @@
sbt clean
sbt publish publishLocal
-
diff --git a/bbb-apps-common/project/plugins.sbt b/bbb-apps-common/project/plugins.sbt
index d6beaa3759..1a99bbcaf4 100755
--- a/bbb-apps-common/project/plugins.sbt
+++ b/bbb-apps-common/project/plugins.sbt
@@ -4,6 +4,6 @@ addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.2.0")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
-//addSbtPlugin("com.artima.supersafe" % "sbtplugin" % "1.1.2")
-
+addSbtPlugin("net.vonbuchholtz" % "sbt-dependency-check" % "0.2.7")
+addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
diff --git a/bbb-common-message/build.sbt b/bbb-common-message/build.sbt
index f659b6d468..29cf68bec6 100755
--- a/bbb-common-message/build.sbt
+++ b/bbb-common-message/build.sbt
@@ -4,7 +4,7 @@ organization := "org.bigbluebutton"
version := "0.0.19-SNAPSHOT"
-scalaVersion := "2.12.2"
+scalaVersion := "2.12.6"
scalacOptions ++= Seq(
"-unchecked",
@@ -32,9 +32,9 @@ libraryDependencies ++= {
)}
// https://mvnrepository.com/artifact/org.scala-lang/scala-library
-libraryDependencies += "org.scala-lang" % "scala-library" % "2.12.2"
+libraryDependencies += "org.scala-lang" % "scala-library" % scalaVersion.value
// https://mvnrepository.com/artifact/org.scala-lang/scala-compiler
-libraryDependencies += "org.scala-lang" % "scala-compiler" % "2.12.2"
+libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value
libraryDependencies += "junit" % "junit" % "4.12" % "test"
libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test"
@@ -49,7 +49,7 @@ libraryDependencies += "org.pegdown" % "pegdown" % "1.6.0" % "test"
libraryDependencies += "org.scalatest" % "scalatest_2.12" % "3.0.3" % "test"
// https://mvnrepository.com/artifact/com.fasterxml.jackson.module/jackson-module-scala_2.12
-libraryDependencies += "com.fasterxml.jackson.module" % "jackson-module-scala_2.12" % "2.8.8"
+libraryDependencies += "com.fasterxml.jackson.module" % "jackson-module-scala_2.12" % "2.9.6"
seq(Revolver.settings: _*)
diff --git a/bbb-common-message/deploy.sh b/bbb-common-message/deploy.sh
index 7884b2f251..ccba754eaa 100755
--- a/bbb-common-message/deploy.sh
+++ b/bbb-common-message/deploy.sh
@@ -1,2 +1,2 @@
+sbt clean
sbt publish publishLocal
-
diff --git a/bbb-common-message/project/plugins.sbt b/bbb-common-message/project/plugins.sbt
index d33e342247..5ab7b095f6 100755
--- a/bbb-common-message/project/plugins.sbt
+++ b/bbb-common-message/project/plugins.sbt
@@ -1,8 +1,9 @@
-addSbtPlugin("io.spray" % "sbt-revolver" % "0.7.2")
+addSbtPlugin("io.spray" % "sbt-revolver" % "0.9.1")
-addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.2.0")
+addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.2.4")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
+addSbtPlugin("net.vonbuchholtz" % "sbt-dependency-check" % "0.2.7")
-
+addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
diff --git a/bbb-common-web/build.sbt b/bbb-common-web/build.sbt
index 572a77fdb8..11ff1b07e8 100755
--- a/bbb-common-web/build.sbt
+++ b/bbb-common-web/build.sbt
@@ -4,7 +4,7 @@ organization := "org.bigbluebutton"
version := "0.0.2-SNAPSHOT"
-scalaVersion := "2.12.2"
+scalaVersion := "2.12.6"
scalacOptions ++= Seq(
"-unchecked",
@@ -25,13 +25,12 @@ testOptions in Test += Tests.Argument(TestFrameworks.Specs2, "html", "console",
testOptions in Test += Tests.Argument(TestFrameworks.ScalaTest, "-h", "target/scalatest-reports")
-val scalaV = "2.12.2"
-val akkaVersion = "2.5.1"
+val akkaVersion = "2.5.14"
// https://mvnrepository.com/artifact/org.scala-lang/scala-library
-libraryDependencies += "org.scala-lang" % "scala-library" % scalaV
+libraryDependencies += "org.scala-lang" % "scala-library" % scalaVersion.value
// https://mvnrepository.com/artifact/org.scala-lang/scala-compiler
-libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaV
+libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value
// https://mvnrepository.com/artifact/com.typesafe.akka/akka-actor_2.12
libraryDependencies += "com.typesafe.akka" % "akka-actor_2.12" % akkaVersion
@@ -41,50 +40,48 @@ libraryDependencies += "com.typesafe.akka" % "akka-slf4j_2.12" % akkaVersion
// https://mvnrepository.com/artifact/com.github.etaty/rediscala_2.12
libraryDependencies += "com.github.etaty" % "rediscala_2.12" % "1.8.0"
-libraryDependencies += "com.softwaremill.quicklens" %% "quicklens" % "1.4.8"
+libraryDependencies += "com.softwaremill.quicklens" %% "quicklens" % "1.4.11"
libraryDependencies += "org.bigbluebutton" % "bbb-common-message_2.12" % "0.0.19-SNAPSHOT"
// https://mvnrepository.com/artifact/com.fasterxml.jackson.module/jackson-module-scala_2.12
-libraryDependencies += "com.fasterxml.jackson.module" % "jackson-module-scala_2.12" % "2.8.8"
+libraryDependencies += "com.fasterxml.jackson.module" % "jackson-module-scala_2.12" % "2.9.6"
-libraryDependencies += "redis.clients" % "jedis" % "2.7.2"
-libraryDependencies += "com.google.code.gson" % "gson" % "2.5"
+libraryDependencies += "redis.clients" % "jedis" % "2.9.0"
+libraryDependencies += "com.google.code.gson" % "gson" % "2.8.5"
// https://mvnrepository.com/artifact/org.apache.commons/commons-lang3
-libraryDependencies += "org.apache.commons" % "commons-lang3" % "3.5"
-libraryDependencies += "commons-io" % "commons-io" % "2.4"
-
-libraryDependencies += "org.apache.commons" % "commons-pool2" % "2.3"
-libraryDependencies += "commons-io" % "commons-io" % "2.4"
-libraryDependencies += "com.zaxxer" % "nuprocess" % "1.1.0"
+libraryDependencies += "org.apache.commons" % "commons-lang3" % "3.7"
+libraryDependencies += "commons-io" % "commons-io" % "2.6"
+libraryDependencies += "org.apache.commons" % "commons-pool2" % "2.6.0"
+libraryDependencies += "com.zaxxer" % "nuprocess" % "1.2.4"
// https://mvnrepository.com/artifact/org.jodconverter/jodconverter-core
-libraryDependencies += "org.jodconverter" % "jodconverter-core" % "4.0.0-RELEASE"
+libraryDependencies += "org.jodconverter" % "jodconverter-local" % "4.2.0"
// https://mvnrepository.com/artifact/org.libreoffice/unoil
-libraryDependencies += "org.libreoffice" % "unoil" % "5.3.2"
+libraryDependencies += "org.libreoffice" % "unoil" % "5.4.2"
// https://mvnrepository.com/artifact/org.libreoffice/ridl
-libraryDependencies += "org.libreoffice" % "ridl" % "5.3.2"
+libraryDependencies += "org.libreoffice" % "ridl" % "5.4.2"
// https://mvnrepository.com/artifact/org.libreoffice/juh
-libraryDependencies += "org.libreoffice" % "juh" % "5.3.2"
+libraryDependencies += "org.libreoffice" % "juh" % "5.4.2"
// https://mvnrepository.com/artifact/org.libreoffice/jurt
-libraryDependencies += "org.libreoffice" % "jurt" % "5.3.2"
+libraryDependencies += "org.libreoffice" % "jurt" % "5.4.2"
libraryDependencies += "org.apache.poi" % "poi-ooxml" % "3.17"
-libraryDependencies += "org.slf4j" % "slf4j-api" % "1.7.5"
+libraryDependencies += "org.slf4j" % "slf4j-api" % "1.7.25"
// https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient
-libraryDependencies += "org.apache.httpcomponents" % "httpclient" % "4.5.3"
+libraryDependencies += "org.apache.httpcomponents" % "httpclient" % "4.5.6"
// https://mvnrepository.com/artifact/org.apache.httpcomponents/httpasyncclient
-libraryDependencies += "org.apache.httpcomponents" % "httpasyncclient" % "4.1.3"
+libraryDependencies += "org.apache.httpcomponents" % "httpasyncclient" % "4.1.4"
-libraryDependencies += "org.freemarker" % "freemarker" % "2.3.23"
-libraryDependencies += "com.fasterxml.jackson.dataformat" % "jackson-dataformat-xml" % "2.6.3"
+libraryDependencies += "org.freemarker" % "freemarker" % "2.3.28"
+libraryDependencies += "com.fasterxml.jackson.dataformat" % "jackson-dataformat-xml" % "2.9.6"
// https://mvnrepository.com/artifact/org.codehaus.woodstox/woodstox-core-asl
libraryDependencies += "org.codehaus.woodstox" % "woodstox-core-asl" % "4.4.1"
@@ -100,7 +97,7 @@ libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.1" % "test"
libraryDependencies += "com.typesafe.akka" % "akka-testkit_2.12" % akkaVersion % "test"
// https://mvnrepository.com/artifact/org.scala-lang.modules/scala-xml_2.12
-libraryDependencies += "org.scala-lang.modules" % "scala-xml_2.12" % "1.0.6"
+libraryDependencies += "org.scala-lang.modules" % "scala-xml_2.12" % "1.1.0"
seq(Revolver.settings: _*)
diff --git a/bbb-common-web/project/plugins.sbt b/bbb-common-web/project/plugins.sbt
index 6ce94e5f09..b91f89e4a6 100755
--- a/bbb-common-web/project/plugins.sbt
+++ b/bbb-common-web/project/plugins.sbt
@@ -1,9 +1,11 @@
-addSbtPlugin("io.spray" % "sbt-revolver" % "0.7.2")
+addSbtPlugin("io.spray" % "sbt-revolver" % "0.9.1")
-addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.2.0")
+addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.2.4")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
-addSbtPlugin("com.artima.supersafe" % "sbtplugin" % "1.1.2")
+addSbtPlugin("com.artima.supersafe" % "sbtplugin" % "1.1.7")
+addSbtPlugin("net.vonbuchholtz" % "sbt-dependency-check" % "0.2.7")
+addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
diff --git a/bbb-fsesl-client/build.gradle b/bbb-fsesl-client/build.gradle
index 845cc2a9dd..ad7449677b 100755
--- a/bbb-fsesl-client/build.gradle
+++ b/bbb-fsesl-client/build.gradle
@@ -51,17 +51,15 @@ repositories {
dependencies {
// Logging
- compile 'ch.qos.logback:logback-core:1.0.9@jar'
- compile 'ch.qos.logback:logback-classic:1.0.9@jar'
- compile 'org.slf4j:log4j-over-slf4j:1.7.2@jar'
- compile 'org.slf4j:jcl-over-slf4j:1.7.2@jar'
- compile 'org.slf4j:jul-to-slf4j:1.7.2@jar'
- compile 'org.slf4j:slf4j-api:1.7.2@jar'
+ compile 'ch.qos.logback:logback-core:1.2.3@jar'
+ compile 'ch.qos.logback:logback-classic:1.2.3@jar'
+ compile 'org.slf4j:log4j-over-slf4j:1.7.25@jar'
+ compile 'org.slf4j:jcl-over-slf4j:1.7.25@jar'
+ compile 'org.slf4j:jul-to-slf4j:1.7.25@jar'
+ compile 'org.slf4j:slf4j-api:1.7.25@jar'
testRuntime 'junit:junit:4.8.1.@jar'
- compile 'org.jboss.netty:netty:3.2.9.Final@jar'
-
- //compile 'io.netty:netty:3.6.0.Final@jar'
+ compile 'org.jboss.netty:netty:3.2.10.Final@jar'
}
diff --git a/bbb-fsesl-client/build.sbt b/bbb-fsesl-client/build.sbt
index 8d32b971af..6cc930898e 100755
--- a/bbb-fsesl-client/build.sbt
+++ b/bbb-fsesl-client/build.sbt
@@ -1,5 +1,3 @@
-
-
name := "bbb-fsesl-client"
description := "BigBlueButton custom FS-ESL client built on top of FS-ESL Java library."
@@ -19,9 +17,9 @@ testOptions in Test += Tests.Argument(TestFrameworks.ScalaTest, "-h", "target/sc
libraryDependencies ++= {
Seq(
- "org.jboss.netty" % "netty" % "3.2.1.Final",
- "junit" % "junit" % "4.11",
- "ch.qos.logback" % "logback-classic" % "1.0.3"
+ "org.jboss.netty" % "netty" % "3.2.10.Final",
+ "junit" % "junit" % "4.12",
+ "ch.qos.logback" % "logback-classic" % "1.2.3"
)}
seq(Revolver.settings: _*)
diff --git a/bbb-fsesl-client/deploy.sh b/bbb-fsesl-client/deploy.sh
new file mode 100644
index 0000000000..a5f14b0d75
--- /dev/null
+++ b/bbb-fsesl-client/deploy.sh
@@ -0,0 +1,2 @@
+sbt clean
+sbt publish publishLocal
diff --git a/bbb-fsesl-client/project/plugins.sbt b/bbb-fsesl-client/project/plugins.sbt
index edddc9ca18..5ab7b095f6 100755
--- a/bbb-fsesl-client/project/plugins.sbt
+++ b/bbb-fsesl-client/project/plugins.sbt
@@ -1,6 +1,9 @@
-addSbtPlugin("io.spray" % "sbt-revolver" % "0.7.2")
+addSbtPlugin("io.spray" % "sbt-revolver" % "0.9.1")
-addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.2.0")
+addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.2.4")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
+addSbtPlugin("net.vonbuchholtz" % "sbt-dependency-check" % "0.2.7")
+
+addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
diff --git a/bbb-screenshare/app/build.sbt b/bbb-screenshare/app/build.sbt
index 7e7f1b96f6..dc47de3ded 100755
--- a/bbb-screenshare/app/build.sbt
+++ b/bbb-screenshare/app/build.sbt
@@ -8,7 +8,7 @@ organization := "org.bigbluebutton"
version := "0.0.2"
-scalaVersion := "2.12.2"
+scalaVersion := "2.12.6"
scalacOptions ++= Seq(
"-unchecked",
@@ -39,7 +39,7 @@ testOptions in Test += Tests.Argument(TestFrameworks.Specs2, "html", "console",
testOptions in Test += Tests.Argument(TestFrameworks.ScalaTest, "-h", "target/scalatest-reports")
-val akkaVersion = "2.5.1"
+val akkaVersion = "2.5.14"
val scalaTestV = "2.2.6"
libraryDependencies ++= {
@@ -51,10 +51,10 @@ libraryDependencies ++= {
"com.typesafe" % "config" % "1.3.0",
"ch.qos.logback" % "logback-classic" % "1.2.3" % "runtime",
"commons-codec" % "commons-codec" % "1.11",
- "redis.clients" % "jedis" % "2.7.2",
- "org.apache.commons" % "commons-pool2" % "2.3",
+ "redis.clients" % "jedis" % "2.9.0",
+ "org.apache.commons" % "commons-pool2" % "2.6.0",
"org.red5" % "red5-server" % "1.0.10-M5",
- "com.google.code.gson" % "gson" % "2.5",
+ "com.google.code.gson" % "gson" % "2.8.5",
"org.springframework" % "spring-web" % springVersion,
"org.springframework" % "spring-beans" % springVersion,
"org.springframework" % "spring-context" % springVersion,
@@ -62,19 +62,17 @@ libraryDependencies ++= {
"org.springframework" % "spring-webmvc" % springVersion,
"org.springframework" % "spring-aop" % springVersion,
"javax.servlet" % "servlet-api" % "2.5"
-
-
)}
// https://mvnrepository.com/artifact/org.scala-lang/scala-library
-libraryDependencies += "org.scala-lang" % "scala-library" % "2.12.2"
-libraryDependencies += "org.scala-lang" % "scala-reflect" % "2.12.2"
+libraryDependencies += "org.scala-lang" % "scala-library" % scalaVersion.value
+libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value
libraryDependencies += "org.bigbluebutton" % "bbb-common-message_2.12" % "0.0.19-SNAPSHOT"
// https://mvnrepository.com/artifact/com.github.etaty/rediscala_2.12
libraryDependencies += "com.github.etaty" % "rediscala_2.12" % "1.8.0"
// https://mvnrepository.com/artifact/com.fasterxml.jackson.module/jackson-module-scala_2.12
-libraryDependencies += "com.fasterxml.jackson.module" % "jackson-module-scala_2.12" % "2.8.8"
+libraryDependencies += "com.fasterxml.jackson.module" % "jackson-module-scala_2.12" % "2.9.6"
//seq(Revolver.settings: _*)
//
diff --git a/bbb-screenshare/app/deploy.sh b/bbb-screenshare/app/deploy.sh
index a008d43127..305fe88e80 100755
--- a/bbb-screenshare/app/deploy.sh
+++ b/bbb-screenshare/app/deploy.sh
@@ -18,9 +18,9 @@ sudo cp ~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/bbb-sc
~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/paranamer-2.8.jar \
~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/akka-* \
~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/config-1.3.1.jar \
- ~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/gson-2.5.jar \
- ~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/jedis-2.7.2.jar \
- ~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/commons-pool2-2.3.jar \
+ ~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/gson-2.8.5.jar \
+ ~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/jedis-2.9.0.jar \
+ ~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/commons-pool2-2.6.0.jar \
~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/spring-webmvc-4.3.12.RELEASE.jar \
~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/rediscala_2.12-1.8.0.jar \
~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/bbb-common-message_2.12-0.0.19-SNAPSHOT.jar \
diff --git a/bbb-screenshare/app/project/plugins.sbt b/bbb-screenshare/app/project/plugins.sbt
index 366f6fd659..1c5c911f1d 100644
--- a/bbb-screenshare/app/project/plugins.sbt
+++ b/bbb-screenshare/app/project/plugins.sbt
@@ -1,12 +1,15 @@
-addSbtPlugin("io.spray" % "sbt-revolver" % "0.7.2")
-
-addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.3.0")
-
-addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.2.0")
-
-addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.0.0")
-
-addSbtPlugin("com.earldouglas" % "xsbt-web-plugin" % "2.1.0")
-
-//addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.7.9")
-
+addSbtPlugin("io.spray" % "sbt-revolver" % "0.9.1")
+
+addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.2")
+
+addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.2.4")
+
+addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.6")
+
+addSbtPlugin("com.earldouglas" % "xsbt-web-plugin" % "2.1.0")
+
+//addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.7.9")
+
+addSbtPlugin("net.vonbuchholtz" % "sbt-dependency-check" % "0.2.7")
+
+addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
diff --git a/bbb-voice/build.gradle b/bbb-voice/build.gradle
index 68a9cfe0b9..e364181721 100755
--- a/bbb-voice/build.gradle
+++ b/bbb-voice/build.gradle
@@ -50,20 +50,16 @@ dependencies {
providedCompile 'org.springframework:spring-aop:4.3.12.RELEASE@jar'
compile 'aopalliance:aopalliance:1.0@jar'
- // Testing
- compile 'org.easymock:easymock:2.4@jar'
-
- // Testing
- testRuntime 'org.easymock:easymock:2.4@jar'
-
//redis
compile 'redis.clients:jedis:2.9.0'
- compile 'org.apache.commons:commons-pool2:2.3'
- compile 'com.google.code.gson:gson:2.5'
+ 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.7'
compile 'org.bigbluebutton:bbb-common-message_2.12:0.0.19-SNAPSHOT'
+ // Testing
+ testRuntime 'org.easymock:easymock:3.6@jar'
}
test {
diff --git a/bigbluebutton-apps/build.gradle b/bigbluebutton-apps/build.gradle
index 3d0ecdcd19..85dc33cbaf 100755
--- a/bigbluebutton-apps/build.gradle
+++ b/bigbluebutton-apps/build.gradle
@@ -32,7 +32,7 @@ dependencies {
// 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-beans:4.3.12.RELEASE@jar'
providedCompile 'org.springframework:spring-context:4.3.12.RELEASE@jar'
providedCompile 'org.springframework:spring-core:4.3.13.RELEASE@jar'
@@ -54,13 +54,13 @@ dependencies {
compile 'aopalliance:aopalliance:1.0@jar'
// Testing
- compile 'org.easymock:easymock:2.4@jar'
+ compile 'org.easymock:easymock:3.6@jar'
//redis
- compile "redis.clients:jedis:2.7.2"
- compile 'org.apache.commons:commons-pool2:2.3'
+ compile "redis.clients:jedis:2.9.0"
+ compile 'org.apache.commons:commons-pool2:2.6.0'
- compile 'com.google.code.gson:gson:2.5'
+ 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.19-SNAPSHOT'
diff --git a/bigbluebutton-apps/deploy.sh b/bigbluebutton-apps/deploy.sh
index 83d2945f61..b002c6f858 100755
--- a/bigbluebutton-apps/deploy.sh
+++ b/bigbluebutton-apps/deploy.sh
@@ -10,7 +10,7 @@ gradle war deploy
sudo chown -R red5.red5 /usr/share/red5/webapps
# Remove slf4j jar as it conflicts with logging with red5
-FILE=/usr/share/red5/webapps/bigbluebutton/WEB-INF/lib/slf4j-api-1.7.23.jar
+FILE=/usr/share/red5/webapps/bigbluebutton/WEB-INF/lib/slf4j-api-1.7.25.jar
if [ -f $FILE ]
then
sudo rm $FILE
diff --git a/bigbluebutton-web/build.gradle b/bigbluebutton-web/build.gradle
index 3d1b655c40..e896556837 100755
--- a/bigbluebutton-web/build.gradle
+++ b/bigbluebutton-web/build.gradle
@@ -17,7 +17,7 @@ dependencies {
// XML creation speedup
- compile 'org.freemarker:freemarker:2.3.23'
+ compile 'org.freemarker:freemarker:2.3.28'
//junit
compile 'junit:junit:4.8.2'
diff --git a/bigbluebutton-web/pres-checker/build.gradle b/bigbluebutton-web/pres-checker/build.gradle
index cb7d4ec82f..c918e98807 100755
--- a/bigbluebutton-web/pres-checker/build.gradle
+++ b/bigbluebutton-web/pres-checker/build.gradle
@@ -21,10 +21,10 @@ dependencies {
compile 'org.apache.poi:poi:3.17@jar'
compile 'org.apache.poi:poi-ooxml:3.17@jar'
compile 'org.apache.poi:poi-ooxml-schemas:3.17@jar'
- compile 'commons-io:commons-io:2.4@jar'
- compile 'org.apache.commons:commons-lang3:3.5@jar'
- compile 'org.apache.commons:commons-collections4:4.1@jar'
- compile 'org.apache.xmlbeans:xmlbeans:2.6.0@jar'
+ compile 'commons-io:commons-io:2.6@jar'
+ compile 'org.apache.commons:commons-lang3:3.7@jar'
+ compile 'org.apache.commons:commons-collections4:4.2@jar'
+ compile 'org.apache.xmlbeans:xmlbeans:3.0.0@jar'
}
jar {
diff --git a/labs/vertx-akka/project/plugins.sbt b/labs/vertx-akka/project/plugins.sbt
index 87ef644864..6fabc00590 100755
--- a/labs/vertx-akka/project/plugins.sbt
+++ b/labs/vertx-akka/project/plugins.sbt
@@ -5,3 +5,7 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.3.0")
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.2.0")
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.0.0")
+
+addSbtPlugin("net.vonbuchholtz" % "sbt-dependency-check" % "0.2.7")
+
+addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
--
GitLab