@sap/cds-dk 9.5.0 → 9.6.0

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

@@ -11,6 +11,7 @@ const {
     approuterMTXRoute,
     approuterMTXRouteJava // xs-app.json config
 } = require('../../registries/mta')
+const KymaTemplate = require('../kyma')
 
 module.exports = class ApprouterTemplate extends require('../../plugin') {
 
@@ -35,9 +36,8 @@ module.exports = class ApprouterTemplate extends require('../../plugin') {
         const {
             isNodejs, isJava,
             addIas, addXsuaa, hasXsuaa, hasIas, addMultitenancy, hasMTXRoute, hasMTXRouteJava,
-            addMta, addHelm, addHelmUnifiedRuntime,
-            hasMta, hasHelm, hasHelmUnifiedRuntime, hasMultitenancy,
-            addContainerize, srvPath, approuterPath
+            addMta, hasMta, hasMultitenancy,
+            addContainerize, addKyma, hasKyma, srvPath, approuterPath
         } = project
 
 
@@ -68,11 +68,15 @@ module.exports = class ApprouterTemplate extends require('../../plugin') {
             })
         }
 
-        if (addHelm || addHelmUnifiedRuntime || addMultitenancy && (hasHelm || hasHelmUnifiedRuntime)) {
+        if(addKyma) {
+          await KymaTemplate.mergeDependency('web-application', 'approuter')
+        }
+
+        if (addKyma || (addMultitenancy && hasKyma)) {
             await merge(__dirname, 'files', 'values.yaml.hbs').into('chart/values.yaml', { with: project })
         }
 
-        if (addContainerize) {
+        if (addContainerize || addKyma) {
             const additions = [{
                 in: 'modules',
                 where: { name: `${project.appName}-approuter` }

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

@@ -2,6 +2,7 @@ const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { srv4, attachments } = require('../../registries/mta')
 const { mvn } = require('../../add')
+const KymaTemplate = require('../kyma')
 
 module.exports = class AttachmentsTemplate extends require('../../plugin') {
 
@@ -26,7 +27,7 @@ module.exports = class AttachmentsTemplate extends require('../../plugin') {
 
     async combine() {
         const project = readProject()
-        const { addMta, addHelm, addHelmUnifiedRuntime, srvPath } = project
+        const { addMta, addKyma, srvPath } = project
 
         if (addMta) {
             const srv = srv4(srvPath)
@@ -40,8 +41,9 @@ module.exports = class AttachmentsTemplate extends require('../../plugin') {
             })
         }
 
-        if (addHelm || addHelmUnifiedRuntime) {
+        if (addKyma) {
             await merge(__dirname, 'files', 'values.yaml').into('chart/values.yaml')
+            await KymaTemplate.mergeDependency('service-instance', 'attachments')
         }
     }
 }

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

@@ -4,6 +4,7 @@ const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { srv4, auditlog } = require('../../registries/mta')
 const mvn = require('../../mvn')
+const KymaTemplate = require('../kyma')
 
 module.exports = class AuditLoggingTemplate extends require('../../plugin') {
 
@@ -33,7 +34,7 @@ module.exports = class AuditLoggingTemplate extends require('../../plugin') {
 
   async combine() {
     const project = readProject()
-    const { addMta, addHelm, addHelmUnifiedRuntime, addMultitenancy, srvPath } = project
+    const { addMta, addKyma, addMultitenancy, srvPath } = project
     const { plan = 'premium' } = cds.cli.options
     project.servicePlan = plan
 
@@ -53,7 +54,7 @@ module.exports = class AuditLoggingTemplate extends require('../../plugin') {
         ]
       })
     }
-    if (addHelm || addHelmUnifiedRuntime) {
+    if (addKyma) {
       await merge({
         srv: { bindings: { auditlog: { serviceInstanceName: 'auditlog' }}},
         auditlog: {
@@ -61,6 +62,7 @@ module.exports = class AuditLoggingTemplate extends require('../../plugin') {
           servicePlanName: plan
         }
       }).into('chart/values.yaml')
+      await KymaTemplate.mergeDependency('service-instance', 'auditlog')
     }
   }
 }

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

@@ -4,6 +4,7 @@ const { merge, sort } = require('../../merge')
 const mvn = require('../../mvn')
 const { readProject } = require('../../projectReader')
 const { srv4, mtxSidecar4, approuter } = require('../../registries/mta')
+const KymaTemplate = require('../kyma')
 
 module.exports = class extends require('../../plugin') {
 
@@ -39,7 +40,7 @@ module.exports = class extends require('../../plugin') {
 
   async combine() {
     const project = readProject()
-    const { hasMta, addMta, addHelm, addHelmUnifiedRuntime, addApprouter, isJava, addMultitenancy, srvPath } = project
+    const { hasMta, addMta, addKyma, addApprouter, isJava, addMultitenancy, srvPath } = project
 
     if (addMta || (addMultitenancy || addApprouter) && hasMta) {
       const cloudLogging = {
@@ -76,8 +77,9 @@ module.exports = class extends require('../../plugin') {
         with: project, additions, relationships
       })
     }
-    if (addHelm || addHelmUnifiedRuntime) {
+    if (addKyma) {
       await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml')
+      await KymaTemplate.mergeDependency('service-instance', 'cloud-logging')
     }
   }
 }

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

@@ -20,7 +20,7 @@ module.exports = class ConnectivityTemplate extends require('../../plugin') {
 
     async combine() {
         const project = readProject()
-        const { srvPath, addHelm, addHelmUnifiedRuntime, addMta } = project
+        const { srvPath, addKyma, addMta } = project
 
         if (addMta) {
             const srv = srv4(srvPath)
@@ -32,7 +32,7 @@ module.exports = class ConnectivityTemplate extends require('../../plugin') {
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { project, additions, relationships })
         }
 
-        if (addHelm || addHelmUnifiedRuntime) {
+        if (addKyma) {
             await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', {
                 project,
                 additions: [{

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

@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "@cap-js/console": "^1.0.0"
+  }
+}

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

@@ -0,0 +1,25 @@
+const { join } = require("path");
+const mvn = require("../../mvn");
+
+const { readProject } = require("../../projectReader");
+const { merge } = require("../../merge");
+
+module.exports = class ConsoleTemplate extends require("../../plugin") {
+  static help() {
+    return "installs the CAP console plugin";
+  }
+
+  async run() {
+    const { isJava } = readProject();
+
+    if (isJava) {
+      await mvn.add("CAP_JAVA_PLUGIN", {
+        groupId: "com.sap.cds",
+        artifactId: "cds-feature-console",
+        version: "1.0.0"
+      });
+    } else {
+      await merge(join(__dirname, "files", "package.json")).into("package.json");
+    }
+  }
+};

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

@@ -2,19 +2,21 @@ const cds = require('../../../cds')
 const { exists, rimraf } = cds.utils
 const { readProject } = require('../../projectReader');
 const { merge } = require('../../merge')
+const term = require('../../../../lib/util/term')
 
+// cds10: Remove this and all usages of addContainerize/hasContainerize
 module.exports = class ContainerizeTemplate extends require('../../plugin') {
 
     static hasInProduction () {
         return exists('containerize.yaml')
     }
-
     async run() {
+        console.warn(term.warn(`The "cds add containerize" command is deprecated and will be removed in the next major release. Please use the "cds add kyma" command instead.`))
         if (cds.cli.options.force) {
             await rimraf('containerize.yaml')
         }
 
         const project = readProject()
-        await merge(__dirname, '/files/containerize.yaml.hbs').into('containerize.yaml', { with: project })
+        await merge(__dirname, '../kyma/files/containerize.yaml.hbs').into('containerize.yaml', { with: project })
     }
 }

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

@@ -1,6 +1,7 @@
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { srv4, approuter, destination, mtxSidecar4 } = require('../../registries/mta')
+const KymaTemplate = require('../kyma')
 
 module.exports = class DestinationTemplate extends require('../../plugin') {
 
@@ -24,7 +25,7 @@ module.exports = class DestinationTemplate extends require('../../plugin') {
 
     async combine() {
         const project = readProject()
-        const { addHelm, addApprouter, addMultitenancy, addHelmUnifiedRuntime, addMta, hasMta, srvPath, isJava } = project
+        const { addApprouter, addMultitenancy, addKyma, addMta, hasMta, srvPath, isJava } = project
 
         if (addMta || (addApprouter || addMultitenancy) && hasMta) {
             const srv = srv4(srvPath)
@@ -48,8 +49,9 @@ module.exports = class DestinationTemplate extends require('../../plugin') {
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { with: project, additions, relationships })
         }
 
-        if (addHelm || addHelmUnifiedRuntime) {
+        if (addKyma) {
             await merge(__dirname, 'files/values.yaml').into('chart/values.yaml')
+            await KymaTemplate.mergeDependency('service-instance', 'destination')
         }
     }
 }

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

@@ -1,9 +1,9 @@
 {
   "dependencies": {
     "@cap-js/telemetry": ">=0",
-    "@opentelemetry/exporter-metrics-otlp-proto": "<0.200"{{#hasHelm}},
+    "@opentelemetry/exporter-metrics-otlp-proto": "<0.200"{{#hasKyma}},
     "@opentelemetry/host-metrics": "<0.200"
-    {{/hasHelm}}
+    {{/hasKyma}}
   },
   "cds": {
     "requires": {

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

@@ -2,6 +2,7 @@ const { merge, sort } = require('../../merge')
 
 const { readProject } = require('../../projectReader')
 const { srv4, mtxSidecar4 } = require('../../registries/mta')
+const KymaTemplate = require('../kyma')
 
 module.exports = class extends require('../../plugin') {
 
@@ -24,7 +25,7 @@ module.exports = class extends require('../../plugin') {
 
   async combine() {
     const project = readProject()
-    const { appName, addMta, addHelm, addHelmUnifiedRuntime, isJava, addMultitenancy, srvPath } = project
+    const { appName, addMta, addKyma, isJava, addMultitenancy, srvPath } = project
 
     if (addMta || addMultitenancy) {
       const dynatrace = {
@@ -55,8 +56,9 @@ module.exports = class extends require('../../plugin') {
       })
     }
 
-    if (addHelm || addHelmUnifiedRuntime) {
+    if (addKyma) {
       await merge(__dirname, 'files', 'values.yaml').into('chart/values.yaml')
+      await KymaTemplate.mergeDependency('service-instance', 'dynatrace')
     }
   }
 }

package/lib/init/template/enterprise-messaging/files/mta.yaml.hbs

@@ -13,7 +13,9 @@ resources:
       service: enterprise-messaging
       service-plan: default
       path: ./event-mesh.json
-  - type: org.cloudfoundry.managed-service
+
+  - name: {{appName}}-auth
+    type: org.cloudfoundry.managed-service
     parameters:
       service: xsuaa
       service-plan: application

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

@@ -3,6 +3,7 @@ const { read, exists, yaml: YAML } = cds.utils
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { srv4, enterpriseMessaging, xsuaa } = require('../../registries/mta')
+const KymaTemplate = require('../kyma')
 
 module.exports = class EnterpriseMessagingTemplate extends require('../../plugin') {
 
@@ -41,7 +42,7 @@ module.exports = class EnterpriseMessagingTemplate extends require('../../plugin
 
   async combine() {
     const project = readProject()
-    const { addXsuaa, addHelm, addHelmUnifiedRuntime, addMta, srvPath, appName } = project
+    const { addXsuaa, addKyma, addMta, srvPath, appName } = project
 
     if (addMta) {
       const srv = srv4(srvPath)
@@ -72,8 +73,9 @@ module.exports = class EnterpriseMessagingTemplate extends require('../../plugin
       })
     }
 
-    if (addHelm || addHelmUnifiedRuntime) {
+    if (addKyma) {
       await merge(__dirname, 'files', 'values.yaml').into('chart/values.yaml')
+      await KymaTemplate.mergeDependency('service-instance', 'event-mesh')
     }
 
     if (!exists('event-mesh.json')) await merge(__dirname, 'files/event-mesh.json.hbs').into('event-mesh.json', { project })

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

@@ -3,6 +3,7 @@ const { read, exists } = cds.utils
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { srv4, enterpriseMessaging } = require('../../registries/mta')
+const KymaTemplate = require('../kyma')
 
 module.exports = class EnterpriseMessagingSharedTemplate extends require('../../plugin') {
 
@@ -42,7 +43,7 @@ module.exports = class EnterpriseMessagingSharedTemplate extends require('../../
 
   async combine() {
     const project = readProject()
-    const { addMta, addHelm, addHelmUnifiedRuntime, srvPath } = project
+    const { addMta, addKyma, srvPath } = project
 
     if (addMta) {
       const srv = srv4(srvPath)
@@ -56,8 +57,9 @@ module.exports = class EnterpriseMessagingSharedTemplate extends require('../../
       })
     }
 
-    if (addHelm || addHelmUnifiedRuntime) {
+    if (addKyma) {
       await merge(__dirname, 'files/values.yaml').into('chart/values.yaml')
+      await KymaTemplate.mergeDependency('service-instance', 'event-mesh')
     }
 
     if (!exists('event-mesh.json')) await merge(__dirname, 'files/event-mesh.json.hbs').into('event-mesh.json', { project })

package/lib/init/template/github-actions/files/workflows/release.yaml.hbs

@@ -20,11 +20,11 @@ jobs:
     secrets: inherit
     with:
       environment: Production
-{{/hasMta}}{{^hasMta}}{{#hasHelm}}
+{{/hasMta}}{{^hasMta}}{{#hasKyma}}
   deploy-kyma:
     needs: [tests]
     uses: {{& githubSlug}}/.github/workflows/kyma.yaml@main
     secrets: inherit
     with:
       environment: Production
-{{/hasHelm}}{{/hasMta}}
+{{/hasKyma}}{{/hasMta}}

package/lib/init/template/github-actions/index.js

@@ -24,7 +24,7 @@ module.exports = class GitHubActionTemplate extends require('../../plugin') {
   }
 
   async run() {
-    const { hasMta, hasHelm, isJava } = readProject()
+    const { hasMta, hasKyma, isJava } = readProject()
     const test = `.github/workflows/test.yaml`
     const { force, sap } = cds.cli.options
     if (!exists(test) || force) {
@@ -43,7 +43,7 @@ module.exports = class GitHubActionTemplate extends require('../../plugin') {
         githubSlug = '<org/repo>'
         // console.log(`\ncould not determine GitHub URL for the project – replace '<org/repo>' in ${release}`, DEBUG ? error : '')
       }
-      await renderAndCopy(path.join(__dirname, 'files/workflows/release.yaml.hbs'), release, { isJava, sap: cds.cli.options.sap, githubSlug, hasMta, hasHelm })
+      await renderAndCopy(path.join(__dirname, 'files/workflows/release.yaml.hbs'), release, { isJava, sap: cds.cli.options.sap, githubSlug, hasMta, hasKyma })
     } else {
       console.log('> skipping ' + release)
     }
@@ -51,7 +51,7 @@ module.exports = class GitHubActionTemplate extends require('../../plugin') {
 
   async combine() {
     const project = readProject()
-    const { addMta, addHelm } = project, { force } = cds.cli.options
+    const { addMta, addKyma } = project, { force } = cds.cli.options
     project.sap = cds.cli.options.sap
     if (addMta) {
       const cf = '.github/workflows/cf.yaml'
@@ -59,7 +59,7 @@ module.exports = class GitHubActionTemplate extends require('../../plugin') {
         await renderAndCopy(path.join(__dirname, 'files/workflows/cf.yaml.hbs'), cf, project)
       }
     }
-    if (addHelm) {
+    if (addKyma) {
       const kyma = '.github/workflows/kyma.yaml'
       if (force || !exists(kyma)) {
         await renderAndCopy(path.join(__dirname, 'files/workflows/kyma.yaml.hbs'), kyma, project)

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

@@ -43,7 +43,7 @@ module.exports = class HanaTemplate extends require('../../plugin') {
 
     async combine() {
         const project = readProject()
-        const { addMta, hasMta, addHelm, addHelmUnifiedRuntime, addMultitenancy, addContainerize, isJava, hasHelm, hasHelmUnifiedRuntime, hasMultitenancy, srvPath } = project
+        const { addMta, hasMta, addMultitenancy, addContainerize, addKyma, isJava, hasKyma, hasMultitenancy, srvPath } = project
 
         if (addMta || addMultitenancy && hasMta) {
             const srv = srv4(srvPath)
@@ -85,11 +85,11 @@ module.exports = class HanaTemplate extends require('../../plugin') {
             })
         }
 
-        if (!hasMultitenancy && (addHelm || addHelmUnifiedRuntime)) {
+        if (!hasMultitenancy && addKyma) {
             await merge(__dirname, 'files', 'values.yaml.hbs').into('chart/values.yaml', { with: project })
         }
 
-        if (addMultitenancy && (hasHelm || hasHelmUnifiedRuntime)) {
+        if (addMultitenancy && hasKyma) {
             await merge('chart/values.yaml')
                 .remove(['hana-deployer', 'srv.bindings.db', 'hana'])
 
@@ -100,7 +100,7 @@ module.exports = class HanaTemplate extends require('../../plugin') {
                 ])
         }
 
-        if (addContainerize && !hasMultitenancy) {
+        if ((addContainerize || addKyma) && !hasMultitenancy) {
             const additions = [{
                 in: 'modules',
                 where: { name: `${project.appName}-hana-deployer` }

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

@@ -6,7 +6,9 @@ const { merge } = require('../../merge')
 const { ask4 } = require('../../../util/question')
 const { execSync } = require('child_process')
 const { mvn } = require('../../add')
+const term = require('../../../../lib/util/term')
 
+// cds10: Remove this plugin and hasHelm doc in projectReader
 module.exports = class HelmTemplate extends require('../../plugin') {
 
     options() {
@@ -38,6 +40,7 @@ module.exports = class HelmTemplate extends require('../../plugin') {
     }
 
     async run() {
+        console.warn(term.warn(`The "cds add helm" command is deprecated and will be removed in the next major release. Please use the "cds add kyma" command instead.`))
         const project = readProject()
         let imagePullSecret, registry, domain, tag
         if (!HelmTemplate.hasInProduction() && !project.isBas /* don't run this for the BAS Yeoman generator */) {
@@ -61,9 +64,9 @@ module.exports = class HelmTemplate extends require('../../plugin') {
         project.domain = domain ?? '<cluster-domain>'
         project.imagePullSecret = imagePullSecret ?? 'docker-registry'
         project.tag = tag ?? 'latest'
-        await copy(join(__dirname, 'files', 'values.schema.json')).to('chart/values.schema.json')
-        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 copy(join(__dirname, '../kyma/files/values.schema.json')).to('chart/values.schema.json')
+        await merge(__dirname, '../kyma/files/Chart.yaml.hbs').into('chart/Chart.yaml', { with: project })
+        await merge(__dirname, '../kyma/files/values.yaml.hbs').into('chart/values.yaml', { with: project })
         await this._mergeDependency('web-application', 'srv')
         if (project.isJava) await mvn.add('k8s')
     }

package/lib/init/template/helm-unified-runtime/index.js

@@ -6,6 +6,7 @@ const { join } = require('path')
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 
+// cds10: Remove this plugin (hasHelmUnifiedRuntime is already replaced in projectReader)
 module.exports = class HelmUnifiedRuntimeTemplate extends require('../helm') {
 
   options() {

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

@@ -17,6 +17,7 @@ builder:
       afterTask: generateVersionInfo
       configuration:
         archiveName: {{app}}
+        relativePaths: true
         additionalFiles:
           - xs-app.json
     {{#isTypescript}}

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

@@ -9,8 +9,8 @@ const { renderAndCopy } = require('../../template')
 module.exports = class Html5RepoTemplate extends require('../../plugin') {
 
     requires() {
-        const { hasHelm, hasHelmUnifiedRuntime } = readProject()
-        if (hasHelm || hasHelmUnifiedRuntime) return ['destination']
+        const { hasKyma } = readProject()
+        if (hasKyma) return ['destination']
     }
 
     static help() {
@@ -37,8 +37,8 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
         const project = readProject()
         const {
             isJava, srvPath, appPath, apps,
-            hasApprouter, addApprouter, addContainerize,  addMultitenancy, addWorkzoneStandard,
-            addSample, hasMta, addMta, hasXsuaa, hasMultitenancy, addHelm, addHelmUnifiedRuntime, hasUI5
+            hasApprouter, addApprouter, addContainerize, addKyma, addHelm, addHelmUnifiedRuntime,  addMultitenancy, addWorkzoneStandard, addXsuaa,
+            addSample, hasMta, addMta, hasXsuaa, hasMultitenancy, hasUI5
         } = project
 
         await Promise.all(apps.map(async ({ app }) => {
@@ -65,7 +65,7 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
             await merge({ cds: { requires: { 'html5-repo': true } } }).into('mtx/sidecar/package.json')
         }
 
-        if (addMta || (addApprouter || addWorkzoneStandard || addMultitenancy || addSample) && hasMta) {
+        if (addMta || (addXsuaa || addApprouter || addWorkzoneStandard || addMultitenancy || addSample) && hasMta) {
             const srv = srv4(srvPath)
             project.apps = apps
             const relationships = [{
@@ -109,7 +109,9 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
             })
         }
 
-        if (addContainerize) {
+        // cds10
+        // needed because of adding kyma to cli options in case of helm
+        if (addContainerize || (addKyma && !addHelm && !addHelmUnifiedRuntime)) {
             const additions = [{
                 in: 'modules',
                 where: { name: `${project.appName}-html5-deployer` }
@@ -117,7 +119,7 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
             await merge(__dirname, '/files/containerize.yaml.hbs').into('containerize.yaml', { with: project, additions })
         }
 
-        if (addHelm || addHelmUnifiedRuntime) {
+        if (addKyma) {
             await renderAndCopy(join(__dirname, 'files/html5-deployer.package.json.hbs'), 'app/html5-deployer/package.json', project)
             await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project })
         }

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

@@ -24,7 +24,7 @@ module.exports = class IasTemplate extends require('../../plugin') {
 
     async combine() {
         const project = readProject()
-        const { isJava, addMta, hasMta, addCfManifest, addHelm, addHelmUnifiedRuntime, addMultitenancy, hasApprouter, hasMultitenancy, srvPath } = project
+        const { isJava, addMta, hasMta, addCfManifest, addKyma, addMultitenancy, hasApprouter, hasMultitenancy, srvPath } = project
 
         if (addMultitenancy) {
             const conf = exists('mtx/sidecar/package.json') ? await read('mtx/sidecar/package.json') : {}
@@ -63,7 +63,7 @@ module.exports = class IasTemplate extends require('../../plugin') {
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { project, additions, overwrites })
         }
 
-        if (addHelm || addHelmUnifiedRuntime) {
+        if (addKyma) {
             const identity = { in: 'dependencies', where: { 'alias': 'identity' } }
             await merge(__dirname, 'files/Chart.yaml.hbs').into('chart/Chart.yaml', { project, additions: [identity] })
             await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { project })

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

@@ -3,6 +3,7 @@ const cds = require('../../../cds')
 const { exists, copy, rimraf, fs:{promises:{ mkdtemp }}, path } = cds.utils, { join } = path
 const cmd = require('../../../util/command')
 const mvn = require('../../mvn')
+const { merge } = require('../../merge')
 const { bold, info, link } = require('../../../util/term')
 const { URLS, OPTIONS: { NODEJS, JAVA }, COMMAND_ADD } = require('../../constants')
 const { command, options } = cds.cli
@@ -33,9 +34,22 @@ module.exports = class JavaTemplate extends require('../../plugin') {
         console.log(`using Maven archetype version ${archetypeVersion}`)
 
         const temp = await mkdtemp(join(os.tmpdir(), `${path.basename(cds.root)}_`))
+        // preserve existing package.json (if any)
+        let preservedPackageJsonPath
+        if (exists('package.json')) {
+            preservedPackageJsonPath = join(temp, 'package.json')
+            await copy('package.json').to(preservedPackageJsonPath)
+        }
         try {
             await cmd.spawnCommand('mvn', params, { cwd: temp })
             await copy(join(temp, artifactId)).to(cds.root)
+            if (preservedPackageJsonPath) {
+                // merge template package.json into preserved one
+                // (not the other way around)
+                // to give preserved values precedence
+                await merge('package.json').into(preservedPackageJsonPath)
+                await copy(preservedPackageJsonPath).to('package.json')
+            }
         } catch (err) {
             if (err.code === 'ENOENT' && err.path === 'mvn') {
                 throw `Maven executable 'mvn' not found. Follow ${info(URLS.MAVEN_INSTALL_HELP)} and install Maven on your machine.`

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

@@ -4,6 +4,7 @@ const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { srv4, kafkaMessaging } = require('../../registries/mta')
 const mvn = require('../../mvn')
+const KymaTemplate = require('../kyma')
 
 module.exports = class KafkaTemplate extends require('../../plugin') {
 
@@ -28,7 +29,7 @@ module.exports = class KafkaTemplate extends require('../../plugin') {
 
   async combine() {
     const project = readProject()
-    const { addMta, srvPath, addHelm, addHelmUnifiedRuntime } = project
+    const { addMta, srvPath, addKyma } = project
 
     if (addMta) {
       const srv = srv4(srvPath)
@@ -42,8 +43,9 @@ module.exports = class KafkaTemplate extends require('../../plugin') {
       })
     }
 
-    if (addHelm || addHelmUnifiedRuntime) {
+    if (addKyma) {
       await merge(__dirname, 'files/values.yaml').into('chart/values.yaml')
+      await KymaTemplate.mergeDependency("service-instance", "kafka")
     }
   }
 }