format

h2oai · Jan 23, 2024 · 69d4a13 · 69d4a13
1 parent 346124c
commit 69d4a13
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/common/rest-java-model/build.gradle b/common/rest-java-model/build.gradle
@@ -45,4 +45,4 @@ sourceSets {
             srcDir("$buildDir/gen/src/main/java")
         }
     }
-}
+}
diff --git a/common/rest-jdbc-spring-api/build.gradle b/common/rest-jdbc-spring-api/build.gradle
@@ -38,4 +38,11 @@ bootJar {
     enabled=false
 }
 
-compileJava.dependsOn tasks.openApiValidate, tasks.openApiGenerate
+compileJava.dependsOn tasks.openApiValidate, tasks.openApiGenerate
+sourceSets {
+    main {
+        java {
+            srcDir("$buildDir/gen/src/main/java")
+        }
+    }
+}
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version = 1.1.21-SNAPSHOT
+version = 1.2.0-SNAPSHOT
 
 # Versions of dependencies. Try to keep these at the same version across the deployment templates to facilitate
 # issue resolution.
@@ -11,7 +11,6 @@ mojoRuntimeVersion = 2.8.5
 awsLambdaCoreVersion = 1.2.0
 awsLambdaEventsVersion = 2.2.3
 awsSdkS3Version = 1.11.445
-javaxAnnotationVersion = 1.3.2
 gsonVersion = 2.8.9
 jupiterPioneerVersion = 2.2.0
 jupiterVersion = 5.10.1
@@ -34,21 +33,20 @@ scalaVersion = 2.12.15
 sparklingWaterVersion = 3.30.1.3-1-3.0
 configVersion = 1.3.4
 openApiJacksonNullableVersion = 0.2.6
+tomcatEmbedVersion = 9.0.75
 
 # External plugins:
 springBootPluginVersion = 3.2.0
 swaggerGradlePluginVersion = 2.19.2
 errorpronePluginVersion = 3.1.0
 jibPluginVersion = 3.4.0
-tomcatEmbedVersion = 9.0.75
 openApiGeneratorGradlePluginVersion = 7.2.0
 
 # External tools:
 checkStyleVersion = 8.21
 googleJavaFormatVersion = 1.7
 errorproneJavacVersion = 9+181-r4173-1
 errorproneVersion = 2.23.0
-#snakeYamlVersion = 2.2
 
 # Docker settings
 dockerRepositoryPrefix = harbor.h2o.ai/opsh2oai/h2oai/
@@ -62,3 +60,8 @@ javaBaseImage = eclipse-temurin@sha256:24643c2dd329ef482ecd042b59cbfb7fe13716342
 #   - https://github.com/gradle/gradle/issues/4629
 systemProp.org.gradle.internal.http.connectionTimeout=300000
 systemProp.org.gradle.internal.http.socketTimeout=300000
+
+#
+# Jib default properties
+#
+defaultJibContainerJvmFlags=-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
diff --git a/gradle/mixins/spotless.gradle b/gradle/mixins/spotless.gradle
@@ -9,4 +9,4 @@
 //        }
 //        googleJavaFormat(googleJavaFormatVersion)
 //    }
-//}
+//}
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,4 +45,4 @@ sourceSets { @@
                 srcDir("$buildDir/gen/src/main/java")
             }
         }
-    }
+    }