diff --git a/packages/maven/src/executors/build-image/executor.ts b/packages/maven/src/executors/build-image/executor.ts index c25ae1d83..6a1511887 100644 --- a/packages/maven/src/executors/build-image/executor.ts +++ b/packages/maven/src/executors/build-image/executor.ts @@ -22,10 +22,6 @@ export default async function runExecutor( let command = getExecutable(); - if (process.env['NX_MAVEN_CLI_OPTS']) { - command += ` ${process.env['NX_MAVEN_CLI_OPTS']}`; - } - if ( getPluginName(context) === '@jnxplus/nx-boot-maven' || options.framework === 'spring-boot' diff --git a/packages/maven/src/executors/build/executor.ts b/packages/maven/src/executors/build/executor.ts index cab9927a5..6f60f439c 100644 --- a/packages/maven/src/executors/build/executor.ts +++ b/packages/maven/src/executors/build/executor.ts @@ -14,14 +14,6 @@ export default async function runExecutor( ) { logger.info(`Executor ran for Build: ${JSON.stringify(options)}`); - if (process.env['NX_MAVEN_CLI_OPTS']) { - if (options.mvnArgs) { - options.mvnArgs += ` ${process.env['NX_MAVEN_CLI_OPTS']}`; - } else { - options.mvnArgs = `${process.env['NX_MAVEN_CLI_OPTS']}`; - } - } - let command = getExecutable(); if (options.mvnArgs) { diff --git a/packages/maven/src/executors/test/executor.ts b/packages/maven/src/executors/test/executor.ts index 833f3894a..e61969ad3 100644 --- a/packages/maven/src/executors/test/executor.ts +++ b/packages/maven/src/executors/test/executor.ts @@ -10,10 +10,6 @@ export default async function runExecutor( logger.info(`Executor ran for Test: ${JSON.stringify(options)}`); let command = getExecutable(); - if (process.env['NX_MAVEN_CLI_OPTS']) { - command += ` ${process.env['NX_MAVEN_CLI_OPTS']}`; - } - command += ` test -pl :${context.projectName}`; if (options.mvnArgs) { diff --git a/packages/maven/src/lib/utils/index.ts b/packages/maven/src/lib/utils/index.ts index 7a2b6724b..cb0638bcf 100644 --- a/packages/maven/src/lib/utils/index.ts +++ b/packages/maven/src/lib/utils/index.ts @@ -10,7 +10,13 @@ import { readXml } from '../xml'; export function getExecutable() { const isWin = process.platform === 'win32'; - return isWin ? 'mvnw.cmd' : './mvnw'; + let executable = isWin ? 'mvnw.cmd' : './mvnw'; + + if (process.env['NX_MAVEN_CLI_OPTS']) { + executable += ` ${process.env['NX_MAVEN_CLI_OPTS']}`; + } + + return executable; } export function isPomPackaging(context: ExecutorContext): boolean {