From 72c75321cef748c58940409db314a93da81e68ad Mon Sep 17 00:00:00 2001
From: Tsvetan Tsokov <tsvetan.tsokov@sap.com>
Date: Wed, 14 Nov 2018 18:06:56 +0200
Subject: [PATCH 1/2] Rename modules name in MTA descriptors

---
 cloud-hdi-zdm-ref-app.blue/mta-jee/mta.yaml  | 6 +++---
 cloud-hdi-zdm-ref-app.green/mta-jee/mta.yaml | 6 +++---
 config.mtaext                                | 2 +-
 mtad.yaml                                    | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/cloud-hdi-zdm-ref-app.blue/mta-jee/mta.yaml b/cloud-hdi-zdm-ref-app.blue/mta-jee/mta.yaml
index c171452..54868dd 100644
--- a/cloud-hdi-zdm-ref-app.blue/mta-jee/mta.yaml
+++ b/cloud-hdi-zdm-ref-app.blue/mta-jee/mta.yaml
@@ -3,7 +3,7 @@ ID: cloud-hdi-zdm-ref-app
 version: 0.0.1
 
 modules:
-  - name: cloud-hdi-zdm-ref-app-backend
+  - name: backend
     type: java
     path: ../cloud-hdi-zdm-ref-app.backend.jee.blue
     properties:
@@ -15,9 +15,9 @@ modules:
       buildpack: sap_java_buildpack
     requires:
       - name: hdi-container
-      - name: cloud-hdi-zdm-ref-app-db
+      - name: db
 
-  - name: cloud-hdi-zdm-ref-app-db
+  - name: db
     type: com.sap.xs.hdi
     path: ../cloud-hdi-zdm-ref-app.db.blue
     parameters:
diff --git a/cloud-hdi-zdm-ref-app.green/mta-jee/mta.yaml b/cloud-hdi-zdm-ref-app.green/mta-jee/mta.yaml
index 0c476ff..52d3dda 100644
--- a/cloud-hdi-zdm-ref-app.green/mta-jee/mta.yaml
+++ b/cloud-hdi-zdm-ref-app.green/mta-jee/mta.yaml
@@ -3,7 +3,7 @@ ID: cloud-hdi-zdm-ref-app
 version: 0.0.1
 
 modules:
-  - name: cloud-hdi-zdm-ref-app-backend
+  - name: backend
     type: java
     path: ../cloud-hdi-zdm-ref-app.backend.jee.green
     properties:
@@ -15,9 +15,9 @@ modules:
       buildpack: sap_java_buildpack
     requires:
       - name: hdi-container
-      - name: cloud-hdi-zdm-ref-app-db
+      - name: db
 
-  - name: cloud-hdi-zdm-ref-app-db
+  - name: db
     type: com.sap.xs.hdi
     path: ../cloud-hdi-zdm-ref-app.db.green
     parameters:
diff --git a/config.mtaext b/config.mtaext
index 25e1a8f..eebf3d2 100644
--- a/config.mtaext
+++ b/config.mtaext
@@ -4,6 +4,6 @@ ID: cloud-hdi-zdm-ref-app.config
 extends: cloud-hdi-zdm-ref-app
 
 modules:
-  - name: cloud-hdi-zdm-ref-app-db
+  - name: db
     parameters:
       zdm-mode: true
diff --git a/mtad.yaml b/mtad.yaml
index 823c539..ed7e388 100644
--- a/mtad.yaml
+++ b/mtad.yaml
@@ -3,7 +3,7 @@ ID: cloud-hdi-zdm-ref-app
 version: 0.0.1
 
 modules:
-  - name: cloud-hdi-zdm-ref-app-backend
+  - name: backend
     type: java.tomee
     path: cloud-hdi-zdm-ref-app.backend/target/cloud-hdi-zdm-ref-app-backend.war
     parameters:
@@ -13,9 +13,9 @@ modules:
       SET_LOGGING_LEVEL: "{OpenEJB: DEBUG, OpenEJB.options: DEBUG, OpenEJB.server: DEBUG, OpenEJB.startup: DEBUG, OpenEJB.startup.service: DEBUG, OpenEJB.startup.config: DEBUG, OpenEJB.hsql: DEBUG, openjpa.Tool: DEBUG, openjpa.Runtime: INFO, openjpa.Remote: DEBUG, openjpa.DataCache: DEBUG, openjpa.MetaData: DEBUG, openjpa.Enhance: DEBUG, openjpa.Query: DEBUG, openjpa.jdbc.SQL: DEBUG, openjpa.jdbc.SQLDiag: DEBUG, openjpa.jdbc.JDBC: DEBUG, openjpa.jdbc.Schema: DEBUG}"
     requires:
       - name: hdi-container
-      - name: cloud-hdi-zdm-ref-app-db
+      - name: db
 
-  - name: cloud-hdi-zdm-ref-app-db
+  - name: db
     type: com.sap.xs.hdi
     path: cloud-hdi-zdm-ref-app.db/
     requires:

From 6b41f68ba87728fd9d7e4c3e63a5c2613da56682 Mon Sep 17 00:00:00 2001
From: Tsvetan Tsokov <tsvetan.tsokov@sap.com>
Date: Fri, 16 Nov 2018 11:59:56 +0200
Subject: [PATCH 2/2] Increase version of @sap/hdi-deploy

Jira: LMCROSSITXSADEPLOY-1259
---
 .../cloud-hdi-zdm-ref-app.db.blue/package.json                  | 2 +-
 .../cloud-hdi-zdm-ref-app.db.green/package.json                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cloud-hdi-zdm-ref-app.blue/cloud-hdi-zdm-ref-app.db.blue/package.json b/cloud-hdi-zdm-ref-app.blue/cloud-hdi-zdm-ref-app.db.blue/package.json
index 3793755..e274ef7 100644
--- a/cloud-hdi-zdm-ref-app.blue/cloud-hdi-zdm-ref-app.db.blue/package.json
+++ b/cloud-hdi-zdm-ref-app.blue/cloud-hdi-zdm-ref-app.db.blue/package.json
@@ -1,7 +1,7 @@
 {
   "name": "deploy",
   "dependencies": {
-    "@sap/hdi-deploy": "3.6.0"
+    "@sap/hdi-deploy": ">=3.6.0"
   },
   "scripts": {
     "start": "node node_modules/@sap/hdi-deploy/"
diff --git a/cloud-hdi-zdm-ref-app.green/cloud-hdi-zdm-ref-app.db.green/package.json b/cloud-hdi-zdm-ref-app.green/cloud-hdi-zdm-ref-app.db.green/package.json
index 3793755..e274ef7 100644
--- a/cloud-hdi-zdm-ref-app.green/cloud-hdi-zdm-ref-app.db.green/package.json
+++ b/cloud-hdi-zdm-ref-app.green/cloud-hdi-zdm-ref-app.db.green/package.json
@@ -1,7 +1,7 @@
 {
   "name": "deploy",
   "dependencies": {
-    "@sap/hdi-deploy": "3.6.0"
+    "@sap/hdi-deploy": ">=3.6.0"
   },
   "scripts": {
     "start": "node node_modules/@sap/hdi-deploy/"