@sap/cds-dk 7.0.3 → 7.1.1

package/bin/bind.js

@@ -54,7 +54,6 @@ module.exports = Object.assign(cds_bind, {
 const os = require('os');
 const IS_WIN = os.platform() === 'win32';
 
-const { CliError } = require('../lib/client/helper/errors');
 const { bind, parseProfile } = require('../lib/bind');
 
 
@@ -70,26 +69,26 @@ async function cds_bind(args, options) {
 
     // Check if cds command was bind. Don't abort in case of deploy
     if (process.env.CDS_ENV && process.argv[2] === 'bind') {
-        throw new CliError('Option --profile is no longer supported. Use --for instead to specify the profile to use when storing connection settings.');
+        throw 'Option --profile is no longer supported. Use --for instead to specify the profile to use when storing connection settings.';
     }
 
     if (!options.to) {
-        throw new CliError(`Use option --to or -2 to specify the target instance, e.g. cds bind --to myInstance:myService`);
+        throw `Use option --to or -2 to specify the target instance, e.g. cds bind --to myInstance:myService`;
     }
 
     if (args.length > 1) {
-        throw new CliError(`Too many arguments: Please specify only one or no service.`);
+        throw `Too many arguments: Please specify only one or no service.`;
     }
 
     options.serviceArg = args[0]
     options.targets = options.to.split(/,/g);
 
     if (options.targets.length >= 2 && options.serviceArg) {
-        throw new CliError(`Service argument cannot be specified together with multiple targets ('--to') services. Use one service per call or omit the service argument.`);
+        throw `Service argument cannot be specified together with multiple targets ('--to') services. Use one service per call or omit the service argument.`;
     }
 
     if (options.targets.length >= 2 && options.kind) {
-        throw new CliError(`The option '--kind' cannot be specified together with multiple targets ('--to') services. Use one service per call or omit the '--kind' option.`);
+        throw `The option '--kind' cannot be specified together with multiple targets ('--to') services. Use one service per call or omit the '--kind' option.`;
     }
 
     await bind({

package/bin/build.js

@@ -96,19 +96,14 @@ async function build([project], options = {}) {
     cds.env = cds.env.for('cds', cds.root);
     delete options.project // avoid that relative project paths are resolved twice
 
-    options.cli = true // avoid that errors are logged twice
-
-    const { CliError } = require('../lib/client/helper/errors')
     const { build } = require('../lib/build')
-
     const [major] = cds.version.split('.')
     if (Number(major) < 6) {
-        throw new CliError("This application uses @sap/cds version < 6, which is not compatible with the installed @sap/cds-dk version >= 7. Update @sap/cds to version >= 6.")
+        throw "This application uses @sap/cds version < 6, which is not compatible with the installed @sap/cds-dk version >= 7. Update @sap/cds to version >= 6."
     }
     if (options.clean === "false") {
-        throw new CliError("cds build option '--clean' is deprecated - build output folders are always cleaned before build")
+        throw "cds build option '--clean' is deprecated - build output folders are always cleaned before build"
     }
-
     if (typeof options["options-model"] === "string") {
         options.opts = "model=[" + options["options-model"].split(",").map((entry) => entry.trim()) + "]"
         delete options["options-model"]

package/bin/cds.js

@@ -54,11 +54,7 @@ const cli = { //NOSONAR
         return await task.apply(this, args)
       }
     } catch (e) {
-      const { BuildError } = require('../lib/build')
-      const { CliError } = require('../lib/client/helper/errors')
       process.exitCode ??= 1
-      if (e.messages?.length) return cds._log(e.messages, { 'log-level': cds.env.log.levels.cli })
-      else if (e instanceof CliError || e instanceof BuildError) return console.error(e.message)
       if (cds.watched)  throw e  // bin/watched.js handles errors
       else return console.error(e)
     }
@@ -106,7 +102,8 @@ const cli = { //NOSONAR
     }
 
     // if (env) require('../lib/cds').env.add (env) //> avoid loading env
-    process.env.CDS_CONFIG = JSON.stringify(env)
+    // unless it has already explicitly been set by the user
+    process.env.CDS_CONFIG ??= JSON.stringify(env)
     return [ args, options ]
   },
 

package/bin/subscribe.js

@@ -46,19 +46,19 @@ module.exports = Object.assign(subscribe, {
 
 
 async function subscribe([tenant], options = {}) {
-    const { CliError } = require('../lib/client/helper/errors');
+    const { getMessage } = require('../lib/client/helper/logging');
     if (!tenant) {
-        throw new CliError('Tenant not given.', { command: 'subscribe' });
+        throw getMessage('Tenant not given.', { command: 'subscribe' });
     }
     const libOptions = { tenant };
     if (options.local) {
         libOptions.local = true;
         delete options.local;
         if (options.user) {
-            throw new CliError('Username cannot be specified when running @sap/cds-mtxs locally.', { command: 'subscribe' });
+            throw getMessage('Username cannot be specified when running @sap/cds-mtxs locally.', { command: 'subscribe' });
         }
         if (options.to) {
-            throw new CliError('URL cannot be specified when running @sap/cds-mtxs locally.', { command: 'subscribe' });
+            throw getMessage('URL cannot be specified when running @sap/cds-mtxs locally.', { command: 'subscribe' });
         }
     }
     const [username, password] = options.user?.split(':') ?? [];

package/bin/unsubscribe.js

@@ -47,19 +47,19 @@ module.exports = Object.assign(unsubscribe, {
 
 
 async function unsubscribe([tenant], options = {}) {
-    const { CliError } = require('../lib/client/helper/errors');
+    const { getMessage } = require('../lib/client/helper/logging');
     if (!tenant) {
-        throw new CliError('Tenant not given.', { command: 'unsubscribe' });
+        throw getMessage('Tenant not given.', { command: 'unsubscribe' });
     }
     const libOptions = { tenant };
     if (options.local) {
         libOptions.local = true;
         delete options.local;
         if (options.user) {
-            throw new CliError('Username cannot be specified when running @sap/cds-mtxs locally.', { command: 'subscribe' });
+            throw getMessage('Username cannot be specified when running @sap/cds-mtxs locally.', { command: 'subscribe' });
         }
         if (options.from) {
-            throw new CliError('URL cannot be specified when running @sap/cds-mtxs locally.', { command: 'unsubscribe' });
+            throw getMessage('URL cannot be specified when running @sap/cds-mtxs locally.', { command: 'unsubscribe' });
         }
     }
     const [username, password] = options.user?.split(':') ?? [];

package/bin/upgrade.js

@@ -47,19 +47,19 @@ module.exports = Object.assign(upgrade, {
 
 
 async function upgrade([tenant], options = {}) {
-    const { CliError } = require('../lib/client/helper/errors');
+    const { getMessage } = require('../lib/client/helper/logging');
     if (!tenant) {
-        throw new CliError('Tenant not given.', { command: 'upgrade' });
+        throw getMessage('Tenant not given.', { command: 'upgrade' });
     }
     const libOptions = { tenant };
     if (options.local) {
         libOptions.local = true;
         delete options.local;
         if (options.user) {
-            throw new CliError('Username cannot be specified when running @sap/cds-mtxs locally.', { command: 'upgrade' });
+            throw getMessage('Username cannot be specified when running @sap/cds-mtxs locally.', { command: 'upgrade' });
         }
         if (options.at) {
-            throw new CliError('URL cannot be specified when running @sap/cds-mtxs locally.', { command: 'upgrade' });
+            throw getMessage('URL cannot be specified when running @sap/cds-mtxs locally.', { command: 'upgrade' });
         }
     }
     const [username, password] = options.user?.split(':') ?? [];

package/lib/bind/cfKeyProvider.js

@@ -7,7 +7,6 @@ const axios = require('axios');
 require('../util/pruneAxiosErrors');
 const { URL } = require('url');
 const { bold, highlight } = require('../util/term');
-const { CliError } = require('../client/helper/errors');
 
 class CFKeyProvider {
     async getCfSpaceInfo() {
@@ -21,13 +20,13 @@ class CFKeyProvider {
         const { org, space } = target;
         const orgs = await BatchRequest.req(targetWithAuth, `/v3/organizations?names=${encodeURIComponent(encodeURIComponent(org))}`);
         if (!(orgs && orgs.resources.length === 1)) {
-            throw new CliError(`CF org ${org} not found!`);
+            throw `CF org ${org} not found!`;
         }
 
         const orgGuid = orgs.resources[0].guid;
         const spaces = await BatchRequest.req(targetWithAuth, `/v3/spaces?names=${encodeURIComponent(encodeURIComponent(space))}&organization_guids=${encodeURIComponent(encodeURIComponent(orgGuid))}`)
         if (!(spaces && spaces.resources.length === 1)) {
-            throw new CliError(`CF space ${space} not found in org ${org}!`);
+            throw `CF space ${space} not found in org ${org}!`;
         }
 
         const spaceGuid = spaces.resources[0].guid;
@@ -81,7 +80,7 @@ class CFKeyProvider {
         try {
             instanceObj = await this.getInstance({ names: instance, space_guids: spaceGuid });
         } catch (error) {
-            throw new CliError(`Service instance "${instance}" not found.`);
+            throw `Service instance "${instance}" not found.`;
         }
         switch (instanceObj.type) {
             case 'managed':
@@ -89,7 +88,7 @@ class CFKeyProvider {
             case 'user-provided':
                 return this._resolveUserProvidedService(instanceObj, instance, org, space);
             default:
-                throw new CliError(`Service type ${instanceObj.type} not supported`)
+                throw `Service type ${instanceObj.type} not supported`;
         }
     }
 
@@ -100,7 +99,7 @@ class CFKeyProvider {
         } catch (error) {
             let message = `No service key ${highlight(key)} found for service instance ${highlight(instance)}.\n\n`;
             message += `Use ${bold(`cf create-service-key ${instanceObj.name} ${key} [-c ...]`)} to create the required service key.`;
-            throw new CliError(message);
+            throw message;
         }
         const planObj = await this.getPlans({ guids: instanceObj.relationships.service_plan.data.guid });
         const offeringObj = await this.getOfferings({ guids: planObj.relationships.service_offering.data.guid });
@@ -151,10 +150,10 @@ class CFKeyProvider {
 
         // if no api endpoint is configured the currently logged in endpoint will be used
         if (apiEndpoint && apiEndpoint !== this.target.apiEndpoint) {
-            name = `${name || instance}:${key || instance + '-key'}`
+            name = `${name || instance}:${key || instance + '-key'}`;
             let message = `Current Cloud Foundry API endpoint ${highlight(this.target.apiEndpoint)} differs from API endpoint ${highlight(apiEndpoint)} for service binding ${highlight(name)}.\n\n`;
             message += `Use ${bold(`cf login -a ${apiEndpoint}`)} to log in to the target API endpoint.`;
-            throw new CliError(message)
+            throw message;
         }
     }
 }
@@ -224,9 +223,9 @@ class BatchRequest {
             if (filteredResources.length === 1) {
                 filter.resolve(filteredResources[0]);
             } else if (filteredResources.length === 0) {
-                filter.reject(new CliError(`Couldn't find resource for url "${this.url}" with filter "${fmt(filter.filter)}"`));
+                filter.reject(`Couldn't find resource for url "${this.url}" with filter "${fmt(filter.filter)}"`);
             } else {
-                filter.reject(new CliError(`Found more than one resources for url "${this.url}" with filter "${fmt(filter.filter)}"`));
+                filter.reject(`Found more than one resources for url "${this.url}" with filter "${fmt(filter.filter)}"`);
             }
         }
     }

package/lib/bind/index.js

@@ -1,7 +1,5 @@
 const cds = require('../cds');
 
-const { CliError } = require('../client/helper/errors');
-
 const BindingResolver = require('./bindingResolver');
 const { determineKinds, getRequiresNameFromKind, checkIsJavaProject, platformText, bindingText, logger } = require('./bindingUtil');
 const { highlight, bold, info } = require('../util/term');
@@ -31,7 +29,7 @@ async function bind(options) {
             on = 'cf';
             break;
         default:
-            throw new CliError(`Invalid value '${options.on}' for option --on.`);
+            throw `Invalid value '${options.on}' for option --on.`;
     }
 
     const onText = { 'cf': 'Cloud Foundry', 'k8s': 'Kubernetes' }[on];

package/lib/build/buildTaskEngine.js

@@ -27,7 +27,6 @@ class BuildTaskEngine {
 
     async processTasks(tasks) {
         const startTime = Date.now()
-        const messages = []
 
         this.logger.log(`building project [${cds.root}], clean [${this.buildOptions.clean}]`)
         this.logger.log(`cds-dk [${require('../../package.json').version}], cds [${cds.version}], compiler [${cds.compiler.version()}], home [${cds.home}]\n`)
@@ -64,18 +63,12 @@ class BuildTaskEngine {
 
             await this._writeGenerationLog(handlers)
             this._logBuildOutput(handlers)
-            this._logMessages([...BuildTaskEngine._getHandlerMessages(handlers), ...messages])
+            this._logMessages(BuildTaskEngine._getHandlerMessages(handlers))
             this._logTimer(startTime, Date.now())
 
             return buildResult
         } catch (error) {
             this._logBuildOutput(handlers)
-
-            // cds CLI layer logs in case of an exception if invoked from CLI
-            if (!this.buildOptions.cli) {
-                this._logMessages([...BuildTaskEngine._getErrorMessages([error]), ...messages])
-            }
-
             throw error
         }
     }
@@ -215,22 +208,16 @@ class BuildTaskEngine {
     }
 
     _createHandler(task) {
-        try {
-            const handler = this.providerFactory.createHandler(task)
-            handler.init()
+        const handler = this.providerFactory.createHandler(task)
+        handler.init()
 
-            if (!(handler instanceof BuildTaskHandlerInternal) && handler.priority !== 1) {
-                // Custom build handlers are executed before internal handlers to ensure
-                // that generated content cannot be overwritten by mistake
-                throw new Error(`Illegal priority for ${handler.constructor.name} encountered for custom handler - in this version only priority value '1' is allowed`)
-            }
-            this._logTaskHandler(handler)
-
-            return handler
-        } catch (error) {
-            log(error, { log: this.logger.log })
-            throw error
+        if (!(handler instanceof BuildTaskHandlerInternal) && handler.priority !== 1) {
+            // Custom build handlers are executed before internal handlers to ensure
+            // that generated content cannot be overwritten by mistake
+            throw new Error(`Illegal priority for ${handler.constructor.name} encountered for custom handler - in this version only priority value '1' is allowed`)
         }
+        this._logTaskHandler(handler)
+        return handler
     }
 
     _logBuildOutput(handlers) {
@@ -282,6 +269,7 @@ class BuildTaskEngine {
                 "log-level": this._getLogLevel() // ensures that for tests the correct cds.env is used
             }
             deduplicateMessages(messages)
+            sortMessagesSeverityAware(messages)
             log(messages, options)
         }
     }

package/lib/build/buildTaskFactory.js

@@ -1,6 +1,6 @@
 const fs = require('fs')
 const path = require('path')
-const cds = require('../cds'), { _log:log } = cds
+const cds = require('../cds')
 const BuildTaskProviderFactory = require('./buildTaskProviderFactory')
 const { hasJavaNature, getProperty, redactCredentials, flatten, getDefaultModelOptions } = require('./util')
 const { FILE_EXT_CDS, BUILD_TASK_JAVA_CF, BUILD_TASK_JAVA } = require("./constants")
@@ -24,36 +24,27 @@ class BuildTaskFactory {
     // 2. read using cds.env.build.tasks
     // 3. create from cds.env.folders config data
     async getTasks() {
-        try {
-            const tasks = await this._createTasks()
+        const tasks = await this._createTasks()
 
-            // log build tasks
-            this.logger.log(`the following build tasks will be executed`)
-            let tasksOutput = "   {\n     \"build\": {\n       \"target\": \"" + cds.env.build.target + "\",\n       \"tasks\": ["
-            for (let i = 0; i < tasks.length; i++) {
-                tasksOutput += "\n         " + BuildTaskFactory._stringifyTask(tasks[i]) + (i + 1 < tasks.length ? "," : "")
-            }
-            tasksOutput += "\n       ]\n     }\n   }\n"
-            this.logger.log(tasksOutput)
+        // log build tasks
+        this.logger.log(`the following build tasks will be executed`)
+        let tasksOutput = "   {\n     \"build\": {\n       \"target\": \"" + cds.env.build.target + "\",\n       \"tasks\": ["
+        for (let i = 0; i < tasks.length; i++) {
+            tasksOutput += "\n         " + BuildTaskFactory._stringifyTask(tasks[i]) + (i + 1 < tasks.length ? "," : "")
+        }
+        tasksOutput += "\n       ]\n     }\n   }\n"
+        this.logger.log(tasksOutput)
 
-            // for testing purposes
-            this.logger.debug("cds.env used for build:")
-            this.logger._debug && this.logger.debug(redactCredentials(cds.env))
+        // for testing purposes
+        this.logger.debug("cds.env used for build:")
+        this.logger._debug && this.logger.debug(redactCredentials(cds.env))
 
-            // always resolve tasks for input validation
-            const resolvedTasks = this.providerFactory.resolveTasks(tasks)
-            if (this.buildOptions.resolve) {
-                return resolvedTasks
-            }
-            return tasks
-        } catch (e) {
-            this.logger.log('')
-            // cds CLI layer is doing the logging if invoked using CLI
-            if (!this.buildOptions.cli) {
-                log(e, { withStack: true, log: (message) => this.logger.log(message) })
-            }
-            throw e
+        // always resolve tasks for input validation
+        const resolvedTasks = this.providerFactory.resolveTasks(tasks)
+        if (this.buildOptions.resolve) {
+            return resolvedTasks
         }
+        return tasks
     }
 
     async _createTasks() {

package/lib/build/buildTaskHandler.js

@@ -227,14 +227,11 @@ class BuildTaskHandler {
     // Returns the value of the given build option defined for this build task.
     _getBuildOption(qualifiedName) {
         // build task options overwriting other settings
-        let value = getProperty(this.task.options, qualifiedName)
-        if (value !== undefined) {
-            return value
-        }
-        value = getProperty(this.context.options, qualifiedName)
-        if (value !== undefined) {
-            return value
+        let value = getProperty(this.context.options, qualifiedName) // command line
+        if (value === undefined) {
+            value = getProperty(this.task.options, qualifiedName) // task options
         }
+        return value
     }
 }
 module.exports = BuildTaskHandler

package/lib/build/index.js

@@ -14,8 +14,17 @@ module.exports = { build, BuildTaskFactory, BuildTaskEngine, BuildTaskHandler, B
  */
 async function build(options = {}) {
     if (!fs.existsSync(cds.root) || !fs.lstatSync(cds.root).isDirectory()) {
-        const { CliError } = require('../client/helper/errors')
-        throw new CliError(`Project folder '${cds.root}' does not exist`)
+        throw `Project folder '${cds.root}' does not exist`
+    }
+    try {
+        return await new BuildTaskEngine(options).processTasks()
+    } catch (e) {
+        if (e instanceof BuildError || e.constructor.name === 'CompilationError') {
+            cds._log(e.messages.length ? [...e.messages, ''] : e.message + '\n', { 'log-level': options['log-level'] || cds.env['log-level'] })
+            // CompilationError.message also includes the detail messages - do not log twice
+            const message = e.constructor.name === 'CompilationError' ? 'CDS compilation failed' : e.messages.length ? e.message : 'CDS build failed'
+            throw message
+        }
+        throw e
     }
-    return await new BuildTaskEngine(options).processTasks()
 }

package/lib/build/provider/buildTaskProviderInternal.js

@@ -1,7 +1,7 @@
 const fs = require('fs')
 const path = require('path')
 const cds = require('../../cds')
-const { hasJavaNature, getDefaultModelOptions, BuildError, hasOptionValue } = require('../util')
+const { hasJavaNature, getDefaultModelOptions, BuildError, hasOptionValue, isClassicMtx } = require('../util')
 const BuildTaskProvider = require('../buildTaskProvider')
 
 const { FILE_EXT_CDS, BUILD_TASK_HANA, BUILD_TASK_FIORI, BUILD_TASK_JAVA, BUILD_TASK_JAVA_CF, BUILD_TASK_NODEJS, BUILD_TASK_NODE_CF, BUILD_TASK_MTX,
@@ -12,6 +12,11 @@ class BuildTaskProviderInternal extends BuildTaskProvider {
     constructor(logger) {
         super()
         this._logger = logger
+        // ensure that classic mtx is not used in combination with cds-dk@7
+        if (isClassicMtx()) {
+            throw new BuildError(`@sap/cds-mtx is deprecated and not supported by @sap/cds-dk >= 7.
+Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/docs/guides/multitenancy/old-mtx-migration or install @sap/cds-dk version 6 instead.`)
+        }
     }
     get logger() {
         return this._logger
@@ -65,7 +70,8 @@ class BuildTaskProviderInternal extends BuildTaskProvider {
                 this.logger.debug("No service module found")
             }
         }
-        // create required build tasks
+
+        // order of creation is relevant
         if (addRequiredTasks) {
             const mtxTask = tasks.find(task => task.for === BUILD_TASK_MTX || task.for === BUILD_TASK_MTX_SIDECAR)
             if (mtxTask) {
@@ -80,12 +86,15 @@ class BuildTaskProviderInternal extends BuildTaskProvider {
                 let dbTask = tasks.find(task => task.for === BUILD_TASK_HANA)
                 if (!dbTask) {
                     //  db task might be missing if mtx task is enforced by 'cds build --for mtx'
-                    dbTask = this._createDbTask(db, dbOptions)
+                    dbTask = cds.env.build.tasks?.find(task => task.for === BUILD_TASK_HANA)
+                    if (!dbTask) {
+                        dbTask = this._createDbTask(db, dbOptions)
+                    }
                     if (dbTask) {
                         tasks.push(dbTask)
                     }
                 }
-                if (dbTask && (!mtxTask._uses || !mtxTask._uses.map(use => use.task).includes(dbTask))) {
+                if (dbTask && !mtxTask._uses?.map(use => use.task).includes(dbTask)) {
                     const use = { task: dbTask }
                     mtxTask._uses ? mtxTask._uses.push(use) : mtxTask._uses = [use]
                 }
@@ -106,7 +115,7 @@ class BuildTaskProviderInternal extends BuildTaskProvider {
             }
 
             // create mtx build task
-            const mtxTask = this._createMtxTask(srv, tasks)
+            const mtxTask = this._createMtxTask(srv)
             if (mtxTask) {
                 tasks.push(mtxTask)
             }
@@ -153,7 +162,7 @@ class BuildTaskProviderInternal extends BuildTaskProvider {
         return userEnv && (userEnv.data?.model || userEnv.service?.model)
     }
 
-    _createMtxTask(src, tasks) {
+    _createMtxTask(src) {
         this.logger.debug("determining MTX architecture")
 
         // preserve order of creation
@@ -177,26 +186,26 @@ class BuildTaskProviderInternal extends BuildTaskProvider {
                     throw new BuildError(`MTX sidecar directory '${sidecarPath}' not existing. Custom build task configuration required if the folder is named differently.`)
                 }
                 if (!sidecarEnv.requires["cds.xt.ModelProviderService"]?._in_sidecar) {
-                    // correct profile might have been set, but couldn't be resolved
                     if (sidecarEnv.profiles?.includes('mtx-sidecar')) {
-                        throw new BuildError('MTX configuration cannot be resolved. Make sure an up-to-date version of @sap/cds-mtxs is installed.')
+                        // profile has been set, but cannot be resolved
+                        throw new BuildError('MTX configuration cannot be resolved. Make sure up-to-date versions of @sap/cds-mtxs and @sap/cds are installed.')
                     }
                     throw new BuildError(`Invalid MTX sidecar configuration - profile 'mtx-sidecar' not set.`)
                 }
                 return { for: BUILD_TASK_MTX_SIDECAR }
             }
+
             if (sidecarEnv?.requires["cds.xt.ModelProviderService"]?._in_sidecar || sidecarEnv?.profiles?.includes('mtx-sidecar')) {
                 throw new BuildError(`MTX sidecar requires profile 'with-mtx-sidecar' in project root configuration.`)
             }
-
             if (cds.env.requires["cds.xt.ModelProviderService"]?._in_sidecar || cds.env.profiles?.includes('mtx-sidecar')) {
                 // cds build is executed in sidecar folder
                 throw new BuildError(`Seems that you are executing 'cds build' in the 'mtx/sidecar' folder. Execute 'cds build' in the project root folder instead.`)
             }
 
-            // mtxs with nodejs, but without sidecar
-            if (!tasks.some(task => task.for === BUILD_TASK_JAVA || task.for === BUILD_TASK_JAVA_CF)) {
-                this.logger.debug("MTX app without sidecar")
+            // mtxs nodejs app without sidecar
+            if (!BuildTaskProviderInternal._hasJavaNature(src)) {
+                this.logger.debug("MTX Nodejs app without sidecar")
                 return {
                     for: BUILD_TASK_MTX,
                     src
@@ -278,7 +287,6 @@ class BuildTaskProviderInternal extends BuildTaskProvider {
                 task.src = task.src || "."
                 break
             case BUILD_TASK_MTX:
-                require('../../util/version').checkMtx(cds)
                 // mtxs with nodejs, but without sidecar
                 task.src = task.src || this._normalizePath(cds.env.folders.srv)
                 break
@@ -310,7 +318,7 @@ class BuildTaskProviderInternal extends BuildTaskProvider {
         }
 
         // REVISIT: filter nodejs bootstrap service models for Java - issues/12770#issuecomment-1805719
-        if (this._hasJavaNature(cds.env.folders.srv)) {
+        if (this._hasJavaNature()) {
             defaultModelPaths = defaultModelPaths.filter(p => !NODEJS_MODEL_EXCLUDE_LIST.includes(p))
         }
         // also add built-in models to custom build tasks already containing model options
@@ -323,7 +331,7 @@ class BuildTaskProviderInternal extends BuildTaskProvider {
      * Returns whether this project is a java project or not.
      * @param {string} srv - the folder name of the service module
      */
-    static _hasJavaNature(srv) {
+    static _hasJavaNature(srv = cds.env.folders.srv) {
         srv = this._getModuleFolder(Array.isArray(srv) ? srv : [srv])
         return hasJavaNature([cds.root, srv && path.join(cds.root, srv)])
     }

package/lib/build/provider/fiori/index.js

@@ -52,8 +52,9 @@ class FioriAppModuleBuilder extends BuildTaskHandlerEdmx {
             appModelGroups.set(appFolder, appModels)
         }
 
-        const originFioriBuildOption = fioriBuildOptions[OUTPUT_MODE]
-        fioriBuildOptions[OUTPUT_MODE] = OUTPUT_MODE_RESULT
+        // ensure edmx is cached as build result 
+        const buildOption = this.context.options[OUTPUT_MODE]
+        this.context.options[OUTPUT_MODE] |= OUTPUT_MODE_RESULT
 
         try {
             const edmxOptions = { version: cds.env.odata?.version }
@@ -76,7 +77,7 @@ class FioriAppModuleBuilder extends BuildTaskHandlerEdmx {
                 fioriBuildOptions.appEdmx.set(appFolder, this._result.edmx)
             }
         } finally {
-            fioriBuildOptions[OUTPUT_MODE] = originFioriBuildOption
+            this.context.options[OUTPUT_MODE] = buildOption
         }
         return false
     }

package/lib/build/provider/java/index.js

@@ -2,7 +2,7 @@ const fs = require('fs')
 const path = require('path')
 const cds = require('../../../cds')
 const BuildTaskHandlerEdmx = require('../buildTaskHandlerEdmx')
-const { OUTPUT_MODE, OUTPUT_MODE_RESULT, FILE_EXT_CDS, CONTENT_LANGUAGE_BUNDLES, CONTENT_DEFAULT_CSN, DEFAULT_CSN_FILE_NAME } = require('../../constants')
+const { OUTPUT_MODE, OUTPUT_MODE_RESULT, FILE_EXT_CDS, CONTENT_LANGUAGE_BUNDLES, CONTENT_DEFAULT_CSN, DEFAULT_CSN_FILE_NAME, OUTPUT_MODE_FILESYSTEM } = require('../../constants')
 const { getI18nDefaultFolder } = require('../../util')
 const DEFAULT_COMPILE_DEST_FOLDER = path.normalize('src/main/resources/edmx')
 
@@ -34,7 +34,7 @@ class JavaModuleBuilder extends BuildTaskHandlerEdmx {
                 this._result.languageBundles = i18n.bundles
             }
         }
-        if (this.isStagingBuild() && this.hasBuildOption(OUTPUT_MODE, OUTPUT_MODE_RESULT)) {
+        if (this.isStagingBuild() && this.hasBuildOption(OUTPUT_MODE, OUTPUT_MODE_FILESYSTEM)) {
             await this._copyNativeContent(src, dest)
         }
         return this._result

package/lib/build/provider/mtx/index.js

@@ -5,6 +5,7 @@ const cds = require('../../../cds')
 const BuildTaskHandlerEdmx = require('../buildTaskHandlerEdmx')
 const ResourcesTarProvider = require('./resourcesTarBuilder')
 const { FOLDER_GEN } = require('../../constants')
+const { BuildError } = require('../../util')
 
 class MtxModuleBuilder extends BuildTaskHandlerEdmx {
     get priority() {
@@ -13,12 +14,17 @@ class MtxModuleBuilder extends BuildTaskHandlerEdmx {
     }
     init() {
         super.init()
+
+        // this build task only supports nodejs mtxs apps without sidecar
+        if (cds.env['project-nature'] === 'java') {
+            throw new BuildError(`@sap/cds-mtx is deprecated and not supported by @sap/cds-dk >= 7. This also applies to the 'mtx' build task in Java projects.
+Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/docs/guides/multitenancy/old-mtx-migration or install @sap/cds-dk version 6 instead.`)
+        }
     }
 
     async build() {
-        // Non-sidecar scenario: model-provider is implemented by the Nodejs app itself (default for Nodejs).
         // Only create resources TAR, compiled CSN(s) are created by the Nodejs app build task.
-        const dest = cds.env.build.target !== "." ? this.task.dest : path.join(this.task.dest, FOLDER_GEN)
+        const dest = cds.env.build.target !== '.' ? this.task.dest : path.join(this.task.dest, FOLDER_GEN)
         const model = await this.model()
         if (!model) {
             return

package/lib/build/util.js

@@ -177,6 +177,18 @@ function getI18nDefaultFolder() {
     return cds.env.i18n.folders[0] ?? 'i18n'
 }
 
+function isClassicMtx() {
+    function _hasMtxDependency() {
+        try {
+            return !!require(path.join(cds.root, 'package.json'))?.dependencies?.['@sap/cds-mtx']
+        } catch (e) {
+            return false
+        }
+    }
+    return /true/i.test(process.env.OLD_MTX) || _hasMtxDependency()
+}
+
+
 /**
  * Return gnu-style error string for location `loc`:
  *  - 'File:Line:Col' without `loc.end`
@@ -266,6 +278,7 @@ module.exports = {
     flatten,
     copy,
     getI18nDefaultFolder,
+    isClassicMtx,
     BuildMessage,
     BuildError
 }