From 926f4fc55b0ad4639bd5854f3487e7a0ea9c2e1d Mon Sep 17 00:00:00 2001 From: Brian Schlining Date: Mon, 1 Apr 2024 11:17:39 -0700 Subject: [PATCH] Works in integration testing --- build.sbt | 6 +++--- project/build.properties | 2 +- src/main/scala/JettyMain.scala | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/build.sbt b/build.sbt index 74b3658..363d487 100644 --- a/build.sbt +++ b/build.sbt @@ -7,7 +7,7 @@ lazy val json4sJacksonVersion = "4.0.7" lazy val jansiVersion = "2.4.1" lazy val jtaVersion = "1.1" lazy val junitVersion = "4.13.2" -lazy val logbackVersion = "1.4.14" +lazy val logbackVersion = "1.5.3" lazy val rxjavaVersion = "3.1.8" lazy val scalatestVersion = "3.2.18" lazy val scalatraVersion = "3.0.0" @@ -18,8 +18,8 @@ Global / onChangedBuildSource := ReloadOnSourceChanges lazy val buildSettings = Seq( organization := "org.mbari.m3", - scalaVersion := "3.3.1", - crossScalaVersions := Seq("3.3.1"), + scalaVersion := "3.3.3", + crossScalaVersions := Seq("3.3.3"), organizationName := "Monterey Bay Aquarium Research Institute", startYear := Some(2017), licenses += ("Apache-2.0", new URL("https://www.apache.org/licenses/LICENSE-2.0.txt")) diff --git a/project/build.properties b/project/build.properties index 8cf07b7..4d5f78c 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.8 \ No newline at end of file +sbt.version=1.9.9 \ No newline at end of file diff --git a/src/main/scala/JettyMain.scala b/src/main/scala/JettyMain.scala index e5a15b2..ca79c6b 100644 --- a/src/main/scala/JettyMain.scala +++ b/src/main/scala/JettyMain.scala @@ -19,6 +19,7 @@ import org.eclipse.jetty.server._ import org.eclipse.jetty.webapp.WebAppContext import org.scalatra.servlet.ScalatraListener import org.slf4j.LoggerFactory +import org.mbari.m3.panoptes.AppConfig object JettyMain { @@ -41,7 +42,8 @@ object JettyMain { | | _____)| ___ || (\ \) || | | || _____) | | | __) (_____ ) | | ( | ( ) || | \ || | | || ( | | | ( ) | | | ) | ) ( || ) \ || (___) || ) | | | (____/\/\____) | - | |/ |/ \||/ )_)(_______)|/ )_( (_______/\_______)""".stripMargin + | |/ |/ \||/ )_)(_______)|/ )_( (_______/\_______)""".stripMargin + s" v${AppConfig.Version}" + println(s)