Migrate away from TrueCommons Services to Service Wight.

build.sbt

@@ -37,7 +37,8 @@ lazy val access: Project = project
       MockitoCore % Test,
       Scalacheck % Test,
       Scalatest % Test,
-      Slf4jSimple % Test
+      Slf4jSimple % Test,
+      TrueCommonsServices,
     ),
     name := "TrueVFS Access",
     normalizedName := "truevfs-access"
@@ -75,8 +76,10 @@ lazy val compIbm437: Project = project
       """Provides the IBM437 character set alias CP437 for use with genuine ZIP files.
         |Add the JAR artifact of this module to the run time class path to make its file system drivers available for service location in the client API modules.""".stripMargin,
     libraryDependencies ++= Seq(
+      FindbugsAnnotations,
       JunitInterface % Test,
-      TruecommonsAnnotations
+      Scalatest % Test,
+      ServiceWightAnnotation,
     ),
     name := "TrueVFS Component IBM437",
     normalizedName := "truevfs-comp-ibm437"
@@ -104,7 +107,7 @@ lazy val compJmx: Project = project
       JunitInterface % Test,
       Scalatest % Test,
       Slf4jSimple % Test,
-      TruecommonsJMX
+      TrueCommonsJMX
     ),
     name := "TrueVFS Component JMX",
     normalizedName := "truevfs-comp-jmx"
@@ -136,11 +139,11 @@ lazy val compZip: Project = project
       FindbugsAnnotations,
       JunitInterface % Test,
       Scalatest % Test,
-      TruecommonsIO,
-      TruecommonsIO % Test classifier "tests",
-      TruecommonsKeySpec,
-      TruecommonsShed,
-      TruecommonsShed % Test classifier "tests"
+      TrueCommonsIO,
+      TrueCommonsIO % Test classifier "tests",
+      TrueCommonsKeySpec,
+      TrueCommonsShed,
+      TrueCommonsShed % Test classifier "tests"
     ),
     name := "TrueVFS Component ZIP",
     normalizedName := "truevfs-comp-zip"
@@ -352,6 +355,7 @@ lazy val extLogging: Project = project
         |Add the JAR artifact of this module to the run time class path to make its services available for service location in the client API modules.""".stripMargin,
     libraryDependencies ++= Seq(
       Lombok % Provided,
+      TrueCommonsLogging,
     ),
     name := "TrueVFS Extension Logging",
     normalizedName := "truevfs-ext-logging"
@@ -405,10 +409,10 @@ lazy val it: Project = project
       Scalacheck % Test,
       Scalatest % Test,
       Slf4jSimple % Test,
-      TruecommonsIO % Test classifier "" classifier "tests",
-      TruecommonsKeyDefault % Test,
-      TruecommonsKeySpec % Test classifier "" classifier "tests",
-      TruecommonsShed % Test classifier "" classifier "tests"
+      TrueCommonsIO % Test classifier "" classifier "tests",
+      TrueCommonsKeyDefault % Test,
+      TrueCommonsKeySpec % Test classifier "" classifier "tests",
+      TrueCommonsShed % Test classifier "" classifier "tests"
     ),
     name := "TrueVFS Integration Tests",
     normalizedName := "truevfs-it",
@@ -436,7 +440,8 @@ lazy val kernelImpl: Project = project
       MockitoCore % Test,
       Scalatest % Test,
       Slf4jSimple % Test,
-      TruecommonsShed % Test classifier "" classifier "tests"
+      TrueCommonsLogging,
+      TrueCommonsShed % Test classifier "" classifier "tests"
     ),
     name := "TrueVFS Kernel Implementation",
     normalizedName := "truevfs-kernel-impl"
@@ -451,12 +456,12 @@ lazy val kernelSpec: Project = project
         |Provides a service provider API for a singleton file system manager, an I/O buffer pool and a file system driver map.""".stripMargin,
     libraryDependencies ++= Seq(
       Bali % Provided,
+      FindbugsAnnotations,
       JunitInterface % Test,
+      ServiceWightCore,
       Slf4jSimple % Test,
-      TruecommonsAnnotations,
-      TruecommonsCIO,
-      TruecommonsIO,
-      TruecommonsServices
+      TrueCommonsCIO,
+      TrueCommonsIO,
     ),
     name := "TrueVFS Kernel Specification",
     normalizedName := "truevfs-kernel-spec"
@@ -481,9 +486,9 @@ lazy val profileBase: Project = project
       """Bundles dependencies to support the most prominent use cases.
         |Provides the file system drivers for JAR and ZIP.""".stripMargin,
     libraryDependencies ++= Seq(
-      TruecommonsKeyConsole % Runtime,
-      TruecommonsKeyDefault % Runtime,
-      TruecommonsKeySwing % Runtime
+      TrueCommonsKeyConsole % Runtime,
+      TrueCommonsKeyDefault % Runtime,
+      TrueCommonsKeySwing % Runtime
     ),
     name := "TrueVFS Profile Base",
     normalizedName := "truevfs-profile-base"
@@ -506,7 +511,7 @@ lazy val profileDefault: Project = project
       """Bundles dependencies to support accessing all TrueVFS features without the slight negative performance impact of some excluded modules.
         |Depends on the base configuration profile and adds the file system drivers for HTTP(S), ODF, TAR, TAR.BZIP2, TAR.GZIP, TAR.XZ and ZIP.RAES.""".stripMargin,
     libraryDependencies ++= Seq(
-      TruecommonsKeyMacosx % Runtime
+      TrueCommonsKeyMacosx % Runtime
     ),
     name := "TrueVFS Profile Default",
     normalizedName := "truevfs-profile-default"
@@ -527,7 +532,7 @@ lazy val profileFull: Project = project
         |Should not be used in production environments because of its slightly negative performance impact.
         |Depends on the default configuration profile and adds the file system driver for SFX and the extensions Insight, Logging and Pacemaker.""".stripMargin,
     libraryDependencies ++= Seq(
-      TruecommonsKeyHurlfb % Runtime
+      TrueCommonsKeyHurlfb % Runtime
     ),
     name := "TrueVFS Profile Full",
     normalizedName := "truevfs-profile-full"
@@ -554,11 +559,11 @@ lazy val samples: Project = project
       """Sample applications to demonstrate the usage of TrueVFS modules to support many, even esoteric use cases.""".stripMargin,
     libraryDependencies ++= Seq(
       Slf4jSimple % Runtime,
-      TruecommonsKeyConsole % Runtime,
-      TruecommonsKeyDefault % Runtime,
-      TruecommonsKeyHurlfb % Runtime,
-      TruecommonsKeyMacosx % Runtime,
-      TruecommonsKeySwing % Runtime
+      TrueCommonsKeyConsole % Runtime,
+      TrueCommonsKeyDefault % Runtime,
+      TrueCommonsKeyHurlfb % Runtime,
+      TrueCommonsKeyMacosx % Runtime,
+      TrueCommonsKeySwing % Runtime
     ),
     name := "TrueVFS Samples",
     normalizedName := "truevfs-samples"

project/BuildSettings.scala

@@ -79,7 +79,7 @@ object BuildSettings {
         )
       },
       resolvers += Resolver.mavenLocal,
-      scalaVersion := ScalaVersion_2_13, // set here or otherwise `+publishSigned` will fail
+      scalaVersion := Versions.Scala_2_13, // set here or otherwise `+publishSigned` will fail
       scmInfo := Some(ScmInfo(
         browseUrl = url("https://github.com/christian-schlichtherle/truevfs"),
         connection = "scm:git:[email protected]/christian-schlichtherle/truevfs.git",

project/Dependencies.scala

@@ -18,39 +18,34 @@ import sbt._
 
 object Dependencies {
 
-  val FunIoVersion: String = "2.4.1"
-  val TruecommonsVersion: String = "2.5.0"
-  val Slf4jVersion: String = "1.7.30"
-
-  val Bali: ModuleID = "global.namespace.bali" % "bali-java" % "0.7.2"
+  val Bali: ModuleID = "global.namespace.bali" % "bali-java" % "0.8.0"
   val BcprovJdk15on: ModuleID = "org.bouncycastle" % "bcprov-jdk15on" % "1.68"
   val CommonsCompress: ModuleID = "org.apache.commons" % "commons-compress" % "1.20"
   val FindbugsAnnotations: ModuleID = "com.google.code.findbugs" % "annotations" % "3.0.1u2" exclude("com.google.code.findbugs", "jsr305") exclude("net.jcip", "jcip-annotations")
-  val FunIoBIOS: ModuleID = "global.namespace.fun-io" % "fun-io-bios" % FunIoVersion
-  val FunIoScalaApi: ModuleID = "global.namespace.fun-io" %% "fun-io-scala-api" % FunIoVersion
+  val FunIoBIOS: ModuleID = "global.namespace.fun-io" % "fun-io-bios" % Versions.FunIo
+  val FunIoScalaApi: ModuleID = "global.namespace.fun-io" %% "fun-io-scala-api" % Versions.FunIo
   val Httpclient: ModuleID = "org.apache.httpcomponents" % "httpclient" % "4.5.13" exclude("commons-logging", "commons-logging")
-  val JclOverSlf4j: ModuleID = "org.slf4j" % "jcl-over-slf4j" % Slf4jVersion
+  val JclOverSlf4j: ModuleID = "org.slf4j" % "jcl-over-slf4j" % Versions.Slf4j
   val Junit: ModuleID = "junit" % "junit" % "4.13.1"
   val JunitInterface: ModuleID = "com.novocode" % "junit-interface" % "0.11"
   val Lombok: ModuleID = "org.projectlombok" % "lombok" % "1.18.16"
   val MockitoCore: ModuleID = "org.mockito" % "mockito-core" % "3.7.7"
   val Scalacheck: ModuleID = "org.scalacheck" %% "scalacheck" % "1.15.2"
-  def scalaLibrary(scalaVersion: String): ModuleID = "org.scala-lang" % "scala-library" % scalaVersion
   val Scalatest: ModuleID = "org.scalatest" %% "scalatest" % "3.0.9"
-  val Slf4jSimple: ModuleID = "org.slf4j" % "slf4j-simple" % Slf4jVersion
-  val TruecommonsAnnotations: ModuleID = "net.java.truecommons" % "truecommons-annotations" % TruecommonsVersion exclude("com.google.code.findbugs", "jsr305") exclude("net.jcip", "jcip-annotations")
-  val TruecommonsCIO: ModuleID = "net.java.truecommons" % "truecommons-cio" % TruecommonsVersion
-  val TruecommonsIO: ModuleID = "net.java.truecommons" % "truecommons-io" % TruecommonsVersion
-  val TruecommonsJMX: ModuleID = "net.java.truecommons" % "truecommons-jmx" % TruecommonsVersion
-  val TruecommonsKeyConsole: ModuleID = "net.java.truecommons" % "truecommons-key-console" % TruecommonsVersion
-  val TruecommonsKeyDefault: ModuleID = "net.java.truecommons" % "truecommons-key-default" % TruecommonsVersion
-  val TruecommonsKeyHurlfb: ModuleID = "net.java.truecommons" % "truecommons-key-hurlfb" % TruecommonsVersion
-  val TruecommonsKeyMacosx: ModuleID = "net.java.truecommons" % "truecommons-key-macosx" % TruecommonsVersion
-  val TruecommonsKeySpec: ModuleID = "net.java.truecommons" % "truecommons-key-spec" % TruecommonsVersion
-  val TruecommonsKeySwing: ModuleID = "net.java.truecommons" % "truecommons-key-swing" % TruecommonsVersion
-  val TruecommonsServices: ModuleID = "net.java.truecommons" % "truecommons-services" % TruecommonsVersion
-  val TruecommonsShed: ModuleID = "net.java.truecommons" % "truecommons-shed" % TruecommonsVersion
+  val ServiceWightAnnotation: ModuleID = "global.namespace.service-wight" % "service-wight-annotation" % Versions.ServiceWight
+  val ServiceWightCore: ModuleID = "global.namespace.service-wight" % "service-wight-core" % Versions.ServiceWight
+  val Slf4jSimple: ModuleID = "org.slf4j" % "slf4j-simple" % Versions.Slf4j
+  val TrueCommonsCIO: ModuleID = "net.java.truecommons" % "truecommons-cio" % Versions.TrueCommons
+  val TrueCommonsIO: ModuleID = "net.java.truecommons" % "truecommons-io" % Versions.TrueCommons
+  val TrueCommonsJMX: ModuleID = "net.java.truecommons" % "truecommons-jmx" % Versions.TrueCommons
+  val TrueCommonsKeyConsole: ModuleID = "net.java.truecommons" % "truecommons-key-console" % Versions.TrueCommons
+  val TrueCommonsKeyDefault: ModuleID = "net.java.truecommons" % "truecommons-key-default" % Versions.TrueCommons
+  val TrueCommonsKeyHurlfb: ModuleID = "net.java.truecommons" % "truecommons-key-hurlfb" % Versions.TrueCommons
+  val TrueCommonsKeyMacosx: ModuleID = "net.java.truecommons" % "truecommons-key-macosx" % Versions.TrueCommons
+  val TrueCommonsKeySpec: ModuleID = "net.java.truecommons" % "truecommons-key-spec" % Versions.TrueCommons
+  val TrueCommonsKeySwing: ModuleID = "net.java.truecommons" % "truecommons-key-swing" % Versions.TrueCommons
+  val TrueCommonsLogging: ModuleID = "net.java.truecommons" % "truecommons-logging" % Versions.TrueCommons
+  val TrueCommonsServices: ModuleID = "net.java.truecommons" % "truecommons-services" % Versions.TrueCommons
+  val TrueCommonsShed: ModuleID = "net.java.truecommons" % "truecommons-shed" % Versions.TrueCommons
   val Xz: ModuleID = "org.tukaani" % "xz" % "1.8"
-
-  val ScalaVersion_2_13: String = sys.env.getOrElse("SCALA_VERSION_2_13", "2.13.4")
 }

project/Versions.scala

@@ -0,0 +1,8 @@
+object Versions {
+
+  val FunIo: String = "2.4.1"
+  val TrueCommons: String = "2.5.0"
+  val ServiceWight: String = "0.6.0"
+  val Scala_2_13: String = sys.env.getOrElse("SCALA_VERSION_2_13", "2.13.4")
+  val Slf4j: String = "1.7.30"
+}