Commit 485e415b authored by Romain Reuillon's avatar Romain Reuillon
Browse files

Support java 9.

parent 17577f66
../../openmole/project/build.properties
\ No newline at end of file
......@@ -51,7 +51,8 @@ object OsgiProject {
(if (!omScope.isEmpty) Some("OpenMOLE-Scope" omScope.mkString(",")) else None) ++
(if (global) Some("Eclipse-BuddyPolicy" "global") else None)
}).value,
OsgiKeys.requireCapability := """osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))""""",
OsgiKeys.requireCapability := """osgi.ee; osgi.ee="JavaSE";version:List="1.8,1.9""""",
//OsgiKeys.bundleRequiredExecutionEnvironment := Seq("JavaSE-1.8", "JavaSE-1.9"),
OsgiKeys.privatePackage := privatePackages,
OsgiKeys.dynamicImportPackage := dynamicImports,
OsgiKeys.importPackage := imports,
......@@ -68,4 +69,4 @@ object OsgiGUIProject {
client: ClasspathDep[ProjectReference],
server: ClasspathDep[ProjectReference]) = OsgiProject(directory, artifactId) dependsOn (ext, client, server)
}
\ No newline at end of file
}
......@@ -57,7 +57,7 @@ lazy val circe = OsgiProject(dir, "io.circe",
lazy val logback = OsgiProject(dir, "ch.qos.logback", exports = Seq("ch.qos.logback.*", "org.slf4j.impl"), dynamicImports = Seq("*")) settings
(libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.0.9", version := "1.0.9") settings(settings: _*)
lazy val h2Version = "1.4.195"
lazy val h2Version = "1.4.196"
lazy val h2 = OsgiProject(dir, "org.h2", dynamicImports = Seq("*"), privatePackages = Seq("META-INF.*")) settings
(libraryDependencies += "com.h2database" % "h2" % h2Version, version := h2Version) settings(settings: _*)
......@@ -89,7 +89,7 @@ lazy val xstream = OsgiProject(
"!sun.misc.*",
"!org.joda.time.*",
"*"),
privatePackages = Seq("!scala.*", "META-INF.*", "*")) settings(
privatePackages = Seq("!scala.*", "META-INF.services.*", "*")) settings(
libraryDependencies ++= Seq("com.thoughtworks.xstream" % "xstream" % "1.4.9", "net.sf.kxml" % "kxml2" % "2.3.0"),
version := "1.4.9") settings(settings: _*)
......@@ -208,6 +208,14 @@ lazy val cats =
) settings(settings: _*)
lazy val freedslVersion = "0.21"
lazy val squantsVersion = "1.3.0"
lazy val squants =
OsgiProject(dir, "squants") settings (
libraryDependencies += "org.typelevel" %% "squants" % squantsVersion,
version := squantsVersion
) settings(settings: _*)
lazy val freedsl =
OsgiProject(dir, "freedsl", exports = Seq("freedsl.*", "freestyle.*", "mainecoon.*")) settings (
......@@ -220,7 +228,7 @@ lazy val freedsl =
libraryDependencies += "fr.iscpif.freedsl" %% "tool" % freedslVersion,
libraryDependencies += "fr.iscpif.freedsl" %% "dsl" % freedslVersion,
version := freedslVersion
) dependsOn(cats) settings(settings: _*)
) dependsOn(cats, squants) settings(settings: _*)
lazy val mgoVersion = "3.3"
......@@ -322,9 +330,9 @@ lazy val asm = OsgiProject(dir, "org.objectweb.asm") settings (
lazy val config = OsgiProject(dir, "org.apache.commons.configuration2",
privatePackages = Seq("!scala.*", "!org.apache.commons.logging.*","*"),
imports = Seq("org.apache.commons.logging.*")) settings (
libraryDependencies += "org.apache.commons" % "commons-configuration2" % "2.1",
libraryDependencies += "org.apache.commons" % "commons-configuration2" % "2.2",
libraryDependencies += "commons-beanutils" % "commons-beanutils" % "1.9.2",
version := "2.1") settings(settings: _*) dependsOn (logging)
version := "2.2") settings(settings: _*) dependsOn (logging)
lazy val sourceCode = OsgiProject(dir, "sourcecode") settings (
libraryDependencies += "com.lihaoyi" %% "sourcecode" % "0.1.3",
......
../../openmole/project/build.properties
\ No newline at end of file
......@@ -75,6 +75,8 @@ public class Launcher {
osgiConfig.put(Constants.FRAMEWORK_STORAGE, "");
osgiConfig.put(Constants.FRAMEWORK_STORAGE_CLEAN, "true");
osgiConfig.put(Constants.FRAMEWORK_BOOTDELEGATION, "*");
osgiConfig.put(Constants.FRAMEWORK_SYSTEMCAPABILITIES, "osgi.ee; osgi.ee=\"JavaSE\";version:List=\"1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,1.9,1.10,1.11,1.12\"");
osgiConfig.put(Constants.FRAMEWORK_EXECUTIONENVIRONMENT, "J2SE-1.12,JavaSE-1.12,J2SE-1.11,JavaSE-1.11,J2SE-1.10,JavaSE-1.10,J2SE-1.9,JavaSE-1.9,J2SE-1.8,JavaSE-1.8,J2SE-1.7,JavaSE-1.7,J2SE-1.6,JavaSE-1.6,J2SE-1.5,JavaSE-1.5,J2SE-1.4,JavaSE-1.4,J2SE-1.3,JavaSE-1.3,J2SE-1.2,,JavaSE-1.2,CDC-1.1/Foundation-1.1,CDC-1.0/Foundation-1.0,J2ME,OSGi/Minimum-1.1,OSGi/Minimum-1.0");
if(osgiDirectory != null) osgiConfig.put(Constants.FRAMEWORK_STORAGE, osgiDirectory);
Framework framework = frameworkFactory.newFramework(osgiConfig);
......
......@@ -664,8 +664,13 @@ def binDir = file("bin")
def bundleFilter(m: ModuleID, artifact: Artifact) = {
def excludedLibraryDependencies = Set("slick", "squants")
def exclude =
(m.organization != "org.openmole.library" && m.name.contains("slick")) || (m.name contains "scala-xml") || (m.name contains "protobuf")
(m.organization != "org.openmole.library" && excludedLibraryDependencies.exists(m.name.contains)) ||
(m.name contains "scala-xml") ||
(m.name contains "protobuf")
def include = (artifact.`type` == "bundle" && m.name != "osgi") ||
(m.name == "sshj") ||
......
for i in `find . -name "*jar"`
do
echo $i
unzip -q -c $i META-INF/MANIFEST.MF | grep $1
done
......@@ -22,6 +22,7 @@ object Libraries {
lazy val circeVersion = "0.9.0-M1"
lazy val catsVersion = "1.0.0-MF"
lazy val scalajsVersion = "0.6.21"
lazy val squantsVersion = "1.3.0"
lazy val scaladgetJS = libraryDependencies += "fr.iscpif" %%% "scaladget" % scaladgetVersion
lazy val scalajsDomJS = libraryDependencies += "org.scala-js" %%% "scalajs-dom" % scalaJSDomVersion
......@@ -45,7 +46,7 @@ object Libraries {
lazy val scalatra = "org.openmole.library" %% "org-scalatra" % "2.5.0"
lazy val logback = "org.openmole.library" %% "ch-qos-logback" % "1.0.9"
lazy val h2 = "org.openmole.library" %% "org-h2" % "1.4.195"
lazy val h2 = "org.openmole.library" %% "org-h2" % "1.4.196"
lazy val bonecp = "org.openmole.library" %% "com-jolbox-bonecp" % "0.8.0-rc1"
lazy val slick = "org.openmole.library" %% "com-typesafe-slick" % "3.2.0"
lazy val slf4j = "org.openmole.library" %% "org-slf4j" % "1.7.10"
......@@ -68,9 +69,10 @@ object Libraries {
lazy val async = "org.openmole.library" %% "scala-async" % "0.9.6"
lazy val jgit = "org.openmole.library" %% "org-eclipse-jgit" % "3.7.1"
lazy val cats = "org.openmole.library" %% "cats" % catsVersion
lazy val squants = "org.openmole.library" %% "squants" % squantsVersion
lazy val clapper = "org.openmole.library" %% "org-clapper" % "1.1.2"
lazy val asm = "org.openmole.library" %% "org-objectweb-asm" % "5.1"
lazy val configuration = "org.openmole.library" %% "org-apache-commons-configuration2" % "2.1"
lazy val configuration = "org.openmole.library" %% "org-apache-commons-configuration2" % "2.2"
lazy val json4s = "org.openmole.library" %% "org-json4s" % json4sVersion
lazy val circe = "org.openmole.library" %% "io-circe" % circeVersion
lazy val scalajsTools = "org.openmole.library" %% "scalajs-tools" % scalajsVersion
......@@ -117,10 +119,9 @@ object Libraries {
lazy val guava = "com.google.guava" % "guava" % "19.0"
lazy val spray = "io.spray" %% "spray-json" % "1.3.2"
lazy val bouncyCastle = "org.bouncycastle" % "bcpkix-jdk15on" % bouncyCastleVersion
lazy val equinoxOSGi = "org.eclipse" % "osgi" % "3.10.0-v20140606-1445"
lazy val equinoxOSGi = "org.eclipse.tycho" % "org.eclipse.osgi" % "3.12.1.v20170821-1548"
lazy val osgiCompendium = "org.osgi" % "org.osgi.compendium" % "4.3.1"
lazy val squants = "org.typelevel" %% "squants" % "1.3.0"
lazy val shapeless = "com.chuusai" %% "shapeless" % "2.3.2"
}
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