final

aws-sagemaker-hosted-scorer/build.gradle

@@ -12,8 +12,8 @@ dependencies {
     implementation group: 'io.springfox', name: 'springfox-boot-starter', version: springFoxVersion
     implementation group: 'com.google.guava', name: 'guava', version: guavaVersion
     implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web'
-    implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: tomcatEmbedVersion
-    implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-websocket', version: tomcatEmbedVersion
+    implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '9.0.75'
+    implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-websocket', version: '9.0.75'
 }
 
 test {

common/jdbc/build.gradle

@@ -15,8 +15,9 @@ dependencies {
     implementation group: 'org.apache.spark', name: 'spark-sql_2.12'
     implementation group: 'org.apache.spark', name: 'spark-mllib_2.12'
     implementation group: 'com.typesafe', name:'config'
-    implementation group: 'ch.qos.logback', name: 'logback-classic'
-    implementation group: 'ch.qos.logback', name: 'logback-core'
+    implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.36'
+    implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.0.13'
+    implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.0.13'
 
     testImplementation group: 'org.scalatest', name: 'scalatest_2.12', version: '3.0.5'
     testRuntimeOnly group:'org.scala-lang.modules', name: 'scala-xml_2.12', version: '1.1.1'

common/transform/build.gradle

@@ -11,7 +11,6 @@ dependencies {
     implementation group: 'ai.h2o', name: 'mojo2-runtime-impl'
     implementation group: 'com.google.guava', name: 'guava'
     implementation group: 'org.slf4j', name: 'slf4j-api'
-    implementation group: 'org.yaml', name: 'snakeyaml'
     // FIXME(MM): this should not be required, since the dependency should be provided
     // by mojo2-runtime-impl. The problem is that mojo2 does not expose that dependency
     // as compile time dependency for consumers.

gcp-cloud-run/build.gradle

@@ -8,8 +8,8 @@ dependencies {
     implementation project(':local-rest-scorer')
     implementation group: 'org.slf4j', name: 'slf4j-api'
     implementation group: 'com.google.cloud', name: 'google-cloud-storage'
-    implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: tomcatEmbedVersion
-    implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-websocket', version: tomcatEmbedVersion
+    implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '9.0.75'
+    implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-websocket', version: '9.0.75'
 }
 
 test {

gradle.properties

@@ -22,9 +22,8 @@ swaggerParserVersion = 2.1.14
 swaggerCoreVersion = 2.2.20
 swaggerCoreSpringVersion = 1.6.12
 shadowJarVersion = 7.1.0
-slf4jVersion = 1.7.36
-logbackVersion = 1.0.13
-log4jVersion = 2.22.0
+slf4jVersion = 2.0.9
+logbackVersion = 1.4.14
 apacheCommonsCliVersion = 1.4
 truthVersion = 0.42
 guavaVersion = 32.0.0-jre
@@ -34,7 +33,7 @@ scalaVersion = 2.12.15
 sparklingWaterVersion = 3.30.1.3-1-3.0
 configVersion = 1.3.4
 openApiJacksonNullableVersion = 0.2.6
-tomcatEmbedVersion = 9.0.75
+jakartaServletVersion = 6.0.0
 
 # External plugins:
 springBootPluginVersion = 3.2.0

gradle/mixins/dependencies.gradle

@@ -21,6 +21,7 @@ dependencyManagement {
         dependency group: 'com.google.truth.extensions', name: 'truth-java8-extension', version: truthVersion
         dependency group: 'com.google.cloud', name: 'google-cloud-storage', version: googleStorageVersion
         dependency group: 'io.springfox', name: 'springfox-boot-starter', version: springFoxVersion
+        dependency group: 'org.springframework.boot', name: 'spring-boot-starter-tomcat', version: springBootPluginVersion
         dependency group: 'io.swagger.core.v3', name: 'swagger-annotations', version: swaggerCoreVersion
         dependency group: 'io.swagger.parser.v3', name: 'swagger-parser', version: swaggerParserVersion
         dependency group: 'io.swagger.codegen.v3', name: 'swagger-codegen-cli', version: swaggerCodegenVersion
@@ -43,12 +44,7 @@ dependencyManagement {
             entry 'logback-classic'
             entry 'logback-core'
         }
-
-        dependencySet(group: 'org.apache.logging.log4j', version: log4jVersion) {
-            entry 'log4j-api'
-            entry 'log4j-core'
-            entry 'log4j-slf4j-impl'
-        }
+        dependency group: 'jakarta.servlet', name: 'jakarta.servlet-api', version: jakartaServletVersion
 
         dependency group: 'org.apache.spark', name: 'spark-core_2.12', version: sparkVersion
         dependency group: 'org.apache.spark', name: 'spark-sql_2.12', version: sparkVersion

kdb-mojo-scorer/build.gradle

@@ -8,10 +8,10 @@ dependencies {
     implementation group: 'ai.h2o', name: 'mojo2-runtime-api'
     implementation group: 'ai.h2o', name: 'mojo2-runtime-impl'
     implementation group: 'commons-cli', name: 'commons-cli'
-    implementation group: 'org.slf4j', name: 'slf4j-api'
-    implementation group: 'org.apache.logging.log4j', name: 'log4j-api'
-    implementation group: 'org.apache.logging.log4j', name: 'log4j-core'
-    implementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl'
+    implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.36'
+    implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.22.0'
+    implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.22.0'
+    implementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.22.0'
 
     testImplementation group: 'com.google.truth.extensions', name: 'truth-java8-extension'
     testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api'

local-rest-scorer/build.gradle

@@ -15,10 +15,10 @@ dependencies {
     implementation group: 'ai.h2o', name: 'mojo2-runtime-impl'
     implementation group: 'io.springfox', name: 'springfox-boot-starter', version: springFoxVersion
     implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web'
-    implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: tomcatEmbedVersion
+    implementation group: 'org.springframework.boot', name: 'spring-boot-starter-tomcat'
 
     implementation group: 'com.google.guava', name: 'guava', version: guavaVersion
-    implementation group: 'org.yaml', name: 'snakeyaml'
+    implementation group: 'jakarta.servlet', name: 'jakarta.servlet-api'
 
     testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test'
     testImplementation group: 'com.google.truth.extensions', name: 'truth-java8-extension'
@@ -64,12 +64,12 @@ jib {
         image = javaBaseImage
     }
     to {
-        image = dockerRepositoryPrefix + 'rest-scorer'
-        tags = [version]
-        auth {
+        image = 'gcr.io/vorvan/h2oai/rest-scorer'
+        tags = ['local']
+        /*auth {
             username = System.getenv('TO_DOCKER_USERNAME') ?: ''
             password = System.getenv('TO_DOCKER_PASSWORD') ?: ''
-        }
+        }*/
     }
     container {
         jvmFlags = ["-Dmojo.path=/mojos/pipeline.mojo", "--add-opens", "java.base/java.lang=ALL-UNNAMED", "--add-opens", "java.base/java.util=ALL-UNNAMED", "--add-opens", "java.base/java.lang.reflect=ALL-UNNAMED"]