Releasing v1.5.0 (#872)

* refactor (salsah): clearer naming of settings

* releasing v1.5.0

RELEASING.md

@@ -6,9 +6,9 @@
  1. Remove the `(not released yet)` text in the title of the release notes.
  1. Create a new page with the next version number including the `(not released yet)` text and add page to TOC.
  1. Update links in the new page to point to correct release tag and milestone.
- 1. On Github - Move any open issues from current release milestone to the next release milestone.
- 1. On Github - Close current milestone.
  1. On Github - Create new milestone
+ 1. On Github - Move any open issues from current release milestone to the next release milestone and so on.
+ 1. On Github - Close current milestone.
  1. Run `GenerateContributorsFile`, passing it a GitHub API token (`runMain org.knora.webapi.util.GenerateContributorsFile [ -t TOKEN ]`), to generate `Contributors.md`, then commit that file.
  1. Push and merge PR to `develop`.
  1. Travis CI will start a [CI build](https://travis-ci.org/dhlab-basel/Knora/builds) for the new tag and publish

docs/DocsBuild.sbt

@@ -16,7 +16,7 @@ lazy val root = (project in file(".")).
     ).
     settings(
         // Set version string
-        version in ParadoxSite := "v1.4.0",
+        version in ParadoxSite := "v1.5.0",
 
         // Ghpages settings
         ghpagesNoJekyll := true,

docs/src/paradox/00-release-notes/v1.5.0.md

@@ -1,5 +1,5 @@
-v1.5.0 Release Notes (not released yet)
-=======================================
+v1.5.0 Release Notes
+====================
 
 See the
 [release](https://github.com/dhlab-basel/Knora/releases/tag/v1.5.0) and closed tickets on the

docs/src/paradox/00-release-notes/v1.6.0.md

@@ -0,0 +1,17 @@
+v1.6.0 Release Notes (not released yet)
+=======================================
+
+See the
+[release](https://github.com/dhlab-basel/Knora/releases/tag/v1.6.0) and closed tickets on the
+[v1.6.0 milestone](https://github.com/dhlab-basel/Knora/milestone/10) on Github.
+
+Required changes to existing data:
+----------------------------------
+
+New features:
+-------------
+
+
+Bugfixes:
+---------
+

salsah1/SalsahBuild.sbt

@@ -46,7 +46,7 @@ lazy val salsah = (project in file(".")).
 lazy val salsahCommonSettings = Seq(
     organization := "org.knora",
     name := "salsah",
-    version := "1.4.0",
+    version := "1.5.0",
     scalaVersion := "2.12.4"
 )
 
@@ -75,8 +75,8 @@ lazy val javaHeadlessTestOptions = Seq(
     "-Dconfig.resource=headless-testing.conf"
 ) ++ javaTestOptions
 
-lazy val akkaVersion = "2.5.9"
-lazy val akkaHttpVersion = "10.0.11"
+lazy val akkaVersion = "2.5.11"
+lazy val akkaHttpVersion = "10.1.0"
 
 lazy val salsahLibs = Seq(
     // akka

salsah1/src/main/resources/application.conf

@@ -4,13 +4,11 @@ app {
     http
         {
             hostname = "0.0.0.0"
-            http-port = 3335
-            https-port = 3336
-            base-knora-url = "http://0.0.0.0:3333"
+            port = 3335
         }
     jsconf {
-        webapi-url = "http://0.0.0.0:3333"
-        sipi-url = "http://0.0.0.0:1024"
+        external-webapi-url = "http://0.0.0.0:3333"
+        external-sipi-url = "http://0.0.0.0:1024"
     }
     testing {
         headless = false

salsah1/src/main/scala/org/knora/salsah/Settings.scala

@@ -29,8 +29,7 @@ import com.typesafe.config.Config
 class SettingsImpl(config: Config) extends Extension {
 
     val hostName = config.getString("app.http.hostname")
-    val httpPort = config.getInt("app.http.http-port")
-    val httpsPort = config.getInt("app.http.https-port")
+    val httpPort = config.getInt("app.http.port")
 
     // used for testing
     val headless = config.getBoolean("app.testing.headless")
@@ -40,8 +39,8 @@ class SettingsImpl(config: Config) extends Extension {
     val workingDirectory = config.getString("app.workdir")
 
     // Javascript Configuration
-    val webapiUrl = config.getString("app.jsconf.webapi-url")
-    val sipiUrl = config.getString("app.jsconf.sipi-url")
+    val webapiUrl = config.getString("app.jsconf.external-webapi-url")
+    val sipiUrl = config.getString("app.jsconf.external-sipi-url")
 }
 
 

webapi/WebapiBuild.sbt

@@ -142,7 +142,7 @@ lazy val webapi = (project in file(".")).
 lazy val webApiCommonSettings = Seq(
     organization := "org.knora",
     name := "webapi",
-    version := "1.4.0",
+    version := "1.5.0",
     scalaVersion := "2.12.4"
 )