Commit a5885d79 authored by Romain Reuillon's avatar Romain Reuillon
Browse files

[Lib] fix: ssh

parent 1c19ed5e
Pipeline #148 passed with stage
in 16 minutes and 43 seconds
......@@ -358,13 +358,12 @@ lazy val gridscaleHTTP = OsgiProject(dir, "gridscale.http", imports = Seq("*"),
lazy val gridscaleSSH = OsgiProject(dir, "gridscale.ssh", imports = Seq("*")) settings (
libraryDependencies += "fr.iscpif.gridscale" %% "ssh" % gridscaleVersion,
libraryDependencies += "net.i2p.crypto" % "eddsa" % "0.2.0",
version := gridscaleVersion
) settings(settings: _*) dependsOn(jzlib) dependsOn(gridscale)
) settings(settings: _*) dependsOn(sshj) dependsOn(gridscale)
lazy val jzlib = OsgiProject(dir, "com.jcraft.jzlib", imports = Seq("*")) settings (
libraryDependencies += "com.jcraft" % "jzlib" % "1.1.3",
version := "1.1.3"
lazy val sshj = OsgiProject(dir, "com.hierynomus.sshj", imports = Seq("*"), exports = Seq("com.hierynomus.*", "net.schmizz.*"), privatePackages = Seq("!scala.*", "!org.bouncycastle.*", "!org.slf4j.*", "**"), dynamicImports = Seq("org.bouncycastle.*")) settings (
libraryDependencies += "com.hierynomus" % "sshj" % "0.27.0",
version := "0.27.0"
) settings(settings: _*)
lazy val gridscaleCluster = OsgiProject(dir, "gridscale.cluster", imports = Seq("*")) settings (
......
......@@ -425,7 +425,7 @@ lazy val slurm = OsgiProject(pluginDir, "org.openmole.plugin.environment.slurm",
(libraryDependencies += Libraries.gridscaleSLURM) settings (pluginSettings: _*)
lazy val ssh = OsgiProject(pluginDir, "org.openmole.plugin.environment.ssh", imports = Seq("*")) dependsOn(openmoleDSL, event, batch, gridscale) settings
(libraryDependencies += Libraries.gridscaleSSH) settings (pluginSettings: _*)
(libraryDependencies ++= Libraries.gridscaleSSH) settings (pluginSettings: _*)
/* Grouping */
......@@ -726,7 +726,7 @@ def binDir = file("bin")
def bundleFilter(m: ModuleID, artifact: Artifact) = {
def excludedLibraryDependencies = Set("slick", "squants", "shapeless", "sourcecode")
def excludedLibraryDependencies = Set("slick", "squants", "shapeless", "sourcecode", "eddsa", "sshj")
def exclude =
(m.organization != "org.openmole.library" && excludedLibraryDependencies.exists(m.name.contains)) ||
......@@ -735,7 +735,7 @@ def bundleFilter(m: ModuleID, artifact: Artifact) = {
def include = (artifact.`type` == "bundle" && m.name != "osgi") ||
(m.name == "sshj") ||
//(m.name == "sshj") ||
m.organization == "org.bouncycastle" ||
(m.name == "httpclient-osgi") || (m.name == "httpcore-osgi") ||
(m.organization == "org.osgi" && m.name != "osgi")
......
......@@ -6,6 +6,8 @@ import sbt._
object Libraries {
lazy val gridscaleVersion = "2.16"
lazy val sshjVersion = "0.27.0"
lazy val mgoVersion = "3.28"
lazy val bouncyCastleVersion = "1.60"
lazy val aceVersion = "01.08.2014"
......@@ -111,7 +113,12 @@ object Libraries {
lazy val toolxitBibtex = "org.openmole" %% "toolxit-bibtex" % "0.2"
lazy val gridscale = "org.openmole.library" %% "gridscale" % gridscaleVersion
lazy val gridscaleSSH = "org.openmole.library" %% "gridscale-ssh" % gridscaleVersion
lazy val gridscaleSSH =
Seq(
"org.openmole.library" %% "gridscale-ssh" % gridscaleVersion,
"org.openmole.library" %% "com-hierynomus-sshj" % sshjVersion
)
lazy val gridscalePBS = "org.openmole.library" %% "gridscale-pbs" % gridscaleVersion
lazy val gridscaleSGE = "org.openmole.library" %% "gridscale-sge" % gridscaleVersion
lazy val gridscaleCondor = "org.openmole.library" %% "gridscale-condor" % gridscaleVersion
......
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