Skip to content

Commit

Permalink
docs(jib): show current Maven Daemon version in docs
Browse files Browse the repository at this point in the history
  • Loading branch information
vvagaytsev committed Jun 23, 2023
1 parent 4f5fd6a commit 4a2be53
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 2 deletions.
4 changes: 4 additions & 0 deletions docs/reference/action-types/Build/jib-container.md
Original file line number Diff line number Diff line change
Expand Up @@ -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}`.
Expand Down Expand Up @@ -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}`.

Expand Down
4 changes: 4 additions & 0 deletions docs/reference/module-types/jib-container.md
Original file line number Diff line number Diff line change
Expand Up @@ -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}`.
Expand Down Expand Up @@ -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}`.

Expand Down
4 changes: 3 additions & 1 deletion plugins/jib/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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}\`.
`),
Expand Down
2 changes: 1 addition & 1 deletion plugins/jib/mavend.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down

0 comments on commit 4a2be53

Please sign in to comment.