Merge branch 'fix-critical-vulnerability' of github.com:h2oai/dai-dep…

…loyment-templates into fix-critical-vulnerability
h2oai · Jan 23, 2024 · 721a6b9 · 721a6b9
2 parents 69d4a13 + 5a14998
commit 721a6b9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/common/transform/build.gradle b/common/transform/build.gradle
@@ -11,6 +11,7 @@ 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.
@@ -24,8 +25,8 @@ dependencies {
     testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: mockitoVersion
     testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: jupiterVersion
     testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: jupiterVersion
-    testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: jupiterVersion
     testImplementation group: 'org.junit-pioneer', name: 'junit-pioneer', version: jupiterPioneerVersion
+    testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: jupiterVersion
 }
 
 bootJar {

diff --git a/gradle/mixins/dependencies.gradle b/gradle/mixins/dependencies.gradle
@@ -30,9 +30,11 @@ dependencyManagement {
             entry 'junit-jupiter-engine'
             entry 'junit-jupiter-params'
         }
+        dependency group: 'org.junit-pioneer', name: 'junit-pioneer', version: jupiterPioneerVersion
         dependencySet(group: 'org.mockito', version: mockitoVersion) {
             entry 'mockito-core'
             entry 'mockito-junit-jupiter'
+            entry 'mockito-inline'
         }
         dependency group: 'org.junit-pioneer', name: 'junit-pioneer', version: jupiterPioneerVersion
         dependency group: 'commons-cli', name: 'commons-cli', version: apacheCommonsCliVersion

diff --git a/local-rest-scorer/build.gradle b/local-rest-scorer/build.gradle
@@ -18,6 +18,7 @@ dependencies {
     implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: tomcatEmbedVersion
 
     implementation group: 'com.google.guava', name: 'guava', version: guavaVersion
+    implementation group: 'org.yaml', name: 'snakeyaml'
 
     testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test'
     testImplementation group: 'com.google.truth.extensions', name: 'truth-java8-extension'