From 11cc1d772e495370d679146b1565833b03aa492a Mon Sep 17 00:00:00 2001 From: khalilou88 <32600911+khalilou88@users.noreply.github.com> Date: Sat, 29 Jul 2023 15:11:18 +0200 Subject: [PATCH] feat(executors): remove deprecated executors (#351) Co-authored-by: khalilou88 --- .../executors/build-image/boot/executor.ts | 13 ---- .../executors/build-image/boot/schema.d.ts | 1 - .../src/executors/build-image/executor.ts | 35 ---------- .../build-image/micronaut/executor.ts | 41 ------------ .../build-image/micronaut/schema.d.ts | 5 -- .../src/executors/build-image/schema.d.ts | 7 -- .../src/executors/build-image/schema.json | 38 ----------- .../gradle/src/executors/build/executor.ts | 64 ------------------- .../gradle/src/executors/build/schema.d.ts | 8 --- .../gradle/src/executors/build/schema.json | 18 ------ .../executors/integration-test/executor.ts | 19 ------ .../executors/integration-test/schema.d.ts | 3 - .../executors/integration-test/schema.json | 15 ----- .../gradle/src/executors/publish/executor.ts | 12 ---- .../gradle/src/executors/publish/schema.d.ts | 1 - .../gradle/src/executors/publish/schema.json | 10 --- .../gradle/src/executors/serve/executor.ts | 55 ---------------- .../gradle/src/executors/serve/schema.d.ts | 5 -- .../gradle/src/executors/serve/schema.json | 17 ----- .../gradle/src/executors/test/executor.ts | 20 ------ .../gradle/src/executors/test/schema.d.ts | 3 - .../gradle/src/executors/test/schema.json | 14 ---- .../src/executors/build-image/executor.ts | 46 ------------- .../src/executors/build-image/schema.d.ts | 6 -- .../src/executors/build-image/schema.json | 29 --------- .../maven/src/executors/build/executor.ts | 57 ----------------- .../maven/src/executors/build/schema.d.ts | 9 --- .../maven/src/executors/build/schema.json | 32 ---------- .../executors/integration-test/executor.ts | 20 ------ .../executors/integration-test/schema.d.ts | 3 - .../executors/integration-test/schema.json | 14 ---- .../maven/src/executors/publish/executor.ts | 14 ---- .../maven/src/executors/publish/schema.d.ts | 1 - .../maven/src/executors/publish/schema.json | 10 --- .../maven/src/executors/serve/executor.ts | 49 -------------- .../maven/src/executors/serve/schema.d.ts | 4 -- .../maven/src/executors/serve/schema.json | 18 ------ packages/maven/src/executors/test/executor.ts | 20 ------ packages/maven/src/executors/test/schema.d.ts | 3 - packages/maven/src/executors/test/schema.json | 15 ----- 40 files changed, 754 deletions(-) delete mode 100644 packages/gradle/src/executors/build-image/boot/executor.ts delete mode 100644 packages/gradle/src/executors/build-image/boot/schema.d.ts delete mode 100644 packages/gradle/src/executors/build-image/executor.ts delete mode 100644 packages/gradle/src/executors/build-image/micronaut/executor.ts delete mode 100644 packages/gradle/src/executors/build-image/micronaut/schema.d.ts delete mode 100644 packages/gradle/src/executors/build-image/schema.d.ts delete mode 100644 packages/gradle/src/executors/build-image/schema.json delete mode 100644 packages/gradle/src/executors/build/executor.ts delete mode 100644 packages/gradle/src/executors/build/schema.d.ts delete mode 100644 packages/gradle/src/executors/build/schema.json delete mode 100644 packages/gradle/src/executors/integration-test/executor.ts delete mode 100644 packages/gradle/src/executors/integration-test/schema.d.ts delete mode 100644 packages/gradle/src/executors/integration-test/schema.json delete mode 100644 packages/gradle/src/executors/publish/executor.ts delete mode 100644 packages/gradle/src/executors/publish/schema.d.ts delete mode 100644 packages/gradle/src/executors/publish/schema.json delete mode 100644 packages/gradle/src/executors/serve/executor.ts delete mode 100644 packages/gradle/src/executors/serve/schema.d.ts delete mode 100644 packages/gradle/src/executors/serve/schema.json delete mode 100644 packages/gradle/src/executors/test/executor.ts delete mode 100644 packages/gradle/src/executors/test/schema.d.ts delete mode 100644 packages/gradle/src/executors/test/schema.json delete mode 100644 packages/maven/src/executors/build-image/executor.ts delete mode 100644 packages/maven/src/executors/build-image/schema.d.ts delete mode 100644 packages/maven/src/executors/build-image/schema.json delete mode 100644 packages/maven/src/executors/build/executor.ts delete mode 100644 packages/maven/src/executors/build/schema.d.ts delete mode 100644 packages/maven/src/executors/build/schema.json delete mode 100644 packages/maven/src/executors/integration-test/executor.ts delete mode 100644 packages/maven/src/executors/integration-test/schema.d.ts delete mode 100644 packages/maven/src/executors/integration-test/schema.json delete mode 100644 packages/maven/src/executors/publish/executor.ts delete mode 100644 packages/maven/src/executors/publish/schema.d.ts delete mode 100644 packages/maven/src/executors/publish/schema.json delete mode 100644 packages/maven/src/executors/serve/executor.ts delete mode 100644 packages/maven/src/executors/serve/schema.d.ts delete mode 100644 packages/maven/src/executors/serve/schema.json delete mode 100644 packages/maven/src/executors/test/executor.ts delete mode 100644 packages/maven/src/executors/test/schema.d.ts delete mode 100644 packages/maven/src/executors/test/schema.json diff --git a/packages/gradle/src/executors/build-image/boot/executor.ts b/packages/gradle/src/executors/build-image/boot/executor.ts deleted file mode 100644 index 67120027e..000000000 --- a/packages/gradle/src/executors/build-image/boot/executor.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { ExecutorContext } from '@nx/devkit'; -import { getExecutable, getProjectPath } from '../../../.'; -import { runCommand } from '@jnxplus/common'; -import { BootBuildImageExecutorSchema } from './schema'; - -export default async function runBootBuildImageExecutor( - options: BootBuildImageExecutorSchema, - context: ExecutorContext -) { - return runCommand( - `${getExecutable()} ${getProjectPath(context)}:bootBuildImage` - ); -} diff --git a/packages/gradle/src/executors/build-image/boot/schema.d.ts b/packages/gradle/src/executors/build-image/boot/schema.d.ts deleted file mode 100644 index b328560fe..000000000 --- a/packages/gradle/src/executors/build-image/boot/schema.d.ts +++ /dev/null @@ -1 +0,0 @@ -export interface BootBuildImageExecutorSchema {} // eslint-disable-line diff --git a/packages/gradle/src/executors/build-image/executor.ts b/packages/gradle/src/executors/build-image/executor.ts deleted file mode 100644 index 1e4504e62..000000000 --- a/packages/gradle/src/executors/build-image/executor.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { getPluginName, runQuarkusBuildImageExecutor } from '@jnxplus/common'; -import { ExecutorContext, logger } from '@nx/devkit'; -import runBootBuildImageExecutor from './boot/executor'; -import runMicronautBuildImageExecutor from './micronaut/executor'; -import { BuildImageExecutorSchema } from './schema'; - -export default async function runExecutor( - options: BuildImageExecutorSchema, - context: ExecutorContext -) { - logger.info(`Executor ran for Build Image: ${JSON.stringify(options)}`); - - if ( - getPluginName(context) === '@jnxplus/nx-boot-gradle' || - options.framework === 'spring-boot' - ) { - return await runBootBuildImageExecutor(options, context); - } - - if ( - getPluginName(context) === '@jnxplus/nx-quarkus-gradle' || - options.framework === 'quarkus' - ) { - return await runQuarkusBuildImageExecutor(options, context); - } - - if ( - getPluginName(context) === '@jnxplus/nx-micronaut-gradle' || - options.framework === 'micronaut' - ) { - return await runMicronautBuildImageExecutor(options, context); - } - - throw new Error('Unhandled options'); -} diff --git a/packages/gradle/src/executors/build-image/micronaut/executor.ts b/packages/gradle/src/executors/build-image/micronaut/executor.ts deleted file mode 100644 index cd0b9bc42..000000000 --- a/packages/gradle/src/executors/build-image/micronaut/executor.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { ExecutorContext } from '@nx/devkit'; -import { getExecutable, getProjectPath } from '../../../.'; -import { runCommand } from '@jnxplus/common'; -import { MicronautBuildImageExecutorSchema } from './schema'; - -export default async function runMicronautBuildImageExecutor( - options: MicronautBuildImageExecutorSchema, - context: ExecutorContext -) { - if (options.useDocker && options.native && options.optimized) { - return runCommand( - `${getExecutable()} ${getProjectPath(context)}:optimizedDockerBuildNative` - ); - } - - if (options.useDocker && !options.native && options.optimized) { - return runCommand( - `${getExecutable()} ${getProjectPath(context)}:optimizedDockerBuild` - ); - } - - if (options.useDocker && options.native && !options.optimized) { - return runCommand( - `${getExecutable()} ${getProjectPath(context)}:dockerBuildNative` - ); - } - - if (options.useDocker && !options.native && !options.optimized) { - return runCommand( - `${getExecutable()} ${getProjectPath(context)}:dockerBuild` - ); - } - - if (!options.useDocker) { - return runCommand( - `${getExecutable()} ${getProjectPath(context)}:nativeCompile` - ); - } - - throw new Error(`Case not handled`); -} diff --git a/packages/gradle/src/executors/build-image/micronaut/schema.d.ts b/packages/gradle/src/executors/build-image/micronaut/schema.d.ts deleted file mode 100644 index 8695c324a..000000000 --- a/packages/gradle/src/executors/build-image/micronaut/schema.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -export interface MicronautBuildImageExecutorSchema { - useDocker: boolean; - native: boolean; - optimized: boolean; -} diff --git a/packages/gradle/src/executors/build-image/schema.d.ts b/packages/gradle/src/executors/build-image/schema.d.ts deleted file mode 100644 index 67e1face9..000000000 --- a/packages/gradle/src/executors/build-image/schema.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { QuarkusBuildImageExecutorSchema } from '@jnxplus/common'; -import { MicronautBuildImageExecutorSchema } from './micronaut/schema'; - -export type BuildImageExecutorSchema = MicronautBuildImageExecutorSchema & - QuarkusBuildImageExecutorSchema & { - framework?: 'spring-boot' | 'quarkus' | 'micronaut'; - }; diff --git a/packages/gradle/src/executors/build-image/schema.json b/packages/gradle/src/executors/build-image/schema.json deleted file mode 100644 index 4c25f9856..000000000 --- a/packages/gradle/src/executors/build-image/schema.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "version": 2, - "outputCapture": "pipe", - "$schema": "http://json-schema.org/schema", - "title": "Build Image executor", - "description": "", - "type": "object", - "properties": { - "useDocker": { - "type": "boolean" - }, - "native": { - "type": "boolean" - }, - "optimized": { - "type": "boolean" - }, - "imageType": { - "type": "string", - "description": "Image type to build", - "default": "jvm" - }, - "imageNamePrefix": { - "type": "string", - "description": "Image name prefix", - "default": "quarkus" - }, - "imageNameSuffix": { - "type": "string", - "description": "Image name suffix" - }, - "framework": { - "type": "string", - "enum": ["spring-boot", "quarkus", "micronaut"] - } - }, - "required": [] -} diff --git a/packages/gradle/src/executors/build/executor.ts b/packages/gradle/src/executors/build/executor.ts deleted file mode 100644 index e2834ccff..000000000 --- a/packages/gradle/src/executors/build/executor.ts +++ /dev/null @@ -1,64 +0,0 @@ -import { getPluginName, getProjectType, runCommand } from '@jnxplus/common'; -import { getExecutable, getProjectPath } from '../../../.'; -import { ExecutorContext, logger } from '@nx/devkit'; -import { BuildExecutorSchema } from './schema'; - -export default async function runExecutor( - options: BuildExecutorSchema, - context: ExecutorContext -) { - logger.info(`Executor ran for Build: ${JSON.stringify(options)}`); - - let projectPath = ''; - if (options.projectPath) { - projectPath = options.projectPath; - } else { - projectPath = getProjectPath(context); - } - - let target = ''; - - if ( - getPluginName(context) === '@jnxplus/nx-boot-gradle' || - options.framework === 'spring-boot' - ) { - if (getProjectType(context) === 'library') { - target = 'jar'; - } else { - if (options.packaging === 'jar') { - target = 'bootJar'; - } - if (options.packaging === 'war') { - target = 'bootWar'; - } - } - } - - if ( - getPluginName(context) === '@jnxplus/nx-quarkus-gradle' || - options.framework === 'quarkus' - ) { - //use quarkusBuild (instead of build task) to not trigger test - target = 'quarkusBuild'; - } - - if ( - getPluginName(context) === '@jnxplus/nx-micronaut-gradle' || - options.framework === 'micronaut' - ) { - target = 'build -x test'; - } - - //default build task - if (!target) { - target = 'build -x test'; - } - - let args = ''; - - if (options.args) { - args = options.args; - } - - return runCommand(`${getExecutable()} ${projectPath}:${target} ${args}`); -} diff --git a/packages/gradle/src/executors/build/schema.d.ts b/packages/gradle/src/executors/build/schema.d.ts deleted file mode 100644 index 8804397cc..000000000 --- a/packages/gradle/src/executors/build/schema.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { PackagingType } from '@jnxplus/common'; - -export interface BuildExecutorSchema { - packaging?: PackagingType; - framework?: 'spring-boot' | 'quarkus' | 'micronaut'; - args: string; - projectPath?: string; -} diff --git a/packages/gradle/src/executors/build/schema.json b/packages/gradle/src/executors/build/schema.json deleted file mode 100644 index 37ca30391..000000000 --- a/packages/gradle/src/executors/build/schema.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "version": 2, - "outputCapture": "pipe", - "$schema": "http://json-schema.org/schema", - "title": "Build executor", - "description": "", - "type": "object", - "properties": { - "packaging": { - "type": "string", - "default": "jar" - }, - "projectPath": { - "type": "string" - } - }, - "required": [] -} diff --git a/packages/gradle/src/executors/integration-test/executor.ts b/packages/gradle/src/executors/integration-test/executor.ts deleted file mode 100644 index a3e3b52da..000000000 --- a/packages/gradle/src/executors/integration-test/executor.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { ExecutorContext, logger } from '@nx/devkit'; -import { runCommand } from '@jnxplus/common'; -import { IntegrationTestExecutorSchema } from './schema'; -import { getExecutable, getProjectPath } from '../../../.'; - -export default async function runExecutor( - options: IntegrationTestExecutorSchema, - context: ExecutorContext -) { - logger.info(`Executor ran for Integration-test: ${JSON.stringify(options)}`); - - let task = 'quarkusIntTest'; - - if (options.native) { - task = 'testNative'; - } - - return runCommand(`${getExecutable()} ${getProjectPath(context)}:${task}`); -} diff --git a/packages/gradle/src/executors/integration-test/schema.d.ts b/packages/gradle/src/executors/integration-test/schema.d.ts deleted file mode 100644 index c44dd01b5..000000000 --- a/packages/gradle/src/executors/integration-test/schema.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -export interface IntegrationTestExecutorSchema { - native: boolean; -} diff --git a/packages/gradle/src/executors/integration-test/schema.json b/packages/gradle/src/executors/integration-test/schema.json deleted file mode 100644 index 646d5ef5e..000000000 --- a/packages/gradle/src/executors/integration-test/schema.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "version": 2, - "outputCapture": "pipe", - "$schema": "http://json-schema.org/schema", - "title": "Integration Test executor", - "description": "", - "type": "object", - "properties": { - "native": { - "type": "boolean", - "default": false - } - }, - "required": [] -} diff --git a/packages/gradle/src/executors/publish/executor.ts b/packages/gradle/src/executors/publish/executor.ts deleted file mode 100644 index 1da768503..000000000 --- a/packages/gradle/src/executors/publish/executor.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { ExecutorContext, logger } from '@nx/devkit'; -import { runCommand } from '@jnxplus/common'; -import { PublishExecutorSchema } from './schema'; -import { getExecutable, getProjectPath } from '../../lib/utils'; - -export default async function runExecutor( - options: PublishExecutorSchema, - context: ExecutorContext -) { - logger.info(`Executor ran for Publish: ${JSON.stringify(options)}`); - return runCommand(`${getExecutable()} ${getProjectPath(context)}:deploy`); -} diff --git a/packages/gradle/src/executors/publish/schema.d.ts b/packages/gradle/src/executors/publish/schema.d.ts deleted file mode 100644 index 8b8cc822e..000000000 --- a/packages/gradle/src/executors/publish/schema.d.ts +++ /dev/null @@ -1 +0,0 @@ -export interface PublishExecutorSchema {} // eslint-disable-line diff --git a/packages/gradle/src/executors/publish/schema.json b/packages/gradle/src/executors/publish/schema.json deleted file mode 100644 index b3ef14169..000000000 --- a/packages/gradle/src/executors/publish/schema.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "version": 2, - "outputCapture": "pipe", - "$schema": "http://json-schema.org/schema", - "title": "Publish executor", - "description": "", - "type": "object", - "properties": {}, - "required": [] -} diff --git a/packages/gradle/src/executors/serve/executor.ts b/packages/gradle/src/executors/serve/executor.ts deleted file mode 100644 index 14270b44b..000000000 --- a/packages/gradle/src/executors/serve/executor.ts +++ /dev/null @@ -1,55 +0,0 @@ -import { getPluginName, runCommand, waitForever } from '@jnxplus/common'; -import { ExecutorContext, logger } from '@nx/devkit'; - -import { getExecutable, getProjectPath } from '../../../.'; -import { ServeExecutorSchema } from './schema'; - -export default async function runExecutor( - options: ServeExecutorSchema, - context: ExecutorContext -) { - logger.info(`Executor ran for serve: ${JSON.stringify(options)}`); - - let projectPath = ''; - if (options.projectPath) { - projectPath = options.projectPath; - } else { - projectPath = getProjectPath(context); - } - - let command = `${getExecutable()} ${projectPath}:`; - - if ( - getPluginName(context) === '@jnxplus/nx-boot-gradle' || - options.framework === 'spring-boot' - ) { - command += 'bootRun'; - - if (options.args) { - command += ` --args='${options.args}'`; - } - } - - if ( - getPluginName(context) === '@jnxplus/nx-quarkus-gradle' || - options.framework === 'quarkus' - ) { - command += 'quarkusDev'; - } - - if ( - getPluginName(context) === '@jnxplus/nx-micronaut-gradle' || - options.framework === 'micronaut' - ) { - command += 'run'; - } - - const result = runCommand(command); - - if (!result.success) { - return { success: false }; - } - - await waitForever(); - return { success: true }; -} diff --git a/packages/gradle/src/executors/serve/schema.d.ts b/packages/gradle/src/executors/serve/schema.d.ts deleted file mode 100644 index f6d093c50..000000000 --- a/packages/gradle/src/executors/serve/schema.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -export interface ServeExecutorSchema { - framework?: 'spring-boot' | 'quarkus' | 'micronaut'; - args: string; - projectPath?: string; -} diff --git a/packages/gradle/src/executors/serve/schema.json b/packages/gradle/src/executors/serve/schema.json deleted file mode 100644 index 58c13da1b..000000000 --- a/packages/gradle/src/executors/serve/schema.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "version": 2, - "outputCapture": "pipe", - "$schema": "http://json-schema.org/schema", - "title": "Serve executor", - "description": "", - "type": "object", - "properties": { - "args": { - "type": "string" - }, - "projectPath": { - "type": "string" - } - }, - "required": [] -} diff --git a/packages/gradle/src/executors/test/executor.ts b/packages/gradle/src/executors/test/executor.ts deleted file mode 100644 index 15aee79a1..000000000 --- a/packages/gradle/src/executors/test/executor.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { ExecutorContext, logger } from '@nx/devkit'; -import { getExecutable, getProjectPath } from '../../lib/utils/index'; -import { TestExecutorSchema } from './schema'; -import { runCommand } from '@jnxplus/common'; - -export default async function runExecutor( - options: TestExecutorSchema, - context: ExecutorContext -) { - logger.info(`Executor ran for Test: ${JSON.stringify(options)}`); - - let projectPath = ''; - if (options.projectPath) { - projectPath = options.projectPath; - } else { - projectPath = getProjectPath(context); - } - - return runCommand(`${getExecutable()} ${projectPath}:test`); -} diff --git a/packages/gradle/src/executors/test/schema.d.ts b/packages/gradle/src/executors/test/schema.d.ts deleted file mode 100644 index d70dbb555..000000000 --- a/packages/gradle/src/executors/test/schema.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -export interface TestExecutorSchema { - projectPath?: string; -} diff --git a/packages/gradle/src/executors/test/schema.json b/packages/gradle/src/executors/test/schema.json deleted file mode 100644 index fe2343efc..000000000 --- a/packages/gradle/src/executors/test/schema.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 2, - "outputCapture": "pipe", - "$schema": "http://json-schema.org/schema", - "title": "Test executor", - "description": "", - "type": "object", - "properties": { - "projectPath": { - "type": "string" - } - }, - "required": [] -} diff --git a/packages/maven/src/executors/build-image/executor.ts b/packages/maven/src/executors/build-image/executor.ts deleted file mode 100644 index 6a1511887..000000000 --- a/packages/maven/src/executors/build-image/executor.ts +++ /dev/null @@ -1,46 +0,0 @@ -import { ExecutorContext, logger } from '@nx/devkit'; -import { - getPluginName, - runQuarkusBuildImageExecutor, - runCommand, -} from '@jnxplus/common'; -import { BuildImageExecutorSchema } from './schema'; -import { getExecutable } from '../../lib/utils'; - -export default async function runExecutor( - options: BuildImageExecutorSchema, - context: ExecutorContext -) { - logger.info(`Executor ran for Build Image: ${JSON.stringify(options)}`); - - if ( - getPluginName(context) === '@jnxplus/nx-quarkus-maven' || - options.framework === 'quarkus' - ) { - return await runQuarkusBuildImageExecutor(options, context); - } - - let command = getExecutable(); - - if ( - getPluginName(context) === '@jnxplus/nx-boot-maven' || - options.framework === 'spring-boot' - ) { - command += ' spring-boot:build-image'; - } - - if ( - getPluginName(context) === '@jnxplus/nx-micronaut-maven' || - options.framework === 'micronaut' - ) { - command += ' package'; - - if (options.args) { - command += ` ${options.args}`; - } - } - - command += ` -DskipTests=true -pl :${context.projectName}`; - - return runCommand(command); -} diff --git a/packages/maven/src/executors/build-image/schema.d.ts b/packages/maven/src/executors/build-image/schema.d.ts deleted file mode 100644 index f6cbd835d..000000000 --- a/packages/maven/src/executors/build-image/schema.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { QuarkusBuildImageExecutorSchema } from '@jnxplus/common'; - -export type BuildImageExecutorSchema = QuarkusBuildImageExecutorSchema & { - framework?: 'spring-boot' | 'quarkus' | 'micronaut'; - args: string; -}; diff --git a/packages/maven/src/executors/build-image/schema.json b/packages/maven/src/executors/build-image/schema.json deleted file mode 100644 index 771e3e619..000000000 --- a/packages/maven/src/executors/build-image/schema.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "version": 2, - "outputCapture": "pipe", - "$schema": "http://json-schema.org/schema", - "title": "Build Image executor", - "description": "", - "type": "object", - "properties": { - "imageType": { - "type": "string", - "description": "Image type to build", - "default": "jvm" - }, - "imageNamePrefix": { - "type": "string", - "description": "Image name prefix", - "default": "quarkus" - }, - "imageNameSuffix": { - "type": "string", - "description": "Image name suffix" - }, - "framework": { - "type": "string", - "enum": ["spring-boot", "quarkus", "micronaut"] - } - }, - "required": [] -} diff --git a/packages/maven/src/executors/build/executor.ts b/packages/maven/src/executors/build/executor.ts deleted file mode 100644 index 6f60f439c..000000000 --- a/packages/maven/src/executors/build/executor.ts +++ /dev/null @@ -1,57 +0,0 @@ -import { - getPluginName, - getProjectType, - isRootProject, - runCommand, -} from '@jnxplus/common'; -import { getExecutable, isPomPackaging } from '../../lib/utils'; -import { ExecutorContext, logger } from '@nx/devkit'; -import { BuildExecutorSchema } from './schema'; - -export default async function runExecutor( - options: BuildExecutorSchema, - context: ExecutorContext -) { - logger.info(`Executor ran for Build: ${JSON.stringify(options)}`); - - let command = getExecutable(); - - if (options.mvnArgs) { - command += ` ${options.mvnArgs}`; - } - - if (!options.skipClean) { - command += ' clean'; - } - - if (isPomPackaging(context)) { - command += isRootProject(context) ? ' install -N' : ' install'; - - return runCommand(`${command} -pl :${context.projectName}`); - } - - if (options.mvnBuildCommand) { - command += ` ${options.mvnBuildCommand}`; - } else { - if (getProjectType(context) === 'application') { - if ( - getPluginName(context) === '@jnxplus/nx-boot-maven' || - options.framework === 'spring-boot' - ) { - command += ' package spring-boot:repackage'; - } else { - command += ' compile'; - } - } - - if (getProjectType(context) === 'library') { - command += ' install'; - } - } - - if (options.mvnBuildArgs) { - command += ` ${options.mvnBuildArgs}`; - } - - return runCommand(`${command} -DskipTests=true -pl :${context.projectName}`); -} diff --git a/packages/maven/src/executors/build/schema.d.ts b/packages/maven/src/executors/build/schema.d.ts deleted file mode 100644 index c0a10bc01..000000000 --- a/packages/maven/src/executors/build/schema.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { MvnBuildCommandType } from '@jnxplus/common'; - -export interface BuildExecutorSchema { - framework?: 'spring-boot' | 'quarkus' | 'micronaut'; - mvnArgs: string; - mvnBuildCommand: MvnBuildCommandType; - mvnBuildArgs: string; - skipClean: boolean; -} diff --git a/packages/maven/src/executors/build/schema.json b/packages/maven/src/executors/build/schema.json deleted file mode 100644 index a4ec43900..000000000 --- a/packages/maven/src/executors/build/schema.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "version": 2, - "outputCapture": "pipe", - "$schema": "http://json-schema.org/schema", - "title": "Build executor", - "description": "", - "type": "object", - "properties": { - "framework": { - "type": "string", - "enum": ["spring-boot", "quarkus", "micronaut"], - "description": "Only required with nx-maven plugin" - }, - "mvnArgs": { - "type": "string", - "description": "Arguments to pass to the maven cli" - }, - "mvnBuildCommand": { - "type": "string", - "description": "Maven build command to use : compile, package or install" - }, - "mvnBuildArgs": { - "type": "string", - "description": "Arguments to pass to the maven build command" - }, - "skipClean": { - "type": "boolean", - "default": true - } - }, - "required": [] -} diff --git a/packages/maven/src/executors/integration-test/executor.ts b/packages/maven/src/executors/integration-test/executor.ts deleted file mode 100644 index 446e8851b..000000000 --- a/packages/maven/src/executors/integration-test/executor.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { ExecutorContext, logger } from '@nx/devkit'; -import { runCommand } from '@jnxplus/common'; -import { IntegrationTestExecutorSchema } from './schema'; -import { getExecutable } from '../../lib/utils'; - -export default async function runExecutor( - options: IntegrationTestExecutorSchema, - context: ExecutorContext -) { - logger.info(`Executor ran for Integration-test: ${JSON.stringify(options)}`); - - let args = ''; - if (options.args) { - args = options.args; - } - - return runCommand( - `${getExecutable()} integration-test ${args} -pl :${context.projectName}` - ); -} diff --git a/packages/maven/src/executors/integration-test/schema.d.ts b/packages/maven/src/executors/integration-test/schema.d.ts deleted file mode 100644 index 75f58ec4c..000000000 --- a/packages/maven/src/executors/integration-test/schema.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -export interface IntegrationTestExecutorSchema { - args: string; -} diff --git a/packages/maven/src/executors/integration-test/schema.json b/packages/maven/src/executors/integration-test/schema.json deleted file mode 100644 index 0e60b19ec..000000000 --- a/packages/maven/src/executors/integration-test/schema.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 2, - "outputCapture": "pipe", - "$schema": "http://json-schema.org/schema", - "title": "Integration Test executor", - "description": "", - "type": "object", - "properties": { - "args": { - "type": "string" - } - }, - "required": [] -} diff --git a/packages/maven/src/executors/publish/executor.ts b/packages/maven/src/executors/publish/executor.ts deleted file mode 100644 index 34cbd1a49..000000000 --- a/packages/maven/src/executors/publish/executor.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { ExecutorContext, logger } from '@nx/devkit'; -import { runCommand } from '@jnxplus/common'; -import { PublishExecutorSchema } from './schema'; -import { getExecutable } from '../../lib/utils'; - -export default async function runExecutor( - options: PublishExecutorSchema, - context: ExecutorContext -) { - logger.info(`Executor ran for Publish: ${JSON.stringify(options)}`); - let command = getExecutable(); - command += ` deploy -pl :${context.projectName}`; - return runCommand(command); -} diff --git a/packages/maven/src/executors/publish/schema.d.ts b/packages/maven/src/executors/publish/schema.d.ts deleted file mode 100644 index 8b8cc822e..000000000 --- a/packages/maven/src/executors/publish/schema.d.ts +++ /dev/null @@ -1 +0,0 @@ -export interface PublishExecutorSchema {} // eslint-disable-line diff --git a/packages/maven/src/executors/publish/schema.json b/packages/maven/src/executors/publish/schema.json deleted file mode 100644 index b3ef14169..000000000 --- a/packages/maven/src/executors/publish/schema.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "version": 2, - "outputCapture": "pipe", - "$schema": "http://json-schema.org/schema", - "title": "Publish executor", - "description": "", - "type": "object", - "properties": {}, - "required": [] -} diff --git a/packages/maven/src/executors/serve/executor.ts b/packages/maven/src/executors/serve/executor.ts deleted file mode 100644 index bf3d554aa..000000000 --- a/packages/maven/src/executors/serve/executor.ts +++ /dev/null @@ -1,49 +0,0 @@ -import { ExecutorContext, logger } from '@nx/devkit'; -import { getPluginName, runCommand, waitForever } from '@jnxplus/common'; -import { ServeExecutorSchema } from './schema'; -import { getExecutable } from '../../lib/utils'; - -export default async function runExecutor( - options: ServeExecutorSchema, - context: ExecutorContext -) { - logger.info(`Executor ran for serve: ${JSON.stringify(options)}`); - - let command = getExecutable(); - - if ( - getPluginName(context) === '@jnxplus/nx-boot-maven' || - options.framework === 'spring-boot' - ) { - command += ' spring-boot:run'; - } - - if ( - getPluginName(context) === '@jnxplus/nx-quarkus-maven' || - options.framework === 'quarkus' - ) { - command += ' quarkus:dev'; - } - - if ( - getPluginName(context) === '@jnxplus/nx-micronaut-maven' || - options.framework === 'micronaut' - ) { - command += ' mn:run'; - } - - command += ` -pl :${context.projectName}`; - - if (options.args) { - command += ` ${options.args}`; - } - - const result = runCommand(command); - - if (!result.success) { - return { success: false }; - } - - await waitForever(); - return { success: true }; -} diff --git a/packages/maven/src/executors/serve/schema.d.ts b/packages/maven/src/executors/serve/schema.d.ts deleted file mode 100644 index 59e92ad66..000000000 --- a/packages/maven/src/executors/serve/schema.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export interface ServeExecutorSchema { - framework?: 'spring-boot' | 'quarkus' | 'micronaut'; - args: string; -} diff --git a/packages/maven/src/executors/serve/schema.json b/packages/maven/src/executors/serve/schema.json deleted file mode 100644 index cfc82daa2..000000000 --- a/packages/maven/src/executors/serve/schema.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "version": 2, - "outputCapture": "pipe", - "$schema": "http://json-schema.org/schema", - "title": "Serve executor", - "description": "", - "type": "object", - "properties": { - "framework": { - "type": "string", - "enum": ["spring-boot", "quarkus", "micronaut"] - }, - "args": { - "type": "string" - } - }, - "required": [] -} diff --git a/packages/maven/src/executors/test/executor.ts b/packages/maven/src/executors/test/executor.ts deleted file mode 100644 index e61969ad3..000000000 --- a/packages/maven/src/executors/test/executor.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { ExecutorContext, logger } from '@nx/devkit'; -import { runCommand } from '@jnxplus/common'; -import { TestExecutorSchema } from './schema'; -import { getExecutable } from '../../lib/utils'; - -export default async function runExecutor( - options: TestExecutorSchema, - context: ExecutorContext -) { - logger.info(`Executor ran for Test: ${JSON.stringify(options)}`); - let command = getExecutable(); - - command += ` test -pl :${context.projectName}`; - - if (options.mvnArgs) { - command += ` ${options.mvnArgs}`; - } - - return runCommand(command); -} diff --git a/packages/maven/src/executors/test/schema.d.ts b/packages/maven/src/executors/test/schema.d.ts deleted file mode 100644 index 565f35daf..000000000 --- a/packages/maven/src/executors/test/schema.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -export interface TestExecutorSchema { - mvnArgs?: string; -} diff --git a/packages/maven/src/executors/test/schema.json b/packages/maven/src/executors/test/schema.json deleted file mode 100644 index 15961324b..000000000 --- a/packages/maven/src/executors/test/schema.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "version": 2, - "outputCapture": "pipe", - "$schema": "http://json-schema.org/schema", - "title": "Test executor", - "description": "", - "type": "object", - "properties": { - "mvnArgs": { - "type": "string", - "description": "Arguments to pass to the maven cli" - } - }, - "required": [] -}