From 3b7baf7b3b751bbe16071d66be38054f25ca38a6 Mon Sep 17 00:00:00 2001
From: Brian Schlining <bschlining@gmail.com>
Date: Mon, 27 Nov 2023 08:45:54 -0800
Subject: [PATCH] check point

---
 .../kotlin/org.mbari.commons.java-conventions.gradle.kts  | 8 +++++++-
 .../main/scala/org/mbari/scommons/etc/jdk/Logging.scala   | 5 -----
 .../src/main/scala/org/mbari/scommons/util/ISO8601.scala  | 1 +
 3 files changed, 8 insertions(+), 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
index 04794de..d570cf0 100644
--- 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))
+    }
 }
\ No newline at end of file
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
index ef2afb5..399e706 100644
--- 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
index c99ed4f..a345f13 100644
--- 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)