Skip to content
This repository has been archived by the owner on Sep 29, 2023. It is now read-only.

Commit

Permalink
Merge branch 'master' into migrate-to-play-26
Browse files Browse the repository at this point in the history
  • Loading branch information
matterche authored Sep 19, 2017
2 parents 867da5b + 4b74e81 commit d15d17f
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
target/
logs/
.idea/
*.sc
*.swp

9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Changelog
All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)

## [0.2.3] - 2017-09-18
### Added
- Class name added to request logs by @rgritti

5 changes: 2 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import scalariform.formatter.preferences._

val commonSettings = Seq(
organization := "org.zalando",
version := "0.2.2",
version := "0.2.3",
scalaVersion := "2.12.3",
scalacOptions := Seq("-unchecked", "-deprecation", "-encoding", "utf8"),
publishTo := {
Expand Down Expand Up @@ -52,7 +52,6 @@ lazy val libraries =
lazy val root = (project in file("."))
.settings(commonSettings: _*)
.settings(name := "play-Zhewbacca")
.settings(version := "0.2.2")
.settings(libraryDependencies ++= (testDependencies ++ playDependencies ++ libraries))
.settings(parallelExecution in Test := false)

Expand Down Expand Up @@ -109,4 +108,4 @@ pomExtra := (
<developer>
<name>Raymond Chenon</name>
</developer>
</developers>)
</developers>)

0 comments on commit d15d17f

Please sign in to comment.