From a8999a2cc070ccee80aadfc34435cef8c20a23d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20Sj=C3=B6strand?= Date: Mon, 28 Jan 2019 17:03:02 +0100 Subject: [PATCH] Prepare for release 2.0 --- README.md | 4 ++-- build.sbt | 14 +++++++------- project/plugins.sbt | 2 +- .../sbx/anonymization/AnonymizationOp.scala | 16 ++++++++++++++++ .../sbx/anonymization/AnonymizationProfile.scala | 16 ++++++++++++++++ .../anonymization/ConfidentialityOption.scala | 16 ++++++++++++++++ src/main/scala/se/nimsa/sbx/box/BoxPollOps.scala | 16 ++++++++++++++++ src/main/scala/se/nimsa/sbx/box/BoxPushOps.scala | 16 ++++++++++++++++ .../scala/se/nimsa/sbx/box/BoxStreamOps.scala | 16 ++++++++++++++++ .../scala/se/nimsa/sbx/dicom/SliceboxTags.scala | 16 ++++++++++++++++ .../sbx/dicom/streams/AnonymizationFlow.scala | 16 ++++++++++++++++ .../se/nimsa/sbx/filtering/FilteringDAO.scala | 16 ++++++++++++++++ .../nimsa/sbx/filtering/FilteringProtocol.scala | 16 ++++++++++++++++ .../sbx/filtering/FilteringServiceActor.scala | 16 ++++++++++++++++ 14 files changed, 186 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 694a7d12..f50a8aef 100644 --- 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 index c7d22ab3..79eb473f 100644 --- 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 index 05558b89..33c0b3a0 100644 --- 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 index 69dd2f7b..4a3302e1 100644 --- 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 index c50a8a2f..4a2e6c9f 100644 --- 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 index 7da9e916..59a1f8df 100644 --- 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 index 47c803f0..4902c87c 100644 --- 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 index f1a6272d..c8e64e5b 100644 --- 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 index f863bcce..946260e2 100644 --- 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 index b97cd22a..0b2e09de 100644 --- 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 index 739d3ec0..7b3fab62 100644 --- 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 index 9f85acbf..d0a57d7a 100644 --- 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 index 8ef3baae..f05e7590 100644 --- 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 index d4b2b19c..010c29dd 100644 --- 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}