Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed Schema.scala syntax error for old scala #63

Merged
merged 1 commit into from
Apr 3, 2018
Merged

fixed Schema.scala syntax error for old scala #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
4 changes: 4 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 2 additions & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.49.0
1.50.0
4 changes: 2 additions & 2 deletions src/main/scala/com/horizon/exchangeapi/tables/Schema.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down