From e099b18ae8cfc7893c44b6b6ef244c0e291a2cb8 Mon Sep 17 00:00:00 2001 From: Ivan Subotic Date: Fri, 29 Jun 2018 11:59:27 +0200 Subject: [PATCH] releasing-v1.6.0 (#914) --- docs/DocsBuild.sbt | 2 +- docs/src/paradox/00-release-notes/index.md | 1 + docs/src/paradox/00-release-notes/v1.6.0.md | 4 ++-- docs/src/paradox/00-release-notes/v1.7.0.md | 15 +++++++++++++++ salsah1/SalsahBuild.sbt | 2 +- webapi/WebapiBuild.sbt | 2 +- 6 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 docs/src/paradox/00-release-notes/v1.7.0.md diff --git a/docs/DocsBuild.sbt b/docs/DocsBuild.sbt index 2a85c3f27a..4c6efca0bd 100644 --- a/docs/DocsBuild.sbt +++ b/docs/DocsBuild.sbt @@ -16,7 +16,7 @@ lazy val docs = (project in file(".")). ). settings( // Set version string - version in ParadoxSite := "v1.5.0", + version in ParadoxSite := "v1.6.0", // Ghpages settings ghpagesNoJekyll := true, diff --git a/docs/src/paradox/00-release-notes/index.md b/docs/src/paradox/00-release-notes/index.md index 611c97e06a..81dfff83c1 100644 --- a/docs/src/paradox/00-release-notes/index.md +++ b/docs/src/paradox/00-release-notes/index.md @@ -12,5 +12,6 @@ These are the release notes for each version of Knora. * [v1.4.0](v1.4.0.md) * [v1.5.0](v1.5.0.md) * [v1.6.0](v1.6.0.md) +* [v1.7.0](v1.7.0.md) @@@ diff --git a/docs/src/paradox/00-release-notes/v1.6.0.md b/docs/src/paradox/00-release-notes/v1.6.0.md index ba23f36e67..9721be97d3 100644 --- a/docs/src/paradox/00-release-notes/v1.6.0.md +++ b/docs/src/paradox/00-release-notes/v1.6.0.md @@ -1,5 +1,5 @@ -v1.6.0 Release Notes (not released yet) -======================================= +v1.6.0 Release Notes +==================== See the [release](https://github.com/dhlab-basel/Knora/releases/tag/v1.6.0) and closed tickets on the diff --git a/docs/src/paradox/00-release-notes/v1.7.0.md b/docs/src/paradox/00-release-notes/v1.7.0.md new file mode 100644 index 0000000000..f5da597fbf --- /dev/null +++ b/docs/src/paradox/00-release-notes/v1.7.0.md @@ -0,0 +1,15 @@ +v1.7.0 Release Notes (not released yet) +======================================= + +See the +[release](https://github.com/dhlab-basel/Knora/releases/tag/v1.7.0) and closed tickets on the +[v1.7.0 milestone](https://github.com/dhlab-basel/Knora/milestone/11) on Github. + +Required changes to existing data: +---------------------------------- + +New features: +------------- + +Bugfixes: +--------- diff --git a/salsah1/SalsahBuild.sbt b/salsah1/SalsahBuild.sbt index 3b17d6a4ee..0cfcd02c1d 100644 --- a/salsah1/SalsahBuild.sbt +++ b/salsah1/SalsahBuild.sbt @@ -46,7 +46,7 @@ lazy val salsah1 = (project in file(".")). lazy val salsahCommonSettings = Seq( organization := "org.knora", name := "salsah", - version := "1.5.0", + version := "1.6.0", scalaVersion := "2.12.4" ) diff --git a/webapi/WebapiBuild.sbt b/webapi/WebapiBuild.sbt index 7ad6be7124..83a0205cb7 100644 --- a/webapi/WebapiBuild.sbt +++ b/webapi/WebapiBuild.sbt @@ -146,7 +146,7 @@ lazy val webapi = (project in file(".")). lazy val webApiCommonSettings = Seq( organization := "org.knora", name := "webapi", - version := "1.5.0", + version := "1.6.0", scalaVersion := "2.12.4" )