Commit 4a796860 authored by Juste Raimbault's avatar Juste Raimbault
Browse files

[Plugin][SpatialSampling] fix osgi bundeling issues

parent 14c310cf
......@@ -231,17 +231,18 @@ lazy val mgo = OsgiProject(dir, "mgo", exports = Seq("mgo.*", "freestyle.*"), im
version := mgoVersion) dependsOn(monocle, math, cats, squants) settings(settings: _*)
/*lazy val spatialdataVersion = "0.1-SNAPSHOT"
lazy val spatialdataVersion = "0.1-SNAPSHOT"
lazy val spatialdata = OsgiProject(dir, "org.openmole.spatialdata",
exports = Seq("org.openmole.spatialdata.*"),
imports = Seq("!*") //Seq("!org.apache.commons.math3.*","!better.*", "*")
, privatePackages = Seq("**"),//privatePackages = Seq("!scala.*","!org.apache.commons.math3.*" , "*")
) settings( // ,"**"
privatePackages = Seq("!scala.*","!org.apache.commons.math3.*","*")
) settings(
libraryDependencies += "org.openmole.library" %% "spatialdata" % spatialdataVersion,
version := spatialdataVersion,
OsgiKeys.embeddedJars := (Keys.externalDependencyClasspath in Compile).value map (_.data) filter (f=> (f.getName startsWith "gt-"))
) settings(settings: _*)*/
version := spatialdataVersion//,
//embeddedJars := (Keys.externalDependencyClasspath in Compile).value map (_.data) filter (f=> (f.getName startsWith "gt-")) // embed geotools jars
) settings(settings: _*)
......
......@@ -472,7 +472,7 @@ lazy val sensitivity = OsgiProject(pluginDir, "org.openmole.plugin.method.sensit
/* Sampling */
// FIXME problem with osgi bundling for spatialSampling
def allSampling = Seq(combineSampling, csvSampling,oneFactorSampling, lhsSampling, quasirandomSampling)//, spatialSampling)
def allSampling = Seq(combineSampling, csvSampling,oneFactorSampling, lhsSampling, quasirandomSampling, spatialSampling)
lazy val combineSampling = OsgiProject(pluginDir, "org.openmole.plugin.sampling.combine", imports = Seq("*")) dependsOn(exception, modifierDomain, collectionDomain, workflow) settings (pluginSettings: _*)
......@@ -488,6 +488,7 @@ lazy val quasirandomSampling = OsgiProject(pluginDir, "org.openmole.plugin.sampl
libraryDependencies += Libraries.math
) settings (pluginSettings: _*)
lazy val spatialSampling = OsgiProject(pluginDir, "org.openmole.plugin.sampling.spatial", imports = Seq("*")) dependsOn(exception, workflow, workspace) settings (
libraryDependencies += Libraries.math,
libraryDependencies += Libraries.spatialdata
......@@ -733,11 +734,11 @@ def binDir = file("bin")
def bundleFilter(m: ModuleID, artifact: Artifact) = {
def excludedLibraryDependencies = Set("slick", "squants", "shapeless", "sourcecode", "eddsa", "sshj")
def exclude =
def exclude =
(m.organization != "org.openmole.library" && excludedLibraryDependencies.exists(m.name.contains)) ||
(m.name contains "scala-xml") ||
(m.name contains "protobuf")
(m.name contains "protobuf") ||
(m.name contains "jts-core") || (m.name contains "si-quantity") || (m.name contains "systems-common-java8") || (m.name contains "uom-lib-common") || (m.name contains "unit-api") || (m.name contains "uom-se") // geotools bundled dependancies
def include = (artifact.`type` == "bundle" && m.name != "osgi") ||
//(m.name == "sshj") ||
......
......@@ -102,7 +102,7 @@ object Libraries {
lazy val netlogo6 = "org.openmole.library" % "ccl-northwestern-edu-netlogo6" % netLogo6Version
lazy val sourceCode = "org.openmole.library" %% "sourcecode" % sourcecodeVersion
lazy val txtmark = "org.openmole.library" %% "com-github-rjeschke-txtmark" % "0.13"
lazy val spatialdata = "org.openmole.library" %% "spatialdata" % spatialdataVersion
lazy val spatialdata = "org.openmole.library" %% "org-openmole-spatialdata" % spatialdataVersion
def httpClientVersion = "4.5.3"
lazy val httpClient =
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment