Prepare for release 2.0

slicebox · Jan 28, 2019 · a8999a2 · a8999a2
1 parent 20a591b
commit a8999a2
Show file tree

Hide file tree

Showing 14 changed files with 186 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -4,8 +4,8 @@
 Service | Status | Description
 ------- | ------ | -----------
 Bintray           | [![Download](https://api.bintray.com/packages/slicebox/slicebox/installers/images/download.svg) ](https://bintray.com/slicebox/slicebox/installers/_latestVersion) | Latest Version on Bintray
-Travis            | [![Build Status](https://travis-ci.org/slicebox/slicebox.svg?branch=develop)](https://travis-ci.org/slicebox/slicebox.svg?branch=develop) | [Tests](https://travis-ci.org/slicebox/slicebox/)
-Coveralls         | [![Coverage Status](https://coveralls.io/repos/github/slicebox/slicebox/badge.svg?branch=develop)](https://coveralls.io/github/slicebox/slicebox?branch=develop) | Code coverage
+Travis            | [![Build Status](https://travis-ci.org/slicebox/slicebox.svg?branch=master)](https://travis-ci.org/slicebox/slicebox.svg?branch=master) | [Tests](https://travis-ci.org/slicebox/slicebox/)
+Coveralls         | [![Coverage Status](https://coveralls.io/repos/github/slicebox/slicebox/badge.svg?branch=master)](https://coveralls.io/github/slicebox/slicebox?branch=master) | Code coverage
 Gitter            | [![Join the chat at https://gitter.im/slicebox/slicebox](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/slicebox/slicebox?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) | Chatroom
 Documentation     | - | [Wiki](https://github.com/slicebox/slicebox/wiki)
 API Documentation | - | [REST API](http://slicebox.github.io/slicebox-api)

diff --git a/build.sbt b/build.sbt
@@ -1,9 +1,9 @@
 import CreateSources._
 
 name := "slicebox"
-version := "2.0-SNAPSHOT"
+version := "2.0"
 organization := "se.nimsa"
-scalaVersion := "2.12.7"
+scalaVersion := "2.12.8"
 scalacOptions := Seq("-encoding", "UTF-8", "-Xlint", "-deprecation", "-unchecked", "-feature", "-target:jvm-1.8")
 
 // define the project
@@ -76,24 +76,24 @@ updateOptions := updateOptions.value.withGigahorse(false) // temporary workaroun
 // deps
 
 libraryDependencies ++= {
-  val akkaVersion = "2.5.18"
-  val akkaHttpVersion = "10.1.5"
+  val akkaVersion = "2.5.19"
+  val akkaHttpVersion = "10.1.7"
   val slickVersion = "3.2.3"
   val dcm4cheVersion = "3.3.8"
   val alpakkaVersion = "0.20"
   Seq(
-    "com.typesafe.scala-logging" %% "scala-logging" % "3.9.0",
+    "com.typesafe.scala-logging" %% "scala-logging" % "3.9.2",
     "com.typesafe.akka" %% "akka-slf4j" % akkaVersion,
     "com.typesafe.akka" %% "akka-stream" % akkaVersion, // force newer version than default in akka-http
     "com.typesafe.akka" %% "akka-http" % akkaHttpVersion,
-    "de.heikoseeberger" %% "akka-http-play-json" % "1.22.0",
+    "de.heikoseeberger" %% "akka-http-play-json" % "1.24.3",
     "ch.qos.logback" % "logback-classic" % "1.2.3",
     "com.typesafe.slick" %% "slick" % slickVersion,
     "com.typesafe.slick" %% "slick-hikaricp" % slickVersion,
     "com.h2database" % "h2" % "1.4.197",
     "mysql" % "mysql-connector-java" % "6.0.6",
     "com.github.t3hnar" %% "scala-bcrypt" % "3.1",
-    "com.amazonaws" % "aws-java-sdk-s3" % "1.11.443",
+    "com.amazonaws" % "aws-java-sdk-s3" % "1.11.490",
     "org.scalatest" %% "scalatest" % "3.0.5" % "test",
     "org.dcm4che" % "dcm4che-core" % dcm4cheVersion,
     "org.dcm4che" % "dcm4che-image" % dcm4cheVersion,

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -16,4 +16,4 @@ addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.0.0")
 
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")
 
-addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.2.6")
+addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.2.7")
diff --git a/src/main/scala/se/nimsa/sbx/anonymization/AnonymizationOp.scala b/src/main/scala/se/nimsa/sbx/anonymization/AnonymizationOp.scala
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2014 Lars Edenbrandt
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package se.nimsa.sbx.anonymization
 
 sealed trait AnonymizationOp {

diff --git a/src/main/scala/se/nimsa/sbx/anonymization/AnonymizationProfile.scala b/src/main/scala/se/nimsa/sbx/anonymization/AnonymizationProfile.scala
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2014 Lars Edenbrandt
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package se.nimsa.sbx.anonymization
 
 import se.nimsa.sbx.anonymization.AnonymizationOp._

diff --git a/src/main/scala/se/nimsa/sbx/anonymization/ConfidentialityOption.scala b/src/main/scala/se/nimsa/sbx/anonymization/ConfidentialityOption.scala
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2014 Lars Edenbrandt
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package se.nimsa.sbx.anonymization
 
 sealed trait ConfidentialityOption {

diff --git a/src/main/scala/se/nimsa/sbx/box/BoxPollOps.scala b/src/main/scala/se/nimsa/sbx/box/BoxPollOps.scala
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2014 Lars Edenbrandt
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package se.nimsa.sbx.box
 
 import akka.actor.Scheduler

diff --git a/src/main/scala/se/nimsa/sbx/box/BoxPushOps.scala b/src/main/scala/se/nimsa/sbx/box/BoxPushOps.scala
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2014 Lars Edenbrandt
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package se.nimsa.sbx.box
 
 import akka.NotUsed

diff --git a/src/main/scala/se/nimsa/sbx/box/BoxStreamOps.scala b/src/main/scala/se/nimsa/sbx/box/BoxStreamOps.scala
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2014 Lars Edenbrandt
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package se.nimsa.sbx.box
 
 import akka.actor.ActorSystem

diff --git a/src/main/scala/se/nimsa/sbx/dicom/SliceboxTags.scala b/src/main/scala/se/nimsa/sbx/dicom/SliceboxTags.scala
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2014 Lars Edenbrandt
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package se.nimsa.sbx.dicom
 
 import com.typesafe.config.ConfigFactory

diff --git a/src/main/scala/se/nimsa/sbx/dicom/streams/AnonymizationFlow.scala b/src/main/scala/se/nimsa/sbx/dicom/streams/AnonymizationFlow.scala
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2014 Lars Edenbrandt
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package se.nimsa.sbx.dicom.streams
 
 import akka.NotUsed

diff --git a/src/main/scala/se/nimsa/sbx/filtering/FilteringDAO.scala b/src/main/scala/se/nimsa/sbx/filtering/FilteringDAO.scala
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2014 Lars Edenbrandt
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package se.nimsa.sbx.filtering
 
 import se.nimsa.dicom.data.TagTree

diff --git a/src/main/scala/se/nimsa/sbx/filtering/FilteringProtocol.scala b/src/main/scala/se/nimsa/sbx/filtering/FilteringProtocol.scala
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2014 Lars Edenbrandt
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package se.nimsa.sbx.filtering
 
 import se.nimsa.dicom.data.TagTree

diff --git a/src/main/scala/se/nimsa/sbx/filtering/FilteringServiceActor.scala b/src/main/scala/se/nimsa/sbx/filtering/FilteringServiceActor.scala
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2014 Lars Edenbrandt
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package se.nimsa.sbx.filtering
 
 import akka.actor.{Actor, ActorSystem, Props, Stash}