check point

mbari-org · Nov 27, 2023 · 3b7baf7 · 3b7baf7
1 parent f2e8fc1
commit 3b7baf7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/buildSrc/src/main/kotlin/org.mbari.commons.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/org.mbari.commons.java-conventions.gradle.kts
@@ -33,7 +33,6 @@ java {
     withJavadocJar()
 }
 
-
 publishing {
     publications {
         create<MavenPublication>("maven") {
@@ -94,4 +93,11 @@ tasks.javadoc {
     if (JavaVersion.current().isJava9Compatible) {
         (options as StandardJavadocDocletOptions).addBooleanOption("html5", true)
     }
+}
+
+tasks.jar {
+    manifest {
+        attributes(mapOf("Implementation-Title" to project.name,
+                         "Implementation-Version" to project.version))
+    }
 }
diff --git a/scommons/src/main/scala/org/mbari/scommons/etc/jdk/Logging.scala b/scommons/src/main/scala/org/mbari/scommons/etc/jdk/Logging.scala
@@ -19,11 +19,6 @@ import java.util.function.Supplier
  */
 object Logging:
 
-  trait Builder:
-    def logger: Logger
-    def level: Level
-    def throwable: Option[Throwable]
-
   case class LoggerBuilder(
       logger: Logger,
       level: Level = Level.OFF,

diff --git a/scommons/src/main/scala/org/mbari/scommons/util/ISO8601.scala b/scommons/src/main/scala/org/mbari/scommons/util/ISO8601.scala
@@ -23,5 +23,6 @@ object ISO8601:
   def parse(timestamp: String): Option[Instant] =
     Try(formatMillis.parse(timestamp))
       .orElse(Try(formatSeconds.parse(timestamp)))
+      .orElse(Try(DateTimeFormatter.ISO_INSTANT.parse(timestamp)))
       .toOption
       .map(Instant.from)