From d21409e6cb9c0f3148285cea2a7db1ef658c2404 Mon Sep 17 00:00:00 2001 From: Ivan Subotic Date: Thu, 31 May 2018 17:38:35 +0200 Subject: [PATCH] Releasing v1.5.0 (#872) * refactor (salsah): clearer naming of settings * releasing v1.5.0 --- RELEASING.md | 4 ++-- docs/DocsBuild.sbt | 2 +- docs/src/paradox/00-release-notes/v1.5.0.md | 4 ++-- docs/src/paradox/00-release-notes/v1.6.0.md | 17 +++++++++++++++++ salsah1/SalsahBuild.sbt | 6 +++--- salsah1/src/main/resources/application.conf | 8 +++----- .../main/scala/org/knora/salsah/Settings.scala | 7 +++---- webapi/WebapiBuild.sbt | 2 +- 8 files changed, 32 insertions(+), 18 deletions(-) create mode 100644 docs/src/paradox/00-release-notes/v1.6.0.md diff --git a/RELEASING.md b/RELEASING.md index 53c0a9cc87..2ef839f95c 100644 --- a/RELEASING.md +++ b/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 diff --git a/docs/DocsBuild.sbt b/docs/DocsBuild.sbt index e179987fbd..33816ccb62 100644 --- a/docs/DocsBuild.sbt +++ b/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, diff --git a/docs/src/paradox/00-release-notes/v1.5.0.md b/docs/src/paradox/00-release-notes/v1.5.0.md index bfa8fe3aab..4b20eac9fb 100644 --- a/docs/src/paradox/00-release-notes/v1.5.0.md +++ b/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 diff --git a/docs/src/paradox/00-release-notes/v1.6.0.md b/docs/src/paradox/00-release-notes/v1.6.0.md new file mode 100644 index 0000000000..b054302dad --- /dev/null +++ b/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: +--------- + diff --git a/salsah1/SalsahBuild.sbt b/salsah1/SalsahBuild.sbt index d29ad9fb4f..e0406d5b3b 100644 --- a/salsah1/SalsahBuild.sbt +++ b/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 diff --git a/salsah1/src/main/resources/application.conf b/salsah1/src/main/resources/application.conf index 4d41339630..5055a54765 100644 --- a/salsah1/src/main/resources/application.conf +++ b/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 diff --git a/salsah1/src/main/scala/org/knora/salsah/Settings.scala b/salsah1/src/main/scala/org/knora/salsah/Settings.scala index ae220570c0..373083620f 100644 --- a/salsah1/src/main/scala/org/knora/salsah/Settings.scala +++ b/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") } diff --git a/webapi/WebapiBuild.sbt b/webapi/WebapiBuild.sbt index 79609efb77..1947aff998 100644 --- a/webapi/WebapiBuild.sbt +++ b/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" )