@sap/cds-dk 6.7.2 → 6.8.0

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

@@ -3,13 +3,13 @@ const cds = require('../../../cds')
 const { exists } = cds.utils
 const { readProject } = require('../../util/projectReader')
 const { mergeJSON, mergeYAML, sortDependencies } = require('../../util/merge')
-const { copyAndTrack, parseMd5File, writeMd5File } = require('../../util/md5Tracking')
-const { copyRenderedJSON } = require('../../util/fsUtil')
+const { copyAndTrack, parseMd5File, writeMd5File } = require('../../util/md5')
+const { copyRenderedJSON } = require('../../../util/fs')
 const {
-  srvNode, srvJava, // Server
+  srvNode4, srvJava4, // Server
   mtxSidecar4, // Additional Modules
   saasRegistry, serviceManager, xsuaa, // BTP Services
-  srvAPI, providedMtxAPISidecar4, requiredMtxSidecarAPI // APIs
+  srvApi4, providedMtxApiSidecar4, requiredMtxSidecarApi4 // APIs
 } = require('../_merging/registry-mta')
 
 module.exports = class MultitenancyTemplate extends require('../templateBase') {
@@ -23,25 +23,25 @@ module.exports = class MultitenancyTemplate extends require('../templateBase') {
 
   async run() {
     const projectDescriptor = await readProject(this.options)
-    const { isNodejs } = projectDescriptor.cap
-    await mergeJSON('package.json', join(__dirname, 'files', `package.json.hbs`), projectDescriptor)
+    const { isNodejs, configFile } = projectDescriptor.cap
+    await mergeJSON(configFile, join(__dirname, 'files', `package.json.hbs`), projectDescriptor)
     if (isNodejs) await sortDependencies('package.json')
     await copyRenderedJSON(join(__dirname, 'files', 'package.sidecar.json.hbs'), join('mtx', 'sidecar', 'package.json'), projectDescriptor)
     await this.runDependentMerging()
   }
 
   async runDependentMerging(context = {}) {
-    const projectDescriptor = await readProject()
+    const projectDescriptor = await readProject(this.options)
     const { isNodejs, isJava, hasMta, hasHelm, hasApprouter, hasXsuaa, hasHana, srvPath } = projectDescriptor.cap
 
     if (hasMta) {
-      const srv = (isNodejs ? srvNode : srvJava)(srvPath)
+      const srv = (isNodejs ? srvNode4 : srvJava4)(srvPath)
       const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
       const modules = [srv, mtxSidecar]
       const services = [saasRegistry]
       if (hasXsuaa) services.push(xsuaa)
-      const apis = [srvAPI(srv), providedMtxAPISidecar4(mtxSidecar)]
-      if (isJava) apis.push(requiredMtxSidecarAPI(srv))
+      const apis = [srvApi4(srv), providedMtxApiSidecar4(mtxSidecar)]
+      if (isJava) apis.push(requiredMtxSidecarApi4(srv))
       const additions = [...modules, ...services, ...apis]
 
       const overwrites = hasXsuaa ? [{ item: [xsuaa, 'parameters.config.tenant-mode'], withValue: 'shared' }] : []
@@ -83,18 +83,21 @@ module.exports = class MultitenancyTemplate extends require('../templateBase') {
         projectDescriptor
       )
 
+      const envFromObject = {
+        envFrom: [
+          {
+            configMapRef: {
+              name: "{{ .Release.Name }}-mtxs-configmap"
+            }
+          }
+        ]
+      }
+
       await mergeYAML(
         join('chart', 'values.yaml'),
         {
-          srv: {
-            envFrom: [
-              {
-                configMapRef: {
-                  name: "{{ .Release.Name }}-mtxs-configmap"
-                }
-              }
-            ]
-          },
+          ...(isNodejs) && { sidecar: envFromObject },
+          ...(isJava) && { srv: envFromObject },
           "saas-registry": {
             parametersFrom: [
               {

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

@@ -5,11 +5,19 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "command": "cds serve --with-mocks --in-memory?",
       "name": "cds serve",
       "request": "launch",
-      "type": "node-terminal",
-      "skipFiles": [ "<node_internals>/**" ]
+      "type": "node",
+      "cwd": "${workspaceFolder}",
+      "runtimeExecutable": "cds",
+      "args": [
+        "serve",
+        "--with-mocks",
+        "--in-memory?"
+      ],
+      "skipFiles": [
+        "<node_internals>/**"
+      ]
     }
   ]
 }

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

@@ -2,7 +2,7 @@ const { join, relative } = require('path');
 const cds = require('../../../cds')
 const { mkdirp } = cds.utils
 const { COMMAND_ADD, OPTION_JAVA, OPTION_NODEJS, URLS } = require('../../constants')
-const { copyFiles } = require('../../util/templateUtil')
+const { copyFiles } = require('../../util/template')
 const LOG = console
 
 module.exports = class NodejsTemplate extends require('../templateBase') {

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

@@ -1,7 +1,7 @@
 const { join } = require('path');
 const cds = require('../../../cds')
 const { exists } = cds.utils
-const { copyFiles } = require('../../util/templateUtil')
+const { copyFiles } = require('../../util/template')
 const { URLS } = require('../../constants')
 const LOG = console
 

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

@@ -0,0 +1,14 @@
+---
+modules:
+ - name: {{cap.appName}}-srv
+   type: {{cap.language}}
+   path: {{& cap.srvPath}}
+   requires:
+    - name: {{cap.appName}}-redis
+
+resources:
+  - name: {{cap.appName}}-redis
+    type: org.cloudfoundry.managed-service
+    parameters:
+      service: redis-cache
+      service-plan: default

package/lib/init/template/redis-messaging/files/package.json.hbs

@@ -0,0 +1,22 @@
+{
+  {{#cap.isNodejs}}
+  "dependencies": {
+    "redis": "^4"
+  },
+  "cds": {
+  {{/cap.isNodejs}}
+    "requires": {
+      {{#cap.for}}
+      "[{{cap.for}}]": {
+      {{/cap.for}}
+        "messaging": {
+          "kind": "redis-messaging"
+        }
+      {{#cap.for}}
+      }
+      {{/cap.for}}
+    }
+  {{#cap.isNodejs}}
+  }
+  {{/cap.isNodejs}}
+}

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

@@ -0,0 +1,50 @@
+const { join } = require('path')
+const cds = require('../../../cds')
+const { read } = cds.utils
+const { readProject } = require('../../util/projectReader')
+const { mergeJSON, mergeYAML } = require('../../util/merge')
+const { srvNode4, srvJava4, redis } = require('../_merging/registry-mta')
+
+module.exports = class RedisMessagingTemplate extends require('../templateBase') {
+
+  async canRun() {
+    const projectDescriptor = await readProject(this.options)
+    const { hasMta, hasHelm, isJava } = projectDescriptor.cap
+    if (isJava)             throw `'cds add redis-messaging' is not available for Java yet`
+    if (hasHelm && !hasMta) throw `'cds add redis-messaging' is not available for Kyma yet`
+    return true
+  }
+
+  static hasFacet(env) {
+    return env.requires?.messaging?.kind === 'redis-messaging'
+  }
+
+  async run() {
+    const projectDescriptor = await readProject(this.options)
+    const { configFile } = projectDescriptor.cap
+    projectDescriptor.cap.shortcut = !(await read(configFile)).cds?.requires?.messaging?.kind
+    await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), projectDescriptor)
+    await this.runDependentMerging()
+  }
+
+  async runDependentMerging() {
+    const projectDescriptor = await readProject(this.options)
+    const { hasMta, isNodejs, srvPath } = projectDescriptor.cap
+
+    if (hasMta) {
+      const srv = (isNodejs ? srvNode4 : srvJava4)(srvPath)
+      await mergeYAML(
+          'mta.yaml',
+          join(__dirname, 'files', 'mta.yaml.hbs'),
+          projectDescriptor,
+          {
+              additions: [srv, redis],
+              relationships: [{
+                  insert: [redis, 'name'],
+                  into: [srv, 'requires', 'name']
+              }]
+          }
+      )
+    }
+  }
+}

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

@@ -1,8 +1,8 @@
 const { join } = require('path');
 const cds = require('../../../cds')
-const { copyFiles } = require('../../util/templateUtil')
-const commandUtil = require('../../util/commandUtil');
-const mvnArchetypes = require('../../util/mvnArchetypeUtil');
+const { copyFiles } = require('../../util/template')
+const commandUtil = require('../../../util/command');
+const mvnArchetypes = require('../../util/mvn');
 const term = require('../../../util/term');
 const { PROJECT_TYPE, OPTION_JAVA, URLS } = require('../../constants');
 

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

@@ -3,17 +3,25 @@
   "devDependencies": {
     "sqlite3": "^5"
   },
-  {{/cap.isNodejs}}
   "cds": {
+  {{/cap.isNodejs}}
     "requires": {
       {{#cap.for}}
       "[{{cap.for}}]": {
+      {{/cap.for}}
+      {{#cap.shortcut}}
         "db": "sqlite"
+      {{/cap.shortcut}}
+      {{^cap.shortcut}}
+        "db": {
+          "kind": "sqlite"
+        }
+      {{/cap.shortcut}}
+      {{#cap.for}}
       }
       {{/cap.for}}
-      {{^cap.for}}
-      "db": "sqlite"
-      {{/cap.for}}
     }
+  {{#cap.isNodejs}}
   }
+  {{/cap.isNodejs}}
 }

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

@@ -1,4 +1,6 @@
 const { join } = require('path')
+const cds = require('../../../cds')
+const { read } = cds.utils
 const { readProject } = require('../../util/projectReader')
 const { mergeJSON } = require('../../util/merge')
 
@@ -6,6 +8,8 @@ module.exports = class SQLiteTemplate extends require('../templateBase') {
 
     async run() {
       const projectDescriptor = await readProject(this.options)
-      await mergeJSON('package.json', join(__dirname, 'files', `package.json.hbs`), projectDescriptor)
+      const { configFile } = projectDescriptor.cap
+      projectDescriptor.cap.shortcut = !(await read(configFile)).cds?.requires?.db?.kind
+      await mergeJSON(configFile, join(__dirname, 'files', `package.json.hbs`), projectDescriptor)
     }
 }

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

@@ -0,0 +1,20 @@
+{
+  {{#cap.isNodejs}}
+  "dependencies": {
+    "@sap/cds-mtxs": "^1"
+  },
+  "cds": {
+  {{/cap.isNodejs}}
+    "requires": {
+      {{#cap.for}}
+      "[{{cap.for}}]": {
+      {{/cap.for}}
+        "toggles": true
+      {{#cap.for}}
+      }
+      {{/cap.for}}
+    }
+  {{#cap.isNodejs}}
+  }
+  {{/cap.isNodejs}}
+}

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

@@ -10,15 +10,9 @@ module.exports = class TogglesTemplate extends require('../templateBase') {
 
   async run() {
     const projectDescriptor = await readProject(this.options)
-    const { for: forProfile, isNodejs, isJava } = projectDescriptor.cap
-    if (isNodejs) {
-      const cdsTemplateFile = forProfile ? 'cds.package.json.hbs' : 'cds.package.json'
-      await mergeJSON('package.json', join(__dirname, 'files', cdsTemplateFile), projectDescriptor)
-      await sortDependencies('package.json')
-    } else if (isJava) {
-      const cdsTemplateFile = join(__dirname, 'files', forProfile ? 'cdsrc.json.hbs' : 'cdsrc.json')
-      await mergeJSON('.cdsrc.json', cdsTemplateFile, projectDescriptor)
-    }
+    const { isNodejs , configFile} = projectDescriptor.cap
+    await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), projectDescriptor)
+    if (isNodejs) await sortDependencies('package.json')
     await this.runDependentMerging()
   }
 }

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

@@ -0,0 +1,28 @@
+{
+  {{#cap.isNodejs}}
+  "dependencies": {
+    "@sap/xssec": "^3",
+    "passport": "^0"
+  },
+  "cds": {
+  {{/cap.isNodejs}}
+    "requires": {
+      {{#cap.for}}
+      "[{{cap.for}}]": {
+      {{/cap.for}}
+      {{#cap.shortcut}}
+        "auth": "xsuaa"
+      {{/cap.shortcut}}
+      {{^cap.shortcut}}
+        "auth": {
+          "kind": "xsuaa"
+        }
+      {{/cap.shortcut}}
+      {{#cap.for}}
+      }
+      {{/cap.for}}
+    }
+  {{#cap.isNodejs}}
+  }
+  {{/cap.isNodejs}}
+}

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

@@ -1,9 +1,10 @@
 const { join } = require('path')
+const cds = require('../../../cds')
+const { read } = cds.utils
 const { readProject } = require('../../util/projectReader')
 const { mergeJSON, mergeYAML } = require('../../util/merge')
-const { parseMd5File, writeMd5File } = require('../../util/md5Tracking')
-const { srvNode, srvJava, xsuaa, mtxSidecar4 } = require('../_merging/registry-mta')
-const { PROJECT_TYPE } = require('../../constants')
+const { parseMd5File, writeMd5File } = require('../../util/md5')
+const { srvNode4, srvJava4, xsuaa, mtxSidecar4 } = require('../_merging/registry-mta')
 
 module.exports = class XsuaaTemplate extends require('../templateBase') {
 
@@ -12,26 +13,10 @@ module.exports = class XsuaaTemplate extends require('../templateBase') {
     }
 
     async run() {
-        const { projectPath } = this
-        const templatePath = join(__dirname, 'files')
         const projectDescriptor = await readProject(this.options)
-        const projectType = this.getProjectType();
-        const { for: forProfile } = projectDescriptor.cap
-
-        if (projectType === PROJECT_TYPE.java) {
-            const cdsrcJSONPath = join(projectPath, '.cdsrc.json')
-            const cdsTemplateFile = forProfile ? 'cds.cdsrc.json.hbs' : 'cds.cdsrc.json'
-            const cdsTemplatePath = join(templatePath, cdsTemplateFile)
-            await mergeJSON(cdsrcJSONPath, cdsTemplatePath, projectDescriptor)
-        } else if (projectType === PROJECT_TYPE.nodejs) {
-            const packageJSONPath = join(projectPath, 'package.json')
-            const cdsTemplateFile = forProfile ? 'cds.package.json.hbs' : 'cds.package.json'
-            const cdsTemplatePath = join(templatePath, cdsTemplateFile)
-            await mergeJSON(packageJSONPath, cdsTemplatePath, projectDescriptor)
-            const dependenciesTemplatePath = join(templatePath, 'dependencies.package.json')
-            await mergeJSON(packageJSONPath, dependenciesTemplatePath)
-        }
-
+        const { configFile } = projectDescriptor.cap
+        projectDescriptor.cap.shortcut = !(await read(configFile)).cds?.requires?.auth?.kind
+        await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), projectDescriptor, { forceOverwrite: true })
         await this.runDependentMerging()
     }
 
@@ -55,7 +40,7 @@ module.exports = class XsuaaTemplate extends require('../templateBase') {
         await mergeJSON('xs-security.json', xsSecurity, projectDescriptor, mergingSemantics)
 
         if (hasMta) {
-            const srv = (isJava ? srvJava : srvNode)(srvPath)
+            const srv = (isJava ? srvJava4 : srvNode4)(srvPath)
             const additions = [srv, xsuaa]
             const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
             if (isMultitenant && isJava) additions.push(mtxSidecar)

package/lib/init/util/{md5Tracking.js → md5.js}

@@ -4,7 +4,7 @@ const { dirname, join } = path
 
 const crypto = require('crypto');
 const os = require('os');
-const { copyRenderedYAML } = require('./fsUtil');
+const { copyRenderedYAML } = require('../../util/fs');
 
 async function copyAndTrack(source, dest, context = {}, { force = false, projectDescriptor } = {}) {
     await mkdirp(dirname(dest));

package/lib/init/util/merge.js

@@ -1,6 +1,6 @@
 const YAML = require('@sap/cds-foss').yaml
 const { copy, read, write, exists } = require('../../cds').utils
-const { readYAML, writeYAML, readJSON } = require('./fsUtil')
+const { readYAML, writeYAML, readJSON } = require('../../util/fs')
 
 function _isObject(item) {
   return item && typeof item === 'object' && !Array.isArray(item)
@@ -36,6 +36,7 @@ async function sortDependencies(packageJSONPath) {
 async function mergeJSON(into, from, projectDescriptor, semantics) {
     const source = typeof from === 'string' ? await readJSON(from, projectDescriptor) : from
 
+
     if (typeof into === 'string' && !exists(into)) {
         return write(into, source, { spaces: 2 })
     }
@@ -56,14 +57,8 @@ async function mergeJSON(into, from, projectDescriptor, semantics) {
 }
 
 async function mergeYAML(into, from, projectDescriptor, semantics = {}) {
-    const target =
-        typeof into === 'string' ? await readYAML(into) :
-        into instanceof YAML.Document ? into :
-        new YAML.Document(into)
-    const source =
-        typeof from === 'string' ? await readYAML(from, projectDescriptor)
-        : from instanceof YAML.Document ? from :
-        new YAML.Document(from)
+    const target = typeof into === 'string' ? await readYAML(into) : into instanceof YAML.Document ? into : new YAML.Document(into)
+    const source = typeof from === 'string' ? await readYAML(from, projectDescriptor) : from instanceof YAML.Document ? from : new YAML.Document(from)
 
     if (!target || !target.contents) {
         if (typeof into === 'string' && typeof from === 'string') {

package/lib/init/util/{mvnArchetypeUtil.js → mvn.js}

@@ -44,6 +44,9 @@ class MvnArchetypeUtil {
         if (DEBUG) {
             params.set('-X'); params.set('-e');
         }
+        if (process.env.CI) {
+            params.set('--batch-mode');
+        }
 
         return Array.from(params, ([arg, val]) => val !== null && val !== undefined ? `${arg}=${val}` : arg)
     }

package/lib/init/util/projectReader.js

@@ -1,17 +1,9 @@
 const cds = require('../../cds')
 const { path, read, exists } = cds.utils
-const { BuildTaskFactory } = cds.build
+const { parseXml } = require('./xml')
 const P_LANGUAGE_JAVA = 'java'
 const P_LANGUAGE_NODEJS = 'nodejs'
 const DEFAULT_P_LANGUAGE = P_LANGUAGE_NODEJS
-const BUILD_TASK_JAVA = "java"
-const BUILD_TASK_JAVA_CF = "java-cf"
-const BUILD_TASK_NODEJS = "nodejs"
-const BUILD_TASK_NODE_CF = "node-cf"
-const BUILD_TASK_HANA = "hana"
-const BUILD_TASK_FIORI = "fiori"
-const BUILD_TASK_MTX = "mtx"
-const BUILD_TASK_MTX_SIDECAR = "mtx-sidecar"
 const DEBUG = /\b(y|all|cli)\b/.test(process.env.DEBUG) && console.debug
 const LOG = console
 
@@ -29,6 +21,7 @@ module.exports = new class ProjectReader {
         const cdsEnvVar = process.env.CDS_ENV
         process.env.CDS_ENV = profile
         try {
+            // REVISIT: this is invoked 5 times for cds add multitenancy
             return cds.env.for('cds')
         } finally {
             cdsEnvVar ? process.env.CDS_ENV = cdsEnvVar : delete process.env.CDS_ENV
@@ -59,6 +52,7 @@ module.exports = new class ProjectReader {
             requires: [],
             get hasRequires()    { return this.requires.length > 0 },
             get needsSidecar()   { return (options?.add.has('hana') || this.db.length > 0) && (this.isJava || !this.isMultitenant) },
+            get configFile()     { return exists('pom.xml') ? '.cdsrc.json' : 'package.json' },
             get isNodejs()       { return this.language === P_LANGUAGE_NODEJS },
             get isJava()         { return this.language === P_LANGUAGE_JAVA },
             get hasSidecar()     { return exists('mtx', 'sidecar') },
@@ -68,7 +62,6 @@ module.exports = new class ProjectReader {
             get hasXsuaa()       { return _hasFacet('xsuaa') },
             get hasAuditlog()    { return _hasFacet('auditlog') },
             get hasApprouter()   { return _hasFacet('approuter') },
-            get hasMessaging()   { return _hasFacet('enterprise-messaging') },
             get hasDestination() { return _hasFacet('destinations') },
             get hasHtml5Repo()   { return _hasFacet('html5-repo') },
             get hasMta()         { return _hasFacet('mta') },
@@ -80,49 +73,22 @@ module.exports = new class ProjectReader {
         cds.env // make sure env is initialized, otherwise we cannot set it (exotic case)
         cds.env = env
 
-        const nullLogger = { debug: () => { }, log: () => { }, warn: () => { }, error: () => { }, write: () => { } }
-
-        // no file path resolving as the directories might not exist - e.g. cds add will create the mtx/sidecar folder
-        // REVISIT: Leaner API from cds.build
-        const buildTasks = await new BuildTaskFactory(nullLogger, cds).getTasks({ root: cds.root, resolve: false, mta: false })
-
-        await Promise.all(buildTasks.map(async (task) => {
-            const srcPath = path.resolve(cds.root, task.src)
-            const srcFolder = path.basename(srcPath)
-            const relDestPath = path.join(env?.build?.target ?? "gen", task.dest || task.src)?.replace(/\\/g, '/')
-
-
-            switch (task.for) {
-                case BUILD_TASK_HANA:
-                    // check whether we have a hana service binding defined as a hana build task is returned by default for compatibility reasons if neither hana, nor sqlite has been defined
-                    if (this._hasHanaServiceBinding(env)) {
-                        cap.db.push({ path: relDestPath, name: srcFolder })
-                    }
-                    break
-
-                case BUILD_TASK_JAVA:
-                case BUILD_TASK_JAVA_CF:
-                    cap.language = P_LANGUAGE_JAVA
-                    cap.srvPath = relDestPath
-                    cap.srvName = srcFolder
-                    cap.srvExt = await this._getJavaExtDescriptor(srcPath)
-                    break
-
-                case BUILD_TASK_NODEJS:
-                case BUILD_TASK_NODE_CF:
-                    cap.srvPath = relDestPath
-                    cap.srvName = srcFolder
-                    break
+        // check whether we have a hana service binding defined as a hana build task is returned by default for compatibility reasons if neither hana, nor sqlite has been defined
+        if (this._hasHanaServiceBinding(env)) {
+            const dbFolder = env.folders.db.replace(/\/$/, '')
+            const relDbDestPath = path.join(env.build.target, dbFolder).replace(/\\/g, '/')
+            cap.db.push({ path: relDbDestPath, name: dbFolder })
+        }
 
-                case BUILD_TASK_FIORI:
-                case BUILD_TASK_MTX:
-                case BUILD_TASK_MTX_SIDECAR:
-                    break
+        const srvFolder = env.folders.srv.replace(/\/$/, '')
+        const relSrvDestPath = path.join(env.build.target, srvFolder).replace(/\\/g, '/')
+        cap.srvPath = relSrvDestPath
+        cap.srvName = srvFolder
 
-                default:
-                    LOG.warn(`Unknown build task type ${task.for}`)
-            }
-        }))
+        if (env['project-nature'] === 'java') {
+            cap.language = P_LANGUAGE_JAVA
+            cap.srvExt = await this._getJavaExtDescriptor(path.resolve(cds.root, srvFolder))
+        }
 
         // setting app name, app description...
         await this._setAppDetails(cap)
@@ -139,7 +105,7 @@ module.exports = new class ProjectReader {
      */
     async _getJavaExtDescriptor(srcPath) {
         // by default spring-boot:repackage is used creating an executable jar archive
-        const pomJson = await this._parseXml(path.join(srcPath, 'pom.xml'))
+        const pomJson = await parseXml(path.join(srcPath, 'pom.xml'))
         if (pomJson) {
             const dependencies = pomJson?.project?.dependencies?.[0]?.dependency
             const isOldJavaRuntime = [...dependencies].some(d => /com\.sap\.cloud\.servicesdk/.test(d?.groupId?.[0]))
@@ -172,7 +138,7 @@ module.exports = new class ProjectReader {
             const pomXmlPath = path.join(cds.root, 'pom.xml')
             try {
                 if (exists(pomXmlPath)) {
-                    const pomJson = await this._parseXml(pomXmlPath)
+                    const pomJson = await parseXml(pomXmlPath)
                     const [artifactId] = pomJson?.project?.artifactId ?? []
                     const [description] = pomJson?.project?.description ?? []
                     let [version] = pomJson?.project?.version ?? []
@@ -228,6 +194,12 @@ module.exports = new class ProjectReader {
         cap.appVersion = cap.appVersion ?? '1.0.0'
     }
 
+    _hasHanaServiceBinding(env) {
+        const db = env?.requires?.db
+        return db?.kind === 'hana' || db?.kind === 'sql' && (db?.dialect === 'hana' || db?.use === 'hana')
+    }
+
+    // REVISIT: Only used for orphaned cds add cf-manifest. Still needed?
     _setResourceDependencies(env, cap) {
         for (const [key, require] of Object.entries(env.requires)) {
             if (key === 'sql' || key === 'sqlite' || key === 'hana') continue // ignore abstract helper definitions like sql
@@ -236,11 +208,6 @@ module.exports = new class ProjectReader {
         }
     }
 
-    _hasHanaServiceBinding(env) {
-        const db = env?.requires?.db
-        return db?.kind === 'hana' || db?.kind === 'sql' && (db?.dialect === 'hana' || db?.use === 'hana')
-    }
-
     _getReqResource(key, reqEntry, cap) {
         const { kind, dialect, use, vcap = {}, multiTenant } = reqEntry
         const { appName, isMultitenant } = cap
@@ -282,53 +249,4 @@ module.exports = new class ProjectReader {
         }
         return resource.service ? resource : null
     }
-
-    /**
-     * Parse a given string containing xml
-     * used to remove the _text object from converted json i.e. from xml-js.
-     * example : converted json has "groupId":[{"_text":["customer"]}]
-     * and after removing textAttributes (using this function): "groupId":["customer"]
-     * @param xml string to parse
-     * @returns parsed json object
-     */
-    async _parseXml(pomXmlPath) {
-        const xmljs = require('xml-js');
-        const xmljsParse = {};
-        try {
-            const xml = await read(pomXmlPath, 'utf-8')
-            xmljsParse.project = JSON.parse(await xmljs.xml2json(xml, {
-                ignoreComment: true,
-                compact: true,
-                alwaysArray: true,
-                ignoreDeclaration: true,
-                attributesKey: "$",
-                trim: true,
-                nativeType: true,
-                ignoreInstruction: true,
-                ignoreCdata: true,
-                ignoreDoctype: true,
-                textFn: this._removeTextAttributes
-            })).project[0];
-            return xmljsParse;
-        } catch (e) {
-            LOG.error(`Failed to read file ${pomXmlPath} - skip pom.xml data`)
-            LOG.error(e)
-        }
-    }
-
-    /*
-        Remove the _text attributes and convert value it into array
-        input : "groupId":[{"_text":["customer"]}]
-        output: "groupId":["customer"]
-    */
-    _removeTextAttributes(value, parentElement) {
-        const parentKeys = Object.keys(parentElement._parent);
-        const key = parentKeys[parentKeys.length - 1];
-        const _text = parentElement._parent[key];
-        if (_text.length > 0) {
-            _text[_text.length - 1] = value;
-        } else {
-            parentElement._parent[key] = value;
-        }
-    }
 }