fix

h2oai · Dec 13, 2023 · ad90176 · ad90176
1 parent b4caf7f
commit ad90176
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 17 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -92,9 +92,9 @@ pipeline {
             // Run inside JAVA_IMAGE container on NODE_LABEL host.
             agent {
                 docker {
-                    registryCredentialsId HARBOR_CREDS
-                    registryUrl HARBOR_URL
-                    image JAVA_8_IMAGE
+                    //registryCredentialsId HARBOR_CREDS
+                    //registryUrl HARBOR_URL
+                    image JAVA_IMAGE
                     label NODE_LABEL
                 }
             }

diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
                 version: springBootPluginVersion
         classpath group: 'gradle.plugin.org.hidetake', name: 'gradle-swagger-generator-plugin',
                 version: swaggerGradlePluginVersion
-        classpath group: 'com.github.jengelman.gradle.plugins', name: 'shadow',
+        classpath group: 'com.github.johnrengelman', name: 'shadow',
                 version: shadowJarVersion
 //        classpath group: 'com.diffplug.spotless', name: 'spotless-plugin-gradle', version: spotlessPluginVersion
         classpath group: 'net.ltgt.gradle', name: 'gradle-errorprone-plugin',

diff --git a/common/kdb-java/build.gradle b/common/kdb-java/build.gradle
@@ -1,4 +1,4 @@
-apply from: project(":").file('gradle/java_8_no_style.gradle')
+apply from: project(":").file('gradle/java_no_style.gradle')
 
 dependencies {
     implementation group: 'com.google.code.gson', name: 'gson'

diff --git a/gradle.properties b/gradle.properties
@@ -22,7 +22,7 @@ springFoxVersion = 3.0.0
 swaggerCodegenVersion = 3.0.47
 swaggerCoreVersion = 2.2.19
 swaggerCoreSpringVersion = 1.6.12
-shadowJarVersion = 4.0.4
+shadowJarVersion = 8.1.1
 slf4jVersion = 2.0.9
 log4jVersion = 2.22.0
 apacheCommonsCliVersion = 1.4
@@ -39,7 +39,7 @@ springBootPluginVersion = 2.7.12
 swaggerGradlePluginVersion = 2.19.2
 spotlessPluginVersion = 3.24.2
 errorpronePluginVersion = 3.1.0
-jibPluginVersion = 2.7.1
+jibPluginVersion = 3.4.0
 tomcatEmbedVersion = 9.0.75
 
 # External tools:

diff --git a/gradle/java_8_no_style.gradle b/gradle/java_8_no_style.gradle
diff --git a/kdb-mojo-scorer/build.gradle b/kdb-mojo-scorer/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'com.github.johnrengelman.shadow'
 }
-apply from: project(":").file('gradle/java_8_no_style.gradle')
+apply from: project(":").file('gradle/java_no_style.gradle')
 
 dependencies {
     implementation project(':common:kdb-java')