Merge pull request #7 from riptano/DSP-11638

RussellSpitzer · web-flow · commit c9836a5d00ea · 2016-11-09T10:36:39.000-08:00
DSP-11638: Update setEnv to point to Logback file
diff --git a/bin/setenv.sh b/bin/setenv.sh
@@ -43,7 +43,7 @@ if [ -z "$LOG_DIR" ]; then
 fi
 mkdir -p $LOG_DIR
 
-LOGGING_OPTS="-Dlog4j.configuration=file:$appdir/log4j-server.properties
+LOGGING_OPTS="-Dlogback.configurationFile=file:$appdir/logback-server.xml
               -DLOG_DIR=$LOG_DIR"
 
 # For Mesos
diff --git a/version.sbt b/version.sbt
@@ -1,3 +1,3 @@
-def currentVersion: String = ("git describe --tags --match v*" !!).trim.substring(1)
+def currentVersion: String = ("git describe --tags" !!).trim
 
 version in ThisBuild := currentVersion

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-def currentVersion: String = ("git describe --tags --match v*" !!).trim.substring(1)`
	`1`	`+def currentVersion: String = ("git describe --tags" !!).trim`
`2`	`2`
`3`	`3`	`version in ThisBuild := currentVersion`