From 4a2be530a7880ed70d33526e1b6601dc39d7a8bd Mon Sep 17 00:00:00 2001 From: Vladimir Vagaytsev Date: Thu, 22 Jun 2023 16:58:25 +0200 Subject: [PATCH] docs(jib): show current Maven Daemon version in docs --- docs/reference/action-types/Build/jib-container.md | 4 ++++ docs/reference/module-types/jib-container.md | 4 ++++ plugins/jib/index.ts | 4 +++- plugins/jib/mavend.ts | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/docs/reference/action-types/Build/jib-container.md b/docs/reference/action-types/Build/jib-container.md index 17e4e58b404..1091e0dd234 100644 --- a/docs/reference/action-types/Build/jib-container.md +++ b/docs/reference/action-types/Build/jib-container.md @@ -263,6 +263,8 @@ spec: # Defines the location of the custom executable Maven Daemon binary. # + # If not provided, then Maven Daemon 0.9.0 will be downloaded and used. + # # **Note!** Either `jdkVersion` or `jdkPath` will be used to define `JAVA_HOME` environment variable for the custom # Maven Daemon. # To ensure a system JDK usage, please set `jdkPath` to `${local.env.JAVA_HOME}`. @@ -725,6 +727,8 @@ Defines the Maven phases to be executed during the Garden build step. Defines the location of the custom executable Maven Daemon binary. +If not provided, then Maven Daemon 0.9.0 will be downloaded and used. + **Note!** Either `jdkVersion` or `jdkPath` will be used to define `JAVA_HOME` environment variable for the custom Maven Daemon. To ensure a system JDK usage, please set `jdkPath` to `${local.env.JAVA_HOME}`. diff --git a/docs/reference/module-types/jib-container.md b/docs/reference/module-types/jib-container.md index c15317b2d30..2abafe8ad46 100644 --- a/docs/reference/module-types/jib-container.md +++ b/docs/reference/module-types/jib-container.md @@ -114,6 +114,8 @@ build: # Defines the location of the custom executable Maven Daemon binary. # + # If not provided, then Maven Daemon 0.9.0 will be downloaded and used. + # # **Note!** Either `jdkVersion` or `jdkPath` will be used to define `JAVA_HOME` environment variable for the custom # Maven Daemon. # To ensure a system JDK usage, please set `jdkPath` to `${local.env.JAVA_HOME}`. @@ -1021,6 +1023,8 @@ Defines the Maven phases to be executed during the Garden build step. Defines the location of the custom executable Maven Daemon binary. +If not provided, then Maven Daemon 0.9.0 will be downloaded and used. + **Note!** Either `jdkVersion` or `jdkPath` will be used to define `JAVA_HOME` environment variable for the custom Maven Daemon. To ensure a system JDK usage, please set `jdkPath` to `${local.env.JAVA_HOME}`. diff --git a/plugins/jib/index.ts b/plugins/jib/index.ts index a3f761ed630..b6b1a437af4 100644 --- a/plugins/jib/index.ts +++ b/plugins/jib/index.ts @@ -12,7 +12,7 @@ import { dedent } from "@garden-io/sdk/util/string" import { openJdkSpecs } from "./openjdk" import { mavenSpec, mvn, mvnVersion } from "./maven" -import { mavendSpec, mvnd } from "./mavend" +import { mavendSpec, mvnd, mvndVersion } from "./mavend" import { gradle, gradleSpec, gradleVersion } from "./gradle" // TODO: gradually get rid of these core dependencies, move some to SDK etc. @@ -116,6 +116,8 @@ const jibBuildSchemaKeys = () => ({ mavendPath: joi.string().optional().description(dedent` Defines the location of the custom executable Maven Daemon binary. + If not provided, then Maven Daemon ${mvndVersion} will be downloaded and used. + **Note!** Either \`jdkVersion\` or \`jdkPath\` will be used to define \`JAVA_HOME\` environment variable for the custom Maven Daemon. To ensure a system JDK usage, please set \`jdkPath\` to \`${systemJdkGardenEnvVar}\`. `), diff --git a/plugins/jib/mavend.ts b/plugins/jib/mavend.ts index 3341cea02d1..7fbb95b60a9 100644 --- a/plugins/jib/mavend.ts +++ b/plugins/jib/mavend.ts @@ -14,7 +14,7 @@ import { BuildToolParams, runBuildTool, verifyBinaryPath, VerifyBinaryParams } f const buildLock = new AsyncLock() -const mvndVersion = "0.9.0" +export const mvndVersion = "0.9.0" const mvndSpec = { description: "The Maven Daemon CLI.",