Skip to content

Commit

Permalink
update play, mysql connector, and gson
Browse files Browse the repository at this point in the history
  • Loading branch information
Kevin Zurek committed Jan 31, 2015
1 parent ab88618 commit 237b50d
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion app/femr/ui/views/home/index.scala.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
@top = {
<div class="jumbotron">
<div class="container">
<h2>Welcome to fEMR 2.1.2, @currentUser.getFirstName!</h2>
<h2>Welcome to fEMR 2.1.3, @currentUser.getFirstName!</h2>
@*<p>This is a placeholder landing page. As more features are developed, this page will change over time.</p>*@
<p>Please select a tab at the top to get started!</p>

Expand Down
2 changes: 1 addition & 1 deletion app/femr/ui/views/partials/footer.scala.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<footer>
<hr />
<p>fEMR 2.1.2 &copy; 2014</p>
<p>fEMR 2.1.3 &copy; 2015</p>
</footer>
6 changes: 3 additions & 3 deletions project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import play.Play.autoImport._
object ApplicationBuild extends Build {

val appName = "fEMR"
val appVersion = "2.1.2"//doesn't auto update everything in the code when this is changed
val appVersion = "2.1.3"//doesn't auto update everything in the code when this is changed
val currentScalaVersion = "2.11.2"

val appDependencies = Seq(
Expand All @@ -14,10 +14,10 @@ object ApplicationBuild extends Build {
javaJdbc,
javaEbean,
"com.google.inject" % "guice" % "3.0",
"mysql" % "mysql-connector-java" % "5.1.18",
"mysql" % "mysql-connector-java" % "5.1.34",
"org.mindrot" % "jbcrypt" % "0.3m",
"commons-collections" % "commons-collections" % "3.2.1",
"com.google.code.gson" % "gson" % "2.2.4"
"com.google.code.gson" % "gson" % "2.3.1"
)


Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/release
resolvers += "jBCrypt Repository" at "http://repo1.maven.org/maven2/org/"

// Use the Play sbt plugin for Play projects
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.3.4")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.3.7")

0 comments on commit 237b50d

Please sign in to comment.