extract gradle jib config to dedicated conventions plugin

generators/server/files.js

@@ -311,12 +311,12 @@ export const baseServerFiles = {
         'build.gradle',
         'settings.gradle',
         'gradle.properties',
-        'gradle/docker.gradle',
         'gradle/profile_dev.gradle',
         'gradle/profile_prod.gradle',
         'gradle/war.gradle',
         'gradle/zipkin.gradle',
         `${GRADLE_BUILD_SRC_MAIN_DIR}/jhipster.code-quality-conventions.gradle`,
+        `${GRADLE_BUILD_SRC_MAIN_DIR}/jhipster.docker-conventions.gradle`,
       ],
     },
     {

generators/server/generator.js

@@ -772,6 +772,11 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
           name: 'nohttp-plugin',
           version: application.javaDependencies?.['nohttp-checkstyle'],
         });
+        source.addGradleDependencyCatalogVersion?.({ name: 'jib-plugin', version: application.javaDependencies?.['jib-maven-plugin'] });
+        source.addGradleBuildSrcDependencyCatalogVersion?.({
+          name: 'jib-plugin',
+          version: application.javaDependencies?.['jib-maven-plugin'],
+        });
         source.addGradleBuildSrcDependency?.({
           groupId: 'org.sonarsource.scanner.gradle',
           artifactId: 'sonarqube-gradle-plugin',
@@ -800,7 +805,15 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
           version: '${libs.versions.nohttp.plugin.get()}',
           scope: 'implementation',
         });
+        source.addGradleBuildSrcDependency?.({
+          groupId: 'com.google.cloud.tools',
+          artifactId: 'jib-gradle-plugin',
+          // eslint-disable-next-line no-template-curly-in-string
+          version: '${libs.versions.jib.plugin.get()}',
+          scope: 'implementation',
+        });
         source.addGradlePlugin?.({ id: 'jhipster.code-quality-conventions' });
+        source.addGradlePlugin?.({ id: 'jhipster.docker-conventions' });
       },
       packageJsonScripts({ application }) {
         const packageJsonConfigStorage = this.packageJson.createStorage('config').createProxy();

generators/server/templates/build.gradle.ejs

@@ -22,7 +22,6 @@ plugins {
     id "idea"
     id "eclipse"
     id "org.springframework.boot"
-    id "com.google.cloud.tools.jib"
     id "com.gorylenko.gradle-git-properties"
 <%_ if (enableSwaggerCodegen) { _%>
     id "org.openapi.generator"
@@ -52,7 +51,6 @@ ext {
     }
 }
 
-apply from: "gradle/docker.gradle"
 <%_ if (enableSwaggerCodegen) { _%>
 apply from: "gradle/swagger.gradle"
 <%_ } _%>

generators/server/templates/buildSrc/src/main/groovy/jhipster.code-quality-conventions.gradle.ejs

@@ -1,3 +1,21 @@
+<%#
+ Copyright 2013-2023 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
 plugins {
     id "jacoco"
     id "org.sonarqube"

generators/server/templates/gradle/docker.gradle.ejs → generators/server/templates/buildSrc/src/main/groovy/jhipster.docker-conventions.gradle.ejs

@@ -16,6 +16,10 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
+plugins {
+    id "com.google.cloud.tools.jib"
+}
+
 jib {
     from {
         image = "<%- dockerContainers.javaJre %>"
@@ -46,5 +50,4 @@ jib {
       paths = file("<%= dockerServicesDir %>jib")
       permissions = ["/entrypoint.sh": "755"]
     }
-}
-
+}

generators/spring-data-cassandra/__snapshots__/generator.spec.ts.snap

@@ -23,13 +23,13 @@ exports[`generator - cassandra gateway-jwt-gradle-enableTranslation(true)-com.pa
   "buildSrc/src/main/groovy/jhipster.code-quality-conventions.gradle": {
     "stateCleared": "modified",
   },
-  "checkstyle.xml": {
+  "buildSrc/src/main/groovy/jhipster.docker-conventions.gradle": {
     "stateCleared": "modified",
   },
-  "gradle.properties": {
+  "checkstyle.xml": {
     "stateCleared": "modified",
   },
-  "gradle/docker.gradle": {
+  "gradle.properties": {
     "stateCleared": "modified",
   },
   "gradle/profile_dev.gradle": {
@@ -828,13 +828,13 @@ exports[`generator - cassandra microservice-jwt-reactive(true)-gradle-enableTran
   "buildSrc/src/main/groovy/jhipster.code-quality-conventions.gradle": {
     "stateCleared": "modified",
   },
-  "checkstyle.xml": {
+  "buildSrc/src/main/groovy/jhipster.docker-conventions.gradle": {
     "stateCleared": "modified",
   },
-  "gradle.properties": {
+  "checkstyle.xml": {
     "stateCleared": "modified",
   },
-  "gradle/docker.gradle": {
+  "gradle.properties": {
     "stateCleared": "modified",
   },
   "gradle/profile_dev.gradle": {
@@ -1181,13 +1181,13 @@ exports[`generator - cassandra microservice-oauth2-reactive(true)-gradle-enableT
   "buildSrc/src/main/groovy/jhipster.code-quality-conventions.gradle": {
     "stateCleared": "modified",
   },
-  "checkstyle.xml": {
+  "buildSrc/src/main/groovy/jhipster.docker-conventions.gradle": {
     "stateCleared": "modified",
   },
-  "gradle.properties": {
+  "checkstyle.xml": {
     "stateCleared": "modified",
   },
-  "gradle/docker.gradle": {
+  "gradle.properties": {
     "stateCleared": "modified",
   },
   "gradle/profile_dev.gradle": {
@@ -1995,13 +1995,13 @@ exports[`generator - cassandra monolith-jwt-reactive(true)-gradle-enableTranslat
   "buildSrc/src/main/groovy/jhipster.code-quality-conventions.gradle": {
     "stateCleared": "modified",
   },
-  "checkstyle.xml": {
+  "buildSrc/src/main/groovy/jhipster.docker-conventions.gradle": {
     "stateCleared": "modified",
   },
-  "gradle.properties": {
+  "checkstyle.xml": {
     "stateCleared": "modified",
   },
-  "gradle/docker.gradle": {
+  "gradle.properties": {
     "stateCleared": "modified",
   },
   "gradle/profile_dev.gradle": {
@@ -2725,13 +2725,13 @@ exports[`generator - cassandra monolith-oauth2-reactive(true)-gradle-enableTrans
   "buildSrc/src/main/groovy/jhipster.code-quality-conventions.gradle": {
     "stateCleared": "modified",
   },
-  "checkstyle.xml": {
+  "buildSrc/src/main/groovy/jhipster.docker-conventions.gradle": {
     "stateCleared": "modified",
   },
-  "gradle.properties": {
+  "checkstyle.xml": {
     "stateCleared": "modified",
   },
-  "gradle/docker.gradle": {
+  "gradle.properties": {
     "stateCleared": "modified",
   },
   "gradle/profile_dev.gradle": {
@@ -3548,13 +3548,13 @@ exports[`generator - cassandra monolith-session-reactive(true)-gradle-enableTran
   "buildSrc/src/main/groovy/jhipster.code-quality-conventions.gradle": {
     "stateCleared": "modified",
   },
-  "checkstyle.xml": {
+  "buildSrc/src/main/groovy/jhipster.docker-conventions.gradle": {
     "stateCleared": "modified",
   },
-  "gradle.properties": {
+  "checkstyle.xml": {
     "stateCleared": "modified",
   },
-  "gradle/docker.gradle": {
+  "gradle.properties": {
     "stateCleared": "modified",
   },
   "gradle/profile_dev.gradle": {

generators/spring-data-couchbase/__snapshots__/generator.spec.ts.snap

@@ -23,13 +23,13 @@ exports[`generator - couchbase gateway-jwt-gradle-enableTranslation(true)-com.pa
   "buildSrc/src/main/groovy/jhipster.code-quality-conventions.gradle": {
     "stateCleared": "modified",
   },
-  "checkstyle.xml": {
+  "buildSrc/src/main/groovy/jhipster.docker-conventions.gradle": {
     "stateCleared": "modified",
   },
-  "gradle.properties": {
+  "checkstyle.xml": {
     "stateCleared": "modified",
   },
-  "gradle/docker.gradle": {
+  "gradle.properties": {
     "stateCleared": "modified",
   },
   "gradle/profile_dev.gradle": {
@@ -852,13 +852,13 @@ exports[`generator - couchbase microservice-jwt-reactive(true)-gradle-enableTran
   "buildSrc/src/main/groovy/jhipster.code-quality-conventions.gradle": {
     "stateCleared": "modified",
   },
-  "checkstyle.xml": {
+  "buildSrc/src/main/groovy/jhipster.docker-conventions.gradle": {
     "stateCleared": "modified",
   },
-  "gradle.properties": {
+  "checkstyle.xml": {
     "stateCleared": "modified",
   },
-  "gradle/docker.gradle": {
+  "gradle.properties": {
     "stateCleared": "modified",
   },
   "gradle/profile_dev.gradle": {
@@ -1208,13 +1208,13 @@ exports[`generator - couchbase microservice-oauth2-reactive(true)-gradle-enableT
   "buildSrc/src/main/groovy/jhipster.code-quality-conventions.gradle": {
     "stateCleared": "modified",
   },
-  "checkstyle.xml": {
+  "buildSrc/src/main/groovy/jhipster.docker-conventions.gradle": {
     "stateCleared": "modified",
   },
-  "gradle.properties": {
+  "checkstyle.xml": {
     "stateCleared": "modified",
   },
-  "gradle/docker.gradle": {
+  "gradle.properties": {
     "stateCleared": "modified",
   },
   "gradle/profile_dev.gradle": {
@@ -2037,13 +2037,13 @@ exports[`generator - couchbase monolith-jwt-reactive(true)-gradle-enableTranslat
   "buildSrc/src/main/groovy/jhipster.code-quality-conventions.gradle": {
     "stateCleared": "modified",
   },
-  "checkstyle.xml": {
+  "buildSrc/src/main/groovy/jhipster.docker-conventions.gradle": {
     "stateCleared": "modified",
   },
-  "gradle.properties": {
+  "checkstyle.xml": {
     "stateCleared": "modified",
   },
-  "gradle/docker.gradle": {
+  "gradle.properties": {
     "stateCleared": "modified",
   },
   "gradle/profile_dev.gradle": {
@@ -2773,13 +2773,13 @@ exports[`generator - couchbase monolith-oauth2-reactive(true)-gradle-enableTrans
   "buildSrc/src/main/groovy/jhipster.code-quality-conventions.gradle": {
     "stateCleared": "modified",
   },
-  "checkstyle.xml": {
+  "buildSrc/src/main/groovy/jhipster.docker-conventions.gradle": {
     "stateCleared": "modified",
   },
-  "gradle.properties": {
+  "checkstyle.xml": {
     "stateCleared": "modified",
   },
-  "gradle/docker.gradle": {
+  "gradle.properties": {
     "stateCleared": "modified",
   },
   "gradle/profile_dev.gradle": {
@@ -3617,13 +3617,13 @@ exports[`generator - couchbase monolith-session-reactive(true)-gradle-enableTran
   "buildSrc/src/main/groovy/jhipster.code-quality-conventions.gradle": {
     "stateCleared": "modified",
   },
-  "checkstyle.xml": {
+  "buildSrc/src/main/groovy/jhipster.docker-conventions.gradle": {
     "stateCleared": "modified",
   },
-  "gradle.properties": {
+  "checkstyle.xml": {
     "stateCleared": "modified",
   },
-  "gradle/docker.gradle": {
+  "gradle.properties": {
     "stateCleared": "modified",
   },
   "gradle/profile_dev.gradle": {