releasing-v1.7.0 (#967)

dasch-swiss · Aug 16, 2018 · d0dbe6f · d0dbe6f
1 parent 2d5dc67
commit d0dbe6f
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 17 deletions.
diff --git a/docs/DocsBuild.sbt b/docs/DocsBuild.sbt
@@ -1,7 +1,7 @@
 import scala.sys.process._
 
 // Define `Configuration` instances representing our different documentation trees
-val ParadoxSite = config("paradox")
+lazy val ParadoxSite = config("paradox")
 
 lazy val docs = (project in file(".")).
     configs(
@@ -16,7 +16,7 @@ lazy val docs = (project in file(".")).
     ).
     settings(
         // Set version string
-        version in ParadoxSite := "v1.6.0",
+        version in ParadoxSite := "v1.7.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
@@ -13,5 +13,6 @@ These are the release notes for each version of Knora.
 * [v1.5.0](v1.5.0.md)
 * [v1.6.0](v1.6.0.md)
 * [v1.7.0](v1.7.0.md)
+* [v1.8.0](v1.8.0.md)
 
 @@@
diff --git a/docs/src/paradox/00-release-notes/v1.7.0.md b/docs/src/paradox/00-release-notes/v1.7.0.md
@@ -1,5 +1,5 @@
-v1.7.0 Release Notes (not released yet)
-=======================================
+v1.7.0 Release Notes
+====================
 
 See the
 [release](https://github.com/dhlab-basel/Knora/releases/tag/v1.7.0) and closed tickets on the

diff --git a/docs/src/paradox/00-release-notes/v1.8.0.md b/docs/src/paradox/00-release-notes/v1.8.0.md
@@ -0,0 +1,15 @@
+v1.8.0 Release Notes (not released yet)
+=======================================
+
+See the
+[release](https://github.com/dhlab-basel/Knora/releases/tag/v1.8.0) and closed tickets on the
+[v1.7.0 milestone](https://github.com/dhlab-basel/Knora/milestone/12) on Github.
+
+Required changes to existing data:
+----------------------------------
+
+New features:
+-------------
+
+Bugfixes:
+---------
diff --git a/salsah1/SalsahBuild.sbt b/salsah1/SalsahBuild.sbt
@@ -1,6 +1,13 @@
 import sbt._
 import NativePackagerHelper._
 
+lazy val salsahCommonSettings = Seq(
+    organization := "org.knora",
+    name := "salsah",
+    version := "1.7.0",
+    scalaVersion := "2.12.4"
+)
+
 lazy val salsah1 = (project in file(".")).
         configs(
             HeadlessTest
@@ -43,13 +50,6 @@ lazy val salsah1 = (project in file(".")).
         settings(Revolver.settings: _*).
         enablePlugins(JavaAppPackaging) // Enable the sbt-native-packager plugin
 
-lazy val salsahCommonSettings = Seq(
-    organization := "org.knora",
-    name := "salsah",
-    version := "1.6.0",
-    scalaVersion := "2.12.4"
-)
-
 lazy val javaRunOptions = Seq(
     // "-showversion",
     "-Xms256m",

diff --git a/webapi/WebapiBuild.sbt b/webapi/WebapiBuild.sbt
@@ -7,6 +7,13 @@ import sbt.librarymanagement.Resolver
 
 connectInput in run := true
 
+lazy val webApiCommonSettings = Seq(
+    organization := "org.knora",
+    name := "webapi",
+    version := "1.7.0",
+    scalaVersion := "2.12.4"
+)
+
 // custom test and it settings
 lazy val GDBSE = config("gdbse") extend Test
 lazy val GDBSEIt = config("gdbse-it") extend IntegrationTest
@@ -159,12 +166,7 @@ lazy val webapi = (project in file(".")).
         enablePlugins(JavaAgent). // Adds AspectJ Weaver configuration
         enablePlugins(RevolverPlugin)
 
-lazy val webApiCommonSettings = Seq(
-    organization := "org.knora",
-    name := "webapi",
-    version := "1.6.0",
-    scalaVersion := "2.12.4"
-)
+
 
 lazy val webApiLibs = Seq(
     library.aspectJWeaver,