diff --git a/dist/bin/scaladoc b/dist/bin/scaladoc index f09bf27812c0..a3a23a1accea 100755 --- a/dist/bin/scaladoc +++ b/dist/bin/scaladoc @@ -73,6 +73,8 @@ classpathArgs () { CLASS_PATH+="$(find_lib "*liqp*")$PSEP" CLASS_PATH+="$(find_lib "*jsoup*")$PSEP" CLASS_PATH+="$(find_lib "*jackson-dataformat-yaml*")$PSEP" + CLASS_PATH+="$(find_lib "*jackson-datatype-jsr310*")$PSEP" + CLASS_PATH+="$(find_lib "*strftime4j*")$PSEP" CLASS_PATH+="$(find_lib "*scala-asm*")$PSEP" CLASS_PATH+="$(find_lib "*compiler-interface*")$PSEP" CLASS_PATH+="$(find_lib "*jline-reader*")$PSEP" @@ -82,7 +84,7 @@ classpathArgs () { CLASS_PATH+="$(find_lib "*flexmark-formatter*")$PSEP" CLASS_PATH+="$(find_lib "*autolink-0.6*")$PSEP" CLASS_PATH+="$(find_lib "*flexmark-jira-converter*")$PSEP" - CLASS_PATH+="$(find_lib "*antlr-3*")$PSEP" + CLASS_PATH+="$(find_lib "*antlr4*")$PSEP" CLASS_PATH+="$(find_lib "*jackson-annotations*")$PSEP" CLASS_PATH+="$(find_lib "*jackson-core*")$PSEP" CLASS_PATH+="$(find_lib "*jackson-databind*")$PSEP" @@ -94,7 +96,7 @@ classpathArgs () { CLASS_PATH+="$(find_lib "*flexmark-ext-tables*")$PSEP" CLASS_PATH+="$(find_lib "*flexmark-ext-ins*")$PSEP" CLASS_PATH+="$(find_lib "*flexmark-ext-superscript*")$PSEP" - CLASS_PATH+="$(find_lib "*antlr-runtime*")$PSEP" + CLASS_PATH+="$(find_lib "*antlr4-runtime*")$PSEP" CLASS_PATH+="$(find_lib "*ST4*")" jvm_cp_args="-classpath \"$CLASS_PATH\"" diff --git a/dist/bin/scaladoc.bat b/dist/bin/scaladoc.bat index 17823d488e56..698f2a7c36f1 100644 --- a/dist/bin/scaladoc.bat +++ b/dist/bin/scaladoc.bat @@ -120,6 +120,8 @@ call :updateClasspath "flexmark-ext-yaml-front-matter" call :updateClasspath "liqp" call :updateClasspath "jsoup" call :updateClasspath "jackson-dataformat-yaml" +call :updateClasspath "jackson-datatype-jsr310" +call :updateClasspath "strftime4j" call :updateClasspath "scala-asm" call :updateClasspath "compiler-interface" call :updateClasspath "jline-reader" @@ -129,7 +131,7 @@ call :updateClasspath "flexmark-util" call :updateClasspath "flexmark-formatter" call :updateClasspath "autolink-0.6" call :updateClasspath "flexmark-jira-converter" -call :updateClasspath "antlr-3" +call :updateClasspath "antlr4" call :updateClasspath "jackson-annotations" call :updateClasspath "jackson-core" call :updateClasspath "jackson-databind" @@ -141,7 +143,7 @@ call :updateClasspath "jna-5" call :updateClasspath "flexmark-ext-tables" call :updateClasspath "flexmark-ext-ins" call :updateClasspath "flexmark-ext-superscript" -call :updateClasspath "antlr-runtime-3" +call :updateClasspath "antlr4-runtime" call :updateClasspath "ST4" goto :eof diff --git a/project/Build.scala b/project/Build.scala index 3ee15efc21e9..5773fab61cdb 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -1345,7 +1345,7 @@ object Build { ) }.taskValue, libraryDependencies ++= Dependencies.flexmarkDeps ++ Seq( - "nl.big-o" % "liqp" % "0.6.8", + "nl.big-o" % "liqp" % "0.8.2", "org.jsoup" % "jsoup" % "1.13.1", // Needed to process .html files for static site Dependencies.`jackson-dataformat-yaml`,