@sap/cds-dk 8.2.3 → 8.4.0

package/lib/import/openapi/utilities.js

@@ -2,8 +2,13 @@ module.exports = { cdsName, nameFromPath, pathAndMethod, serviceName };
 
 function cdsName(oasName) {
   if (oasName === "") return "_";
+  if (typeof oasName === "number") return `_${JSON.stringify(oasName)}`;
   let name = oasName;
-  if (name.match(/^(\p{Nd}|\p{Mn}|\p{Mc}|\p{Pc}|\p{Cf})/u)) name = "_" + name;
+  if (
+    !name.startsWith("_") &&
+    name.match(/^(\p{Nd}|\p{Mn}|\p{Mc}|\p{Pc}|\p{Cf})/u)
+  )
+    name = "_" + name;
   return name.replace(/[^_\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]/gu, "_");
   //TODO: shorten if longer than 128 characters
 }
@@ -15,7 +20,7 @@ function nameFromPath(path, method) {
     .replace(/{[^}]+}/g, ".")
     .replace(/\/\./g, "_")
     .replace(/[^_\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]/gu, "_");
-  if (cleanPath === "") cleanPath = "_";
+  if (cleanPath === "") cleanPath = "_root";
   //TODO: shorten if longer than 128 characters
   return method === "get" ? cleanPath : `${cleanPath}_${method}`;
 }

package/lib/init/constants.js

@@ -5,7 +5,7 @@ module.exports = {
     COMMAND_ADD: 'add',
 
     JAVA_LTS_VERSIONS: [17, 21],
-    MAVEN_ARCHETYPE_VERSION: '3.2.0',
+    MAVEN_ARCHETYPE_VERSION: '3.3.1',
 
     OPTIONS: Object.freeze({
         COMPLETION: 'completion',
@@ -24,6 +24,7 @@ module.exports = {
         MULTITENANCY: 'multitenancy',
         TOGGLES: 'toggles',
         EXTENSIBILITY: 'extensibility',
+        SIDE_BY_SIDE_EXTENSIBILITY: 'side-by-side-extensibility',
         MTX: 'mtx',
         XSUAA: 'xsuaa',
         HANA: 'hana',

package/lib/init/index.js

@@ -265,6 +265,10 @@ module.exports = class CDSGenerator {
         // set is ordered ... always
         options.add = new Set(trimmedTokens);
 
+        if (options?.java) { // --java -> --add java
+            options.add.add('java')
+        }
+
         if (cds.cli.command === COMMAND_INIT && !options.add.has(JAVA)) {
             options.add.add(NODEJS);
         }

package/lib/init/merge.js

@@ -162,8 +162,8 @@ async function _mergeYAML(into, from, project, semantics = {}) {
 
     let collectionStack = [target.contents]
 
-    const _getProperty = (object, keyPath) => keyPath.split('.').reduce((p, k) => p && p[k], object)
-    const _getYAMLProperty = (object, keyPath) => keyPath.split('.').reduce((p, k) => p && p.get(k), object)
+    const _getProperty = (object, keyPath) => keyPath.split('.').filter(k => k).reduce((p, k) => p && p[k], object)
+    const _getYAMLProperty = (object, keyPath) => keyPath.split('.').filter(k => k).reduce((p, k) => p && p.get(k), object)
 
     const _validateWhere = (node, dict, index) => {
         const _addToMap = entries => entries?.filter(entry => {

package/lib/init/mvn.js

@@ -17,8 +17,8 @@ module.exports.add = async function (feature) {
     if (javaMvn) _scan(javaMvn).forEach(([k,v]) => params.set(k,v))
     const archetypeVersion = params.get('-DarchetypeVersion') ?? MAVEN_ARCHETYPE_VERSION
     if (feature === HANA) { // REVISIT: compat for HANA until -Dfeature HANA is provided by Java
-        params.set(`com.sap.cds:cds-maven-plugin:${archetypeVersion}:addTargetPlatform`)
-        params.set(`-DtargetPlatform`, `cloudfoundry`) // REVISIT: Should get rid of CF dependency for Kyma scenarios
+        params.set(`com.sap.cds:cds-maven-plugin:${archetypeVersion}:add`)
+        params.set(`-Dfeature`, `CF`) // REVISIT: Should get rid of CF dependency for Kyma scenarios
     } else {
         params.set(`com.sap.cds:cds-maven-plugin:${archetypeVersion}:add`)
         params.set(`-Dfeature`, feature)

package/lib/init/projectReader.js

@@ -89,10 +89,12 @@ module.exports = new class ProjectReader {
      * @property {boolean} hasApprouter Indicates if the project uses the SAP Application Router.
      * @property {boolean} hasHtml5Repo Indicates if the project uses the SAP BTP HTML5 Application Repository.
      * @property {boolean} hasPortal Indicates if the project uses the SAP Cloud Portal service.
+     * @property {boolean} hasWorkzoneStandard Indicates if the project uses the SAP Build Work Zone, Standard Edition service.
      * @property {boolean} hasDestination Indicates if the project uses the SAP BTP Destination service.
      * @property {boolean} hasMTXRoute Indicates if the approuter should have a multitenant route.
      * @property {boolean} hasMTXRouteJava Indicates if the approuter should have a multitenant subscription route (java).
      * @property {boolean} hasMalwareScanner Indicates if the project uses the SAP Malware Scanning service.
+     * @property {boolean} hasDynatrace Indicates if the project uses Dynatrace.
      *
      */
 
@@ -116,7 +118,6 @@ module.exports = new class ProjectReader {
         const isApp = name => name !== 'appconfig' && !name.startsWith('_') && name !== 'router' && name !== 'portal'
         const reserved = {
             has: x => _inProd(x),
-            shortcut: () => true,
             profile: () => cds.cli.options?.for,
             language: () => exists('pom.xml') ? 'java' : 'nodejs',
             isJava: () => _isJava(),

package/lib/init/registries/mta.js

@@ -5,7 +5,8 @@ const srvNode4 = path => ({ in: 'modules', where: { type: 'nodejs', path } })
 const srvJava4 = path => ({ in: 'modules', where: { type: 'java', path } })
 
 // REVISIT: Clean up
-const isJava = process.argv[process.argv.indexOf('--add') + 1].split(',').includes('java') || cds.env['project-nature'] === 'java' || cds.cli.options?.add?.has('java')
+const isJava = process.argv[process.argv.indexOf('--add') + 1].split(/[,\s+]/).includes('java') || cds.env['project-nature'] === 'java' || cds.cli.options?.add?.has('java') || process.argv.includes('--java')
+
 const srv4 = isJava ? srvJava4 : srvNode4
 
 const approuter = { in: 'modules', where: { type: 'approuter.nodejs' } }
@@ -25,6 +26,11 @@ const destinations = {
     where: { type: 'com.sap.application.content', 'build-parameters.no-source': true }
 }
 
+const destinationSideBySideExtensibility = {
+    in: [destinations, 'parameters.content.subaccount.destinations' ],
+    where: { URL: '~{srv-api/srv-url}', Authentication: 'OAuth2ClientCredentials' }
+}
+
 const connectivity = {
     in: 'resources',
     where: { type: 'org.cloudfoundry.managed-service', 'parameters.service': 'connectivity' }
@@ -186,6 +192,7 @@ module.exports = {
     xsuaa,
     destination,
     destinations,
+    destinationSideBySideExtensibility,
     connectivity,
     enterpriseMessaging,
     kafkaMessaging,

package/lib/init/registries/xs-app.js

@@ -0,0 +1,10 @@
+
+
+const odataApi = {
+  in: 'routes',
+  where: { target: '/odata/$1' }
+}
+
+module.exports = {
+  odataApi
+}

package/lib/init/template/approuter/files/package.json

@@ -1,7 +1,7 @@
 {
   "name": "approuter",
   "dependencies": {
-    "@sap/approuter": "^16.0.0"
+    "@sap/approuter": "^17.0.0"
   },
   "engines": {
     "node": "^20.0.0"

package/lib/init/template/cf-manifest/files/manifest.yml.hbs

@@ -20,7 +20,9 @@ applications:
   disk_quota: 512M
   env:
     SPRING_PROFILES_ACTIVE: cloud
-  buildpack: java_buildpack
+    JBP_CONFIG_COMPONENTS: "jres: ['com.sap.xs.java.buildpack.jdk.SAPMachineJDK']"
+    JBP_CONFIG_SAP_MACHINE_JDK: '{ version: 21.+ }'
+  buildpack: sap_java_buildpack_jakarta
 {{/isJava}}
   services:
 {{#hasHana}}

package/lib/init/template/cf-manifest/index.js

@@ -3,6 +3,7 @@ const cds = require('../../../cds')
 const { exists } = require('../../../cds').utils
 const { readProject } = require('../../projectReader')
 const { renderAndCopy } = require('../../template')
+const mvn = require('../../mvn')
 const MANIFEST_FILE = 'manifest.yml'
 const SERVICES_MANIFEST_FILE = 'services-manifest.yml'
 
@@ -29,5 +30,6 @@ module.exports = class CfManifestTemplate extends require('../../plugin') {
     async run() {
         const project = readProject()
         await renderAndCopy(join(__dirname, 'files'), cds.root, project)
+        if (project.isJava) await mvn.add('CF')
     }
 }

package/lib/init/template/cloud-logging/files/mta.yaml.hbs

@@ -3,6 +3,17 @@ modules:
   - name: {{appName}}-srv
     type: {{language}}
     path: {{& srvPath}}
+    {{#isJava}}
+    properties:
+      JBP_CONFIG_JAVA_OPTS:
+        from_environment: false
+        java_opts: >
+          -javaagent:META-INF/.sap_java_buildpack/otel_agent/opentelemetry-javaagent.jar
+          -Dotel.javaagent.extensions=META-INF/.sap_java_buildpack/otel_agent_extension/otel-agent-ext-java.jar
+      OTEL_METRICS_EXPORTER: cloud-logging
+      OTEL_TRACES_EXPORTER: cloud-logging
+      OTEL_LOGS_EXPORTER: none
+    {{/isJava}}
     requires:
       - name: {{appName}}-cloud-logging
   - name: {{appName}}-mtx
@@ -21,5 +32,5 @@ resources:
       service: cloud-logging
       service-plan: {{cloudLoggingServicePlan}}
       config:
-      ingest_otlp:
-        enabled: true
+        ingest_otlp:
+          enabled: true

package/lib/init/template/cloud-logging/files/{package.json → package.json.hbs}

@@ -8,7 +8,11 @@
   },
   "cds": {
     "requires": {
-      "telemetry": "to-cloud-logging"
+      "[{{profile}}]": {
+        "telemetry": {
+          "kind": "to-cloud-logging"
+        }
+      }
     }
   }
 }

package/lib/init/template/cloud-logging/index.js

@@ -30,9 +30,10 @@ module.exports = class extends require('../../plugin') {
   }
 
   async run() {
-    const { hasTelemetry } = readProject()
-    if (cds.cli.options['with-telemetry'] || hasTelemetry) {
-      await merge(__dirname, 'files/package.json').into('package.json')
+    const project = readProject(), { hasTelemetry, isNodejs } = project
+    if (isNodejs && (cds.cli.options['with-telemetry'] || hasTelemetry)) {
+      project.profile ??= 'production'
+      await merge(__dirname, 'files/package.json.hbs').into('package.json', { with: project })
       await sort('package.json', 'dependencies')
     }
   }

package/lib/init/template/data/as-csv.js

@@ -39,6 +39,12 @@ module.exports = async (data={}, csn, { headerOnly=false, separator=',' }={}) =>
             }
             record.push(...Object.values(value))
           }
+          else if (element.is_struct) {
+            if (i === 0) {
+              header.push(...Object.keys(value).map(structField => name + '_' + structField))
+            }
+            record.push(...Object.values(value))
+          }
           else {
             if (i === 0)  header.push(name)
             if (Array.isArray(value)) { // `array of` / `many`

package/lib/init/template/data/as-json.js

@@ -121,9 +121,16 @@ function dataForField(element, entity, csn, record, data, parentEntity, depth, r
   else if (element.items?.type) // `array of` / `many` with simple type
     return [ dataForField(element.items, entity, csn, record, data, null, depth+1, referenceData) ]
 
+  if (element.is_struct) {
+    let struct = {}
+    for (const el of element.elements) {
+      struct[el.name] = dataForField(el, entity, csn, record, data, null, depth+1, referenceData)
+    }
+    return struct
+  }
+
   const type = element._type || element.type
   switch (type) {
-    case undefined: return
     case 'cds.Time':
       return '22:59:53'
 

package/lib/init/template/data/index.js

@@ -67,7 +67,7 @@ module.exports = class DataTemplate extends require('../../plugin') {
       : getDefaultTargetFolder(env)
     dest = resolve(cds.root, dest)
 
-    let csn = await cds.load(cds.env.roots) // normal CSN
+    let csn = await cds.load([cds.env.roots, join(`${cds.env.folders.srv}`, `external`) ]) // normal CSN. Default paths and models imported with `cds import`
     // Skip of unused reuse entities like Language, Country, Currency
     csn = cds.minify(csn)
     csn = cds.reflect(csn) // reflected model (adds additional helper functions)

package/lib/init/template/destination/files/mta.yaml.hbs

@@ -31,14 +31,14 @@ resources:
             destinations:
               - Name: {{appName}}-srv-api
                 URL: ~{srv-api/srv-url}
-                Authentication: OAuth2UserTokenExchange
+                Authentication: NoAuthentication
                 Type: HTTP
                 ProxyType: Internet
                 HTML5.ForwardAuthToken: true
                 HTML5.DynamicDestination: true
-              - Authentication: NoAuthentication
-                Name: ui5
-                ProxyType: Internet
-                Type: HTTP
+              - Name: ui5
                 URL: https://ui5.sap.com
+                Authentication: NoAuthentication
+                Type: HTTP
+                ProxyType: Internet
         {{/hasHtml5Repo}}

package/lib/init/template/dynatrace/files/mta.yaml.hbs

@@ -3,8 +3,28 @@ modules:
   - name: {{appName}}-srv
     type: {{language}}
     path: {{& srvPath}}
+    {{#isJava}}
+    properties:
+      JBP_CONFIG_JAVA_OPTS:
+        from_environment: false
+        java_opts: >
+          -javaagent:META-INF/.sap_java_buildpack/otel_agent/opentelemetry-javaagent.jar
+          -Dotel.javaagent.extensions=META-INF/.sap_java_buildpack/otel_agent_extension/otel-agent-ext-java.jar
+          -Dotel.javaagent.extension.sap.cf.binding.dynatrace.metrics.token-name=ingest_apitoken
+      OTEL_METRICS_EXPORTER: dynatrace
+      OTEL_TRACES_EXPORTER: none
+      OTEL_LOGS_EXPORTER: none
+    {{/isJava}}
     requires:
       - name: {{appName}}-dynatrace
+        parameters:
+          config:
+            tokens:
+              - name: ingest_apitoken
+                scopes:
+                  - openTelemetryTrace.ingest
+                  - metrics.ingest
+
   - name: {{appName}}-mtx
     type: nodejs
     path: {{#isNodejs}}gen/{{/isNodejs}}mtx/sidecar
@@ -15,10 +35,6 @@ resources:
     type: org.cloudfoundry.managed-service
     parameters:
       service: dynatrace
-      service-plan: standard
+      service-plan: environment
       config:
-        tokens:
-          - name: ingest_apitoken
-            scopes:
-              - openTelemetryTrace.ingest
-              - metrics.ingest
+        environment_name: {{appName}}

package/lib/init/template/dynatrace/files/package.json.hbs

@@ -2,13 +2,16 @@
   "dependencies": {
     "@cap-js/telemetry": ">=0",
     "@opentelemetry/exporter-metrics-otlp-proto": "^0"{{#hasHelm}},
-    "@opentelemetry/exporter-trace-otlp-proto": "^0",
     "@opentelemetry/host-metrics": "^0"
     {{/hasHelm}}
   },
   "cds": {
     "requires": {
-      "telemetry": "to-dynatrace"
+      "[{{profile}}]": {
+        "telemetry": {
+          "kind": "to-dynatrace"
+        }
+      }
     }
   }
 }

package/lib/init/template/dynatrace/files/values.yaml

@@ -0,0 +1,15 @@
+srv:
+  bindings:
+    dynatrace:
+      serviceInstanceName: dynatrace
+      parameters:
+        tokens:
+          - name: ingest_apitoken
+            scopes:
+              - openTelemetryTrace.ingest
+              - metrics.ingest
+dynatrace:
+  serviceOfferingName: dynatrace
+  servicePlanName: environment
+  parameters:
+    environment_name: DYNATRACE # (Mandatory) maximum of 16 characters and can only comprise of uppercase letters and digits.

package/lib/init/template/dynatrace/index.js

@@ -10,20 +10,21 @@ module.exports = class extends require('../../plugin') {
   }
 
   async canRun() {
-    const { hasMta, hasHelm, hasHelmUnifiedRuntime } = readProject()
-    if ((hasHelmUnifiedRuntime || hasHelm) && !hasMta) throw `'cds add dynatrace' is not available for Kyma yet`
     return true
   }
 
   async run() {
     const project = readProject()
-    await merge(__dirname, 'files/package.json.hbs').into('package.json', { with: project })
-    await sort('package.json', 'dependencies')
+    if (project.isNodejs) {
+      project.profile ??= 'production'
+      await merge(__dirname, 'files/package.json.hbs').into('package.json', { with: project })
+      await sort('package.json', 'dependencies')
+    }
   }
 
   async combine() {
     const project = readProject()
-    const { hasMta, isJava, hasMultitenancy, srvPath } = project
+    const { hasMta, hasHelm, hasHelmUnifiedRuntime, isJava, hasMultitenancy, srvPath } = project
 
     if (hasMta) {
       const dynatrace = {
@@ -51,5 +52,9 @@ module.exports = class extends require('../../plugin') {
         with: project, additions, relationships
       })
     }
+
+    if (hasHelm || hasHelmUnifiedRuntime) {
+      await merge(__dirname, 'files', 'values.yaml').into('chart/values.yaml')
+    }
   }
 }

package/lib/init/template/enterprise-messaging-shared/index.js

@@ -34,7 +34,7 @@ module.exports = class EnterpriseMessagingSharedTemplate extends require('../../
     const project = readProject()
     const { configFile, isNodejs } = project
     if (isNodejs) {
-      project.shortcut = !(await read(configFile)).cds?.requires?.messaging?.kind
+      project.shortcut = typeof (await read(configFile)).cds?.requires?.messaging !== 'object'
       project.cloudevents = cds.cli.options.cloudevents
       await merge(__dirname, 'files/package.json.hbs').into(configFile, { with: project })
     }

package/lib/init/template/file-based-messaging/index.js

@@ -21,7 +21,7 @@ module.exports = class FileBasedMessagingTemplate extends require('../../plugin'
   async run() {
     const project = readProject()
     const { configFile } = project
-    project.shortcut = !(await read(configFile)).cds?.requires?.messaging?.kind
+    project.shortcut = typeof (await read(configFile)).cds?.requires?.messaging !== 'object'
     await merge(__dirname, 'files/package.json.hbs').into(configFile, { with: project })
   }
 }

package/lib/init/template/hana/files/package.json.hbs

@@ -1,7 +1,9 @@
 {
+  {{#isNodejs}}
   "dependencies": {
     "@cap-js/hana": "^1"
   },
+  {{/isNodejs}}
   {{#isNodejs}}
   "cds": {
   {{/isNodejs}}

package/lib/init/template/hana/index.js

@@ -20,7 +20,7 @@ module.exports = class HanaTemplate extends require('../../plugin') {
     async run() {
         const project = readProject()
         const { isJava, configFile, db } = project
-        project.shortcut = !(await read(configFile)).cds?.requires?.db?.kind
+        project.shortcut = typeof (await read(configFile)).cds?.requires?.db !== 'object'
 
         // REVISIT: Let cds build generate those by default
         await merge(__dirname, 'files/src/.hdiconfig').into(join(db.folder, 'src/.hdiconfig'))

package/lib/init/template/handler/index.js

@@ -5,7 +5,22 @@ const mvn = require('../../mvn')
 module.exports = class Handler extends require('../../plugin') {
 
   static help() {
-    return 'add handler stubs' 
+    return 'add handler stubs for actions and functions (Java)'
+  }
+
+  options() {
+    return {
+      'filter': {
+        type: 'string',
+        short: 'f',
+        help: `Filter actions or functions by name prefix. Regular expressions are not supported.`
+      },
+      'out': {
+        type: 'string',
+        short: 'o',
+        help: 'Specify a custom output directory inside the `handlers` directory. The default is `handlers`.'
+      }
+    }
   }
 
   canRun() {

package/lib/init/template/helm/files/values.yaml.hbs

@@ -26,6 +26,6 @@ srv:
       memory: {{#isJava}}1G{{/isJava}}{{^isJava}}500M{{/isJava}}
   health:
     liveness:
-      path: {{#isJava}}/actuator/health{{/isJava}}{{^isJava}}/health{{/isJava}}
+      path: {{#isJava}}/actuator/health/liveness{{/isJava}}{{^isJava}}/health{{/isJava}}
     readiness:
-      path: {{#isJava}}/actuator/health{{/isJava}}{{^isJava}}/health{{/isJava}}
+      path: {{#isJava}}/actuator/health/readiness{{/isJava}}{{^isJava}}/health{{/isJava}}

package/lib/init/template/helm/index.js

@@ -5,6 +5,7 @@ const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { ask4 } = require('../../../util/question')
 const { execSync } = require('child_process')
+const { mvn } = require('../../add')
 
 module.exports = class HelmTemplate extends require('../../plugin') {
 
@@ -90,10 +91,11 @@ module.exports = class HelmTemplate extends require('../../plugin') {
         await merge(__dirname, 'files/Chart.yaml.hbs').into('chart/Chart.yaml', { with: project })
         await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project })
         await this._mergeDependency('web-application', 'srv')
+        if (project.isJava) await mvn.add('k8s')
     }
 
     async combine() {
-        const { hasDestination, hasEnterpriseMessaging, hasEnterpriseMessagingShared, hasHana, hasMultitenancy, hasXsuaa, hasHtml5Repo, hasApprouter, hasKafka, hasAttachments, hasPortal, hasMalwareScanner } = readProject()
+        const { hasDestination, hasEnterpriseMessaging, hasEnterpriseMessagingShared, hasHana, hasMultitenancy, hasXsuaa, hasHtml5Repo, hasApprouter, hasKafka, hasAttachments, hasPortal, hasMalwareScanner, hasDynatrace } = readProject()
 
         if (hasApprouter) {
             await this._mergeDependency('web-application', 'approuter')
@@ -140,6 +142,9 @@ module.exports = class HelmTemplate extends require('../../plugin') {
         if (hasMalwareScanner) {
             await this._mergeDependency('service-instance', 'malware-scanner')
         }
+        if (hasDynatrace) {
+            await this._mergeDependency('service-instance', 'dynatrace')
+        }
     }
 
     async _mergeDependency(name, alias) {

package/lib/init/template/html5-repo/files/app-package.json.hbs

@@ -8,11 +8,13 @@
     "start": "ui5 serve"
   },
   "devDependencies": {
-    "@ui5/cli": "^3",
+    {{#hasWorkzoneStandard}}"@sap/ui5-builder-webide-extension": "^1.1.9",{{/hasWorkzoneStandard}}
+    "@ui5/cli": "^4",
     "ui5-task-zipper": "^3"
   },
   "ui5": {
     "dependencies": [
+      {{#hasWorkzoneStandard}}"@sap/ui5-builder-webide-extension",{{/hasWorkzoneStandard}}
       "ui5-task-zipper"
     ]
   }

package/lib/init/template/html5-repo/files/ui5-deploy.yaml.hbs

@@ -13,6 +13,13 @@ builder:
       - "/test/**"
       - "/localService/**"
   customTasks:
+    {{#hasWorkzoneStandard}}
+    - name: webide-extension-task-updateManifestJson
+      afterTask: replaceVersion
+      configuration:
+        appFolder: webapp
+        destDir: dist
+    {{/hasWorkzoneStandard}}
     - name: ui5-task-zipper
       afterTask: generateVersionInfo
       configuration:

package/lib/init/template/html5-repo/index.js

@@ -2,6 +2,7 @@ const { join } = require('path')
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { srv4, html5RepoHost, html5Runtime, appDeployer, approuter, mtxSidecar4 } = require('../../registries/mta')
+const { odataApi } = require('../../registries/xs-app')
 
 module.exports = class Html5RepoTemplate extends require('../../plugin') {
 
@@ -52,7 +53,8 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
 
         await Promise.all(apps.map(async ({app}) => {
             project.app = app
-            await merge(__dirname, 'files/xs-app.json.hbs').into(join(appPath, app, 'xs-app.json'), { project })
+            const additions = [odataApi]
+            await merge(__dirname, 'files/xs-app.json.hbs').into(join(appPath, app, 'xs-app.json'), { with: project, additions })
         }))
 
         if (hasMultitenancy) {

package/lib/init/template/local-messaging/index.js

@@ -22,7 +22,7 @@ module.exports = class LocalMessagingTemplate extends require('../../plugin') {
   async run() {
     const project = readProject()
     const { configFile } = project
-    project.shortcut = !(await read(configFile)).cds?.requires?.messaging?.kind
+    project.shortcut = typeof (await read(configFile)).cds?.requires?.messaging !== 'object'
     await merge(__dirname, 'files/package.json.hbs').into(configFile, { with: project })
   }
 }

package/lib/init/template/mta/files/mta.yaml.hbs

@@ -29,7 +29,7 @@ modules:
     parameters:
       buildpack: sap_java_buildpack_jakarta
       readiness-health-check-type: http
-      readiness-health-check-http-endpoint: /actuator/health
+      readiness-health-check-http-endpoint: /actuator/health/readiness
     properties:
       SPRING_PROFILES_ACTIVE: cloud,sandbox
       JBP_CONFIG_COMPONENTS: "jres: ['com.sap.xs.java.buildpack.jre.SAPMachineJRE']"

package/lib/init/template/mta/index.js

@@ -5,6 +5,7 @@ const { bold } = require('../../../util/term')
 const { copyRenderedYAML } = require('../../../util/fs')
 const { readProject } = require('../../projectReader')
 const { merge, sort } = require('../../merge')
+const { mvn } = require('../../add')
 
 module.exports = class MtaTemplate extends require('../../plugin') {
 
@@ -23,6 +24,7 @@ module.exports = class MtaTemplate extends require('../../plugin') {
         }
         await merge(__dirname, 'files/package.json').into('package.json')
         await sort('package.json', 'devDependencies')
+        if (project.isJava) await mvn.add('cf')
     }
 
     async finalize() {

package/lib/init/template/nodejs/files/.vscode/extensions.json

@@ -1,8 +1,4 @@
 {
-	// See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
-	// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
-
-	// List of extensions which should be recommended for users of this workspace.
 	"recommendations": [
 		"SAPSE.vscode-cds",
 		"dbaeumer.vscode-eslint",
@@ -11,7 +7,6 @@
 		"qwtel.sqlite-viewer",
 		"humao.rest-client"
 	],
-	// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
 	"unwantedRecommendations": [
 
 	]

package/lib/init/template/nodejs/files/.vscode/settings.json

@@ -8,4 +8,4 @@
     // "tab",
     // "tsv"
   ]
-}
+}

package/lib/init/template/nodejs/files/.vscode/tasks.json

@@ -1,6 +1,4 @@
 {
-  // See https://go.microsoft.com/fwlink/?LinkId=733558
-  // for the documentation about the tasks.json format
   "version": "2.0.0",
   "tasks": [
     {