Merge pull request #63 from bmpotter/fix-wiotp-build

fixed Schema.scala syntax error for old scala

.travis.yml

@@ -2,7 +2,7 @@ sudo: true
 services: docker
 language: scala
 jdk: openjdk8
-scala: 2.12.1
+scala: 2.12.4
 notifications:
   slack:
     secure: vSzVllY4Vmt6Nf6Yl+5QDMKTEQ4jIbP/bC/LSzZFmQNlYWlDEzG1gQcPb4prh7/efjUFt+vM2lTFP7jLEkib+XiR8n4LShCl+IeRyBpiONXII4KN7O9IPTMMOpGvN/FhZFgyzRFwEvkCSuSBpOYoRGGij/wzo/mPzfJYEyGxpaRmQKEmD7xmtxXMAVWpK2L5fL6XbglEPKD7pMYUvM/WyzAMJg4JgDxOGeX7QLGdSQrTOOkUtJjiEs8WtB/fR9Gev+vwX22KrnMwZpmT9KPPi+kzwFYnfzKxHdjdsmydmBBlBS4XM8rvJL1eMyrQB2LOOW8xWUeOF03t5PfKAC6cY2h01Jdl/rx3L6Pc99ABItS3OvYcwL0HY20bz+hNI0seRMVftz7eRzMHGdQsfYXfU6hOxkovGutRoyVkS7f+m66nBaOfRh6DAlOt/H6us4WEq1zJb8SyP+S7Xm38grh+xEDIMaz8AeavhDRWyH6RQfrpxvcGbcWhURXiY7clJLgjmauGJw9H/jxkuuoIINIFjkrziRHDGj9ZxNp3JbtJfprrramMCLtHl5Ziz5Pjmcf46iZxFzNlRlW/aC5ZqQbHm5EgcNuHXHMHvzTQcnkFDrQBGaXI3sLXfaYt+1LeRwfQXGOsWSgc8lmgfcGn1Fvbj/8ykq/q1ReQFAbCvT62ZR8=

README.md

@@ -88,6 +88,10 @@ services in the exchange.
     - Allow random PW creation for user creation
     - Consider changing all creates to POST, and update (via put/patch) return codes to 200
 
+## Changes in 1.50.0
+
+- Fix build error in Schema.scala in wiotp enviroment
+
 ## Changes in 1.49.0
 
 - allow IBM agbots to access private ms/wl/svc/pat via get /workloads etc.

build.sbt

@@ -14,7 +14,8 @@ lazy val root = (project in file(".")).
       "com.typesafe.slick" %% "slick" % "latest.release",
       "com.typesafe.slick" %% "slick-hikaricp" % "latest.release",
       "org.postgresql" % "postgresql" % "latest.release",
-      "com.zaxxer" % "HikariCP" % "latest.release",
+      //"com.zaxxer" % "HikariCP" % "latest.release",  // was grabbing 3.0.0 too early
+      "com.zaxxer" % "HikariCP" % "2.5.1",
       //"org.slf4j" % "slf4j-api" % "latest.release",  // they put version 1.8.0-alpha2 prematurely into latest.release
       "org.slf4j" % "slf4j-api" % "1.7.25",
       //"ch.qos.logback" % "logback-classic" % "latest.release",  // they put version 1.3.0-alpha2 prematurely into latest.release

src/main/resources/version.txt

@@ -1 +1 @@
-1.49.0
+1.50.0

src/main/scala/com/horizon/exchangeapi/tables/Schema.scala

@@ -59,8 +59,8 @@ object SchemaTQ {
       sqlu"alter table agbotagreements add column servicePattern character varying not null default ''",
       sqlu"alter table agbotagreements add column serviceUrl character varying not null default ''",
       sqlu"alter table nodestatus add column services character varying not null default ''",
-      sqlu"alter table services rename column pkg to imagestore",
-    ),   // v1.48.0
+      sqlu"alter table services rename column pkg to imagestore"
+    )   // v1.48.0
   )
   val latestSchemaDescription = "Added columns agbotagreements and nodestatus tables, and changed column pkg to imagestore in services table"