raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

Add jaxb to camel test classpath (#25417)

Browse source 
* Add jaxb to camel classpath

* Add activation

* Set camel additioanl libs to be provided

* Doc extra deps

* Add as test dep
This commit is contained in:
Christopher Batey 2018-08-01 16:13:03 +01:00 • committed by Konrad `ktoso` Malawski
parent cdd177b2c6
commit 59040fadad
2 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
akka-docs/src/main/paradox/camel.md
View file

@ -10,8 +10,22 @@ To use Camel, you must add the following dependency in your project:
version="$akka.version$"
}
## Introduction
Camel depends on `jaxb-api` and `javax.activation` that were removed from the JDK. If running on a version of the JDK 9 or above also add
the following dependencies:
@@dependency[sbt,Maven,Gradle] {
group="javax.xml.bind"
artifact="jaxb-api"
version="2.3.0"
}
@@dependency[sbt,Maven,Gradle] {
group="com.sun.activation"
artifact="javax.activation"
version="1.2.0"
}
## Introduction
@@@ warning

10
project/Dependencies.scala
View file

@ -76,6 +76,8 @@ object Dependencies {
val aeronDriver = "io.aeron" % "aeron-driver" % aeronVersion // ApacheV2
val aeronClient = "io.aeron" % "aeron-client" % aeronVersion // ApacheV2
object Docs {
val sprayJson = "io.spray" %% "spray-json" % "1.3.4" % "test"
val gson = "com.google.code.gson" % "gson" % "2.8.5" % "test"
@ -119,11 +121,17 @@ object Dependencies {
// If changed, update akka-docs/build.sbt as well
val sigarLoader = "io.kamon" % "sigar-loader" % "1.6.6-rev002" % "optional;provided;test" // ApacheV2
// Non-default module in Java9, removed in Java11. For Camel.
val jaxb = "javax.xml.bind" % "jaxb-api" % "2.3.0" % "provided;test"
val activation = "com.sun.activation" % "javax.activation" % "1.2.0" % "provided;test"
val levelDB = "org.iq80.leveldb" % "leveldb" % "0.10" % "optional;provided" // ApacheV2
val levelDBmultiJVM = "org.iq80.leveldb" % "leveldb" % "0.10" % "optional;provided;multi-jvm" // ApacheV2
val levelDBNative = "org.fusesource.leveldbjni" % "leveldbjni-all" % "1.8" % "optional;provided" // New BSD
val junit = Compile.junit % "optional;provided;test"
}
}
@ -167,7 +175,7 @@ object Dependencies {
val persistenceShared = l ++= Seq(Provided.levelDB, Provided.levelDBNative)
val camel = l ++= Seq(camelCore, Test.scalatest.value, Test.junit, Test.mockito, Test.logback, Test.commonsIo)
val camel = l ++= Seq(camelCore, Provided.jaxb, Provided.activation, Test.scalatest.value, Test.junit, Test.mockito, Test.logback, Test.commonsIo)
val osgi = l ++= Seq(osgiCore, osgiCompendium, Test.logback, Test.commonsIo, Test.pojosr, Test.tinybundles, Test.scalatest.value, Test.junit)