clean up a bit

h2oai · Jan 25, 2024 · 329911c · 329911c
1 parent 6b8d1ed
commit 329911c
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/aws-lambda-scorer/lambda-template/build.gradle b/aws-lambda-scorer/lambda-template/build.gradle
@@ -15,6 +15,7 @@ dependencies {
     implementation group: 'com.google.code.gson', name: 'gson'
     implementation group: 'io.swagger.core.v3', name: 'swagger-annotations'
 
+    testImplementation group: 'com.google.truth.extensions', name: 'truth-java8-extension'
     testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api'
     testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine'
 }

diff --git a/aws-sagemaker-hosted-scorer/build.gradle b/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: '9.0.75'
-    implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-websocket', version: '9.0.75'
+    implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: tomcatVersion
+    implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-websocket', version: tomcatVersion
 }
 
 test {
@@ -49,7 +49,7 @@ jib {
         }
     }
     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"]
+        jvmFlags = defaultJibContainerJvmFlags.split(" ").each { it.trim() }
         ports = ['8080']
         volumes = [
                 // mojo pipeline and license file will live here

diff --git a/gcp-cloud-run/build.gradle b/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: '9.0.75'
-    implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-websocket', version: '9.0.75'
+    implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: tomcatVersion
+    implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-websocket', version: tomcatVersion
 }
 
 test {
@@ -46,7 +46,7 @@ jib {
         }
     }
     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"]
+        jvmFlags = defaultJibContainerJvmFlags.split(" ").each { it.trim() }
         ports = ['8080']
         environment = [
                 // The expected path to the DAI license file.

diff --git a/gcp-vertex-ai-mojo-scorer/build.gradle b/gcp-vertex-ai-mojo-scorer/build.gradle
@@ -63,7 +63,7 @@ jib {
         }
     }
     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"]
+        jvmFlags = defaultJibContainerJvmFlags.split(" ").each { it.trim() }
         ports = ['8080']
         environment = [
                 // The expected path to the DAI license file.

diff --git a/gradle.properties b/gradle.properties
@@ -34,6 +34,7 @@ sparklingWaterVersion = 3.30.1.3-1-3.0
 configVersion = 1.3.4
 openApiJacksonNullableVersion = 0.2.6
 jakartaServletVersion = 6.0.0
+tomcatVersion = 9.0.75
 
 # External plugins:
 springBootPluginVersion = 3.2.0

diff --git a/local-rest-scorer/build.gradle b/local-rest-scorer/build.gradle
@@ -72,7 +72,7 @@ jib {
         }
     }
     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"]
+        jvmFlags = defaultJibContainerJvmFlags.split(" ").each { it.trim() }
         ports = ['8080']
         volumes = [
                 // For storing the mojo2 file with the model to be used for scoring.

diff --git a/settings.gradle b/settings.gradle
@@ -3,7 +3,6 @@ pluginManagement {
         id 'com.google.cloud.tools.jib' version "${jibPluginVersion}"
         id 'com.github.johnrengelman.shadow' version "${shadowJarVersion}"
         id 'org.springframework.boot' version "${springBootPluginVersion}"
-        id 'org.hidetake.swagger.generator' version "${swaggerGradlePluginVersion}"
         id 'org.openapi.generator' version "${openApiGeneratorGradlePluginVersion}"
     }
 }
@@ -15,7 +14,6 @@ dependencyResolutionManagement {
 }
 
 rootProject.name = 'dai-deployment-templates'
-
 include 'aws-lambda-scorer:lambda-template'
 include 'aws-lambda-scorer:terraform-recipe'
 include 'common:jdbc'