Skip to content

Commit

Permalink
Works in integration testing
Browse files Browse the repository at this point in the history
  • Loading branch information
hohonuuli committed Apr 1, 2024
1 parent 93cfd90 commit 926f4fc
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"))
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.8
sbt.version=1.9.9
4 changes: 3 additions & 1 deletion src/main/scala/JettyMain.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand All @@ -41,7 +42,8 @@ object JettyMain {
| | _____)| ___ || (\ \) || | | || _____) | | | __) (_____ )
| | ( | ( ) || | \ || | | || ( | | | ( ) |
| | ) | ) ( || ) \ || (___) || ) | | | (____/\/\____) |
| |/ |/ \||/ )_)(_______)|/ )_( (_______/\_______)""".stripMargin
| |/ |/ \||/ )_)(_______)|/ )_( (_______/\_______)""".stripMargin + s" v${AppConfig.Version}"

println(s)


Expand Down

0 comments on commit 926f4fc

Please sign in to comment.