chore(java): Full java 17 only support

.github/workflows/build.yml

@@ -25,7 +25,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
       - uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'zulu'
           cache: 'gradle'
       - name: Prepare build variables

.github/workflows/pr.yml

@@ -19,7 +19,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
       - uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'zulu'
           cache: 'gradle'
       - name: Prepare build variables

.github/workflows/release.yml

@@ -23,7 +23,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
       - uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'zulu'
           cache: 'gradle'
       - name: Assemble release info

Dockerfile.compile

@@ -1,9 +1,9 @@
-FROM ubuntu:bionic
+FROM ubuntu:jammy
 LABEL maintainer="[email protected]"
 RUN echo "mysql-server mysql-server/root_password password sa" | debconf-set-selections
 RUN echo "mysql-server mysql-server/root_password_again password sa" | debconf-set-selections
 RUN apt-get update && apt-get install -y \
-    openjdk-11-jdk \
+    openjdk-17-jdk \
     mysql-server \
  && rm -rf /var/lib/apt/lists/*
 ENV GRADLE_USER_HOME /workspace/.gradle

Dockerfile.slim

@@ -1,6 +1,6 @@
-FROM alpine:3.11
+FROM alpine:3.20
 LABEL maintainer="[email protected]"
-RUN apk --no-cache add --update bash openjdk11-jre
+RUN apk --no-cache add --update bash openjdk17-jre
 RUN addgroup -S -g 10111 spinnaker
 RUN adduser -S -G spinnaker -u 10111 spinnaker
 COPY keel-web/build/install/keel /opt/keel

Dockerfile.ubuntu

@@ -1,6 +1,6 @@
-FROM ubuntu:bionic
+FROM ubuntu:jammy
 LABEL maintainer="[email protected]"
-RUN apt-get update && apt-get -y install openjdk-11-jre-headless wget
+RUN apt-get update && apt-get -y install openjdk-17-jre-headless wget
 RUN adduser --system --uid 10111 --group spinnaker
 COPY keel-web/build/install/keel /opt/keel
 RUN mkdir -p /opt/keel/plugins && chown -R spinnaker:nogroup /opt/keel/plugins

build.gradle

@@ -30,10 +30,6 @@ allprojects {
     apply(plugin: "com.github.ben-manes.versions")
     apply(plugin: "com.diffplug.spotless")
 
-    java {
-      sourceCompatibility = JavaVersion.VERSION_11
-      targetCompatibility = JavaVersion.VERSION_11
-    }
 
     dependencies {
       annotationProcessor(platform("io.spinnaker.kork:kork-bom:${korkVersion}"))

gradle.properties

@@ -1,3 +1,4 @@
+targetJava17=true
 kotlinVersion=1.6.21
 fiatVersion=1.50.0
 korkVersion=7.243.0
@@ -9,6 +10,8 @@ okHttpVersion=4.5.0
 resilience4jVersion=1.5.0
 spinnakerGradleVersion=8.32.1
 
+org.gradle.jvmargs=-Xmx4g -Xms4g
+
 # Used to control whether to spin up docker to run liquibase before jooq
 buildingInDocker=false
 

gradle/kotlin.gradle

@@ -5,7 +5,7 @@ apply plugin: "kotlin-allopen"
 compileKotlin {
   kotlinOptions {
     languageVersion = "1.6"
-    jvmTarget = "11"
+    jvmTarget = "17"
     // see https://kotlinlang.org/docs/java-to-kotlin-interop.html#compatibility-mode-for-default-methods
     freeCompilerArgs += "-Xjvm-default=enable"
   }
@@ -14,7 +14,7 @@ compileKotlin {
 compileTestKotlin {
   kotlinOptions {
     languageVersion = "1.6"
-    jvmTarget = "11"
+    jvmTarget = "17"
     freeCompilerArgs += "-Xjvm-default=enable"
   }
 }

keel-core-test/src/main/kotlin/com/netflix/spinnaker/keel/persistence/ArtifactRepositoryTests.kt

@@ -54,6 +54,7 @@ import strikt.assertions.isNull
 import strikt.assertions.isTrue
 import java.time.Clock
 import java.time.Instant
+import java.time.temporal.ChronoUnit
 
 abstract class ArtifactRepositoryTests<T : ArtifactRepository> : JUnit5Minutests {
   val publisher: ApplicationEventPublisher = mockk(relaxed = true)
@@ -649,7 +650,7 @@ abstract class ArtifactRepositoryTests<T : ArtifactRepository> : JUnit5Minutests
     }
 
     context("artifact creation timestamp exists") {
-      val createdAt = Instant.now()
+      val createdAt = Instant.now().truncatedTo(ChronoUnit.MILLIS)
 
       before {
         subject.register(versionedSnapshotDebian)

keel-core/src/main/java/com/netflix/spinnaker/keel/serialization/PrecisionSqlDeserializer.java

@@ -0,0 +1,18 @@
+package com.netflix.spinnaker.keel.serialization;
+
+import com.fasterxml.jackson.datatype.jsr310.deser.InstantDeserializer;
+import java.time.Instant;
+import java.time.format.DateTimeFormatter;
+
+public class PrecisionSqlDeserializer extends InstantDeserializer<Instant> {
+  public PrecisionSqlDeserializer() {
+    super(
+        Instant.class,
+        DateTimeFormatter.ISO_INSTANT,
+        Instant::from,
+        (a) -> Instant.ofEpochMilli(a.value),
+        (a) -> Instant.ofEpochSecond(a.integer, a.fraction),
+        null,
+        true);
+  }
+}

keel-core/src/main/java/com/netflix/spinnaker/keel/serialization/PrecisionSqlSerializer.java

@@ -0,0 +1,24 @@
+package com.netflix.spinnaker.keel.serialization;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.datatype.jsr310.ser.InstantSerializerBase;
+import java.time.Instant;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+
+public class PrecisionSqlSerializer extends InstantSerializerBase<Instant> {
+  public PrecisionSqlSerializer() {
+    super(
+        Instant.class,
+        Instant::toEpochMilli,
+        Instant::getEpochSecond,
+        Instant::getNano,
+        new DateTimeFormatterBuilder().appendInstant(3).toFormatter());
+  }
+
+  @Override
+  protected InstantSerializerBase<?> withFormat(
+      Boolean aBoolean, DateTimeFormatter dateTimeFormatter, JsonFormat.Shape shape) {
+    return this;
+  }
+}

keel-core/src/main/kotlin/com/netflix/spinnaker/keel/serialization/ObjectMappers.kt

@@ -16,8 +16,8 @@ import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
 import com.fasterxml.jackson.module.kotlin.registerKotlinModule
 import com.netflix.spinnaker.keel.jackson.registerKeelApiModule
 import de.huxhorn.sulky.ulid.ULID
-import org.springframework.boot.jackson.JsonComponentModule
 import java.text.SimpleDateFormat
+import java.time.Instant
 import java.util.TimeZone
 
 /**
@@ -29,18 +29,21 @@ fun configuredObjectMapper(): ObjectMapper = ObjectMapper().configureForKeel()
  * Factory method for [YAMLMapper]s configured how we like 'em.
  */
 fun configuredYamlMapper(): YAMLMapper = YAMLMapper().configureForKeel().disable(USE_NATIVE_TYPE_ID)
-
-fun <T : ObjectMapper> T.configureForKeel(): T =
-  apply {
+fun <T : ObjectMapper> T.configureForKeel(): T {
+  val javaTimeModule = JavaTimeModule()
+  javaTimeModule.addDeserializer(Instant::class.java, PrecisionSqlDeserializer())
+  javaTimeModule.addSerializer(Instant::class.java,PrecisionSqlSerializer())
+  return apply {
     registerKeelApiModule()
       .registerKotlinModule()
       .registerULIDModule()
-      .registerModule(JavaTimeModule())
+      .registerModule(javaTimeModule)
       .configureSaneDateTimeRepresentation()
       .disable(FAIL_ON_UNKNOWN_PROPERTIES)
       .enable(ACCEPT_CASE_INSENSITIVE_ENUMS)
       .setSerializationInclusion(NON_NULL)
   }
+}
 
 private fun ObjectMapper.registerULIDModule(): ObjectMapper =
   registerModule(

keel-sql/src/test/resources/testcontainers.properties

@@ -1 +1 @@
-ryuk.container.image = public.ecr.aws/s4w6t4b6/testcontainers/ryuk:0.3.4
+ryuk.container.image = testcontainers/ryuk:0.11.0