Permalink
Browse files

Improved exp. deps and also export modules

  • Loading branch information...
lefou committed Dec 18, 2018
1 parent 82d83c2 commit b8988d184d033d996a01585cec5e74a5282ee6ca
Showing with 97 additions and 8 deletions.
  1. +86 −0 blended.dependencies/src/main/scala/Blended.scala
  2. +1 −1 project/CommonSettings.scala
  3. +10 −7 project/Dependencies.scala
@@ -0,0 +1,86 @@
package blended.sbt

import sbt._

trait Blended {

// TODO: Find a way to generate the current version
def blendedVersion: String // = version.value

def blended(name: String) = "de.wayofquality.blended" %% name % blendedVersion

val activemqBrokerstarter = blended("blended.activemq.brokerstarter")
val activemqClient = blended("blended.activemq.client")
val activemqDefaultbroker = blended("blended.activemq.defaultbroker")
val akka = blended("blended.akka")
val akkaHttp = blended("blended.akka.http")
val akkaHttpApi = blended("blended.akka.http.api")
val akkaHttpJmsQueue = blended("blended.akka.http.jmsqueue")
val akkaHttpProxy = blended("blended.akka.http.proxy")
val akkaHttpRestJms = blended("blended.akka.http.restjms")
val akkaHttpSampleHelloworld = blended("blended.akka.http.sample.helloworld")
val camelUtils = blended("blended.camel.utils")
val containerContextApi = blended("blended.container.context.api")
val containerContextImpl = blended("blended.container.context.impl")
val containerRegistry = blended("blended.container.registry")
val demoReactor = blended("blended.demo.reactor")
val demoMgmt = blended("blended.demo.mgmt")
val demoMgmtResources = blended("blended.demo.mgmt.resources")
val demoNode = blended("blended.demo.node")
val demoNodeResources = blended("blended.demo.node.resources")
val dockerDemoApacheDS = blended("blended.docker.demo.apacheds")
val dockerReactor = blended("blended.docker.reactor")
val dockerDemoNode = blended("blended.docker.demo.node")
val dockerDemoMgmt = blended("blended.docker.demo.mgmt")
val domino = blended("blended.domino")
val file = blended("blended.file")
val hawtioLogin = blended("blended.hawtio.login")
val itestReactor = blended("blended.itest.reactor")
val itestSupport = blended("blended.itestsupport")
val itestMgmt = blended("blended.itest.mgmt")
val itestNode = blended("blended.itest.node")
val jettyBoot = blended("blended.jetty.boot")
val jmsBridge = blended("blended.jms.bridge")
val jmsSampler = blended("blended.jms.sampler")
val jmsUtils = blended("blended.jms.utils")
val jmx = blended("blended.jmx")
val jolokia = blended("blended.jolokia")
val launcher = blended("blended.launcher")
val launcherFeatures = blended("blended.launcher.features")
val mgmtAgent = blended("blended.mgmt.agent")
val mgmtBase = blended("blended.mgmt.base")
val mgmtRepo = blended("blended.mgmt.repo")
val mgmtRepoRest = blended("blended.mgmt.repo.rest")
val mgmtMock = blended("blended.mgmt.mock")
val mgmtRest = blended("blended.mgmt.rest")
val mgmtServiceJmx = blended("blended.mgmt.service.jmx")
val mgmtWs = blended("blended.mgmt.ws")
val persistence = blended("blended.persistence")
val persistenceH2 = blended("blended.persistence.h2")
val prickle = blended("blended.prickle")
val prickleAkkaHttp = blended("blended.prickle.akka.http")
val samplesReactor = blended("blended.samples.reactor")
val samplesCamel = blended("blended.samples.camel")
val samplesJms = blended("blended.samples.jms")
val security = blended("blended.security")
val securityAkkaHttp = blended("blended.security.akka.http")
val securityBoot = blended("blended.security.boot")
val securityScep = blended("blended.security.scep")
val securityScepStandalone = blended("blended.security.scep.standalone")
val securitySsl = blended("blended.security.ssl")
val securityLoginApi = blended("blended.security.login.api")
val securityLoginImpl = blended("blended.security.login.impl")
val securityLoginRest = blended("blended.security.login.rest")
val sslContext = blended("blended.sslcontext")
val streams = blended("blended.streams")
val streamsDispatcher = blended("blended.streams.dispatcher")
val streamsTestsupport = blended("blended.streams.testsupport")
val testSupport = blended("blended.testsupport")
val testSupportPojosr = blended("blended.testsupport.pojosr")
val updater = blended("blended.updater")
val updaterConfig = blended("blended.updater.config")
val updaterRemote = blended("blended.updater.remote")
val updaterTools = blended("blended.updater.tools")
val util = blended("blended.util")
val utilLogging = blended("blended.util.logging")
}
@@ -40,7 +40,7 @@ object CommonSettings {
"-target", "1.8"
),

scalaVersion := "2.12.8",
scalaVersion := blended.sbt.Dependencies.scalaVersion,
scalacOptions ++= Seq("-deprecation", "-feature", "-Xlint", "-Ywarn-nullary-override"),

scalariformAutoformat := false,
@@ -1,10 +1,10 @@
package blended.sbt

import sbt.Keys._
import sbt._

trait Dependencies {

// Versions
val activeMqVersion = "5.15.6"
val akkaVersion = "2.5.19"
val akkaHttpVersion = "10.1.5"
@@ -15,14 +15,15 @@ trait Dependencies {
val microJsonVersion = "1.4"
val parboiledVersion = "1.1.6"
val prickleVersion = "1.1.14"
val scalaVersion = "2.12.8"
val scalatestVersion = "3.0.5"
val scalaCheckVersion = "1.14.0"
val slf4jVersion = "1.7.25"
val sprayVersion = "1.3.4"
val springVersion = "4.3.11.RELEASE"

private[this] def akka(m: String) = "com.typesafe.akka" %% s"akka-${m}" % akkaVersion
private[this] def akka_Http(m: String) = "com.typesafe.akka" %% s"akka-${m}" % akkaHttpVersion
protected def akka(m: String) = "com.typesafe.akka" %% s"akka-${m}" % akkaVersion
protected def akka_Http(m: String) = "com.typesafe.akka" %% s"akka-${m}" % akkaHttpVersion

val activeMqBroker = "org.apache.activemq" % "activemq-broker" % activeMqVersion
val activeMqClient = "org.apache.activemq" % "activemq-client" % activeMqVersion
@@ -72,9 +73,10 @@ trait Dependencies {
val h2 = "com.h2database" % "h2" % "1.4.197"
val hikaricp = "com.zaxxer" % "HikariCP" % "3.1.0"

protected def jettyOsgi(n: String) = "org.eclipse.jetty.osgi" % s"jetty-$n" % jettyVersion

val jcip = "net.jcip" % "jcip-annotations" % "1.0"
val jclOverSlf4j = "org.slf4j" % "jcl-over-slf4j" % slf4jVersion
private def jettyOsgi(n: String) = "org.eclipse.jetty.osgi" % s"jetty-$n" % jettyVersion
val jettyOsgiBoot = jettyOsgi("osgi-boot")
val jjwt = "io.jsonwebtoken" % "jjwt" % "0.7.0"
val jms11Spec = "org.apache.geronimo.specs" % "geronimo-jms_1.1_spec" % "1.1.1"
@@ -106,8 +108,8 @@ trait Dependencies {
val prickle = "com.github.benhutchison" %% "prickle" % prickleVersion

// SCALA
val scalaLibrary = Def.setting("org.scala-lang" % "scala-library" % scalaVersion.value)
val scalaReflect = Def.setting("org.scala-lang" % "scala-reflect" % scalaVersion.value)
val scalaLibrary = "org.scala-lang" % "scala-library" % scalaVersion
val scalaReflect = "org.scala-lang" % "scala-reflect" % scalaVersion
val scalaParser = "org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.1"
val scalaXml = "org.scala-lang.modules" %% "scala-xml" % "1.1.0"

@@ -119,7 +121,8 @@ trait Dependencies {
val snakeyaml = "org.yaml" % "snakeyaml" % "1.18"
val sprayJson = "io.spray" %% s"spray-json" % sprayVersion

private def spring(n: String) = "org.springframework" % s"spring-${n}" % springVersion
protected def spring(n: String) = "org.springframework" % s"spring-${n}" % springVersion

val springBeans = spring("beans")
//val springAop = spring("aop")
//val springContext = spring("context")

0 comments on commit b8988d1

Please sign in to comment.