Skip to content

Commit

Permalink
Prepping for release
Browse files Browse the repository at this point in the history
  • Loading branch information
hohonuuli committed Sep 19, 2019
1 parent 9385be8 commit e358f57
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 12 deletions.
14 changes: 7 additions & 7 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
lazy val auth0Version = "3.8.1"
lazy val auth0Version = "3.8.2"
lazy val codecVersion = "1.13"
lazy val configVersion = "1.3.4"
lazy val jettyVersion = "9.4.19.v20190610"
lazy val jettyVersion = "9.4.20.v20190813"
lazy val json4sJacksonVersion = "3.6.7"
lazy val jtaVersion = "1.1"
lazy val junitVersion = "4.12"
lazy val logbackVersion = "1.2.3"
lazy val rxjavaVersion = "2.2.2"
lazy val rxjavaVersion = "2.2.12"
lazy val scalatestVersion = "3.0.8"
lazy val scalatraVersion = "2.6.5"
lazy val servletVersion = "3.1.0"
lazy val slf4jVersion = "1.7.27"
lazy val slf4jVersion = "1.7.28"

lazy val buildSettings = Seq(
organization := "org.mbari.m3",
scalaVersion := "2.12.9",
crossScalaVersions := Seq("2.12.9"),
scalaVersion := "2.12.10",
crossScalaVersions := Seq("2.12.10"),
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 Expand Up @@ -87,7 +87,7 @@ lazy val `panoptes` = (project in file("."))
.settings(appSettings)
.settings(
name := "panoptes",
version := "0.2.0",
version := "0.2.2",
fork := true,
libraryDependencies ++= Seq(
"com.auth0" % "java-jwt" % auth0Version,
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#sbt.version=0.13.15
sbt.version=1.2.8
sbt.version=1.3.0

10 changes: 6 additions & 4 deletions src/pack/conf/logback.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8" ?>

<configuration>

<variable name="LOGBACK_LEVEL" value="${LOGBACK_LEVEL:-WARN}" />

<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>debug</level>
Expand All @@ -15,8 +17,8 @@
<logger name="org.fusesource.scalate" level="WARN" />
<logger name="httpclient.wire.header" level="WARN" />

<root level="WARN">
<appender-ref ref="CONSOLE"/>
<root level="${LOGBACK_LEVEL}">
<appender-ref ref="CONSOLE" />
</root>

</configuration>
</configuration>

0 comments on commit e358f57

Please sign in to comment.