@eui/tools 4.21.15 → 4.21.18

package/.version.properties

@@ -1 +1 @@
-4.21.15
+4.21.18

package/CHANGELOG.md

@@ -1,3 +1,34 @@
+## 4.21.18 (2022-04-22)
+
+##### Bug Fixes
+
+* **other:**
+  * support to support develop merge check versions - EUI-4106 [EUI-4106](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4106)  ([dbec66eb](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/dbec66ebdaecbbe05f7c1c3418a010658c3c28b2))
+
+* * *
+* * *
+## 4.21.17 (2022-04-20)
+
+##### Bug Fixes
+
+* **other:**
+  * adapted devops-metadata not using shallow clone on release - EUI-4106 [EUI-4106](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4106)  ([aa08b8b7](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/aa08b8b7eb890740575ed3ab72f4a5c8aa626095))
+
+* * *
+* * *
+## 4.21.16 (2022-04-20)
+
+##### Chores
+
+* **other:**
+  * EUI-5854 Update Camunda Maven Template [EUI-5854](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-5854)  ([3c1233db](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/3c1233db5b5d62defbfef2804398216c894762dc))
+##### Bug Fixes
+
+* **typo:**
+  * EUI-5854 property missing parents [EUI-5854](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-5854)  ([e9241580](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/e9241580849bfe194ce3dadf16d9da1b7bdbb443))
+
+* * *
+* * *
 ## 4.21.15 (2022-04-20)
 
 ##### Bug Fixes

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "4.21.15",
+    "version": "4.21.18",
     "tag": "latest",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",

package/sandbox.js

@@ -696,7 +696,15 @@ const translationUtils = require('./scripts/utils/pre-build/translations/transla
 
 Promise.resolve()
   .then(() => {
-     return initUtils.processResolutionsForNodeVersion();
+    //  return initUtils.processResolutionsForNodeVersion();
+    const b1 = 'support/7.x';
+    const b2 = 'support/develop-10.x';
+
+    const v1 = b1.split('/')[1];
+    const v2 = b2.split('-')[1];
+
+    console.log(v1, v2);
+
   })
 
 // return Promise.resolve()

package/scripts/csdr/install/local-dev.js

@@ -26,7 +26,7 @@ module.exports.install = (pkg) => {
 
     // cloning devops metadata repo
     .then(() => {
-      return metadataUtils.common.cloneMetadataRepo();
+      return metadataUtils.common.cloneMetadataRepo(true);
     })
 
 

package/scripts/csdr/metadata/common.js

@@ -16,7 +16,7 @@ const innerAppHistory = require('./app-history');
 const innerAppEnvs = require('./app-envs');
 
 
-module.exports.cloneMetadataRepo = () => {
+module.exports.cloneMetadataRepo = (noHistory = false) => {
   const configOptions = configUtils.global.getConfigOptions();
 
   tools.logTitle('Cloning devops metadata repo');
@@ -28,7 +28,7 @@ module.exports.cloneMetadataRepo = () => {
   } else {
     return Promise.resolve()
       .then(() => {
-        return gitUtils.cloneRepo(configOptions.DEVOPS_METADATA_REPOSITORY, configOptions.DEVOPS_METADATA_PATH, false, true);
+        return gitUtils.cloneRepo(configOptions.DEVOPS_METADATA_REPOSITORY, configOptions.DEVOPS_METADATA_PATH, false, noHistory);
       })
       .catch((e) => {
         throw e;

package/scripts/csdr/templates/maven-settings.template

@@ -44,6 +44,11 @@
             <username>@user.name@</username>
             <password>@user.password@</password>
         </server>
+		<server>
+     		<id>camunda-bpm-shared-services</id>
+    		<username>@user.name@</username>
+    		<password>@user.password@</password>
+		</server>
     </servers>
 
     <mirrors>
@@ -146,6 +151,14 @@
 					<releases><enabled>true</enabled></releases>
 				</repository>
 
+		      <repository>
+                   <id>camunda-bpm-shared-services</id>
+                   <name>Camunda BPM Shared Services</name>
+                   <url>https://webgate.ec.europa.eu/CITnet/nexus/repository/camunda-shared-services/</url>
+                   <releases><enabled>true</enabled></releases>
+                   <snapshots><enabled>false</enabled></snapshots>
+              </repository>
+      
             </repositories>
         </profile>
     </profiles>

package/scripts/utils/git-utils.js

@@ -245,30 +245,37 @@ const mergeSupportToSupportDevelop = (pkg, folder, supportBranch, supportSnapsho
   if (dryRun) {
     tools.logInfo('DRY-RUN: skipping merge support to supportDevelop');
     return Promise.resolve();
+  }
 
-  } else {
+  const supportBranchVersion = supportBranch.split('/')[1];
+  const supportSnapshotBranchVersion = supportSnapshotBranch.split('-')[1];
 
-    if (pkg && pkg.build && pkg.build.masterBranchOnly) {
-      tools.logInfo('Merge skipped project config set to master branch only');
-      return Promise.resolve();
+  if (supportBranchVersion !== supportSnapshotBranchVersion) {
+    tools.logInfo('skipping... support version and support snapshot versions are different');
+    tools.logInfo(`[${supportBranchVersion}] vs [${supportSnapshotBranchVersion}]`);
+    return Promise.resolve();
+  }
 
-    } else {
-      return Promise.resolve()
-        .then(() => {
-          execa.shellSync(`git fetch origin`, { cwd: folder });
-          execa.shellSync(`git checkout ${supportSnapshotBranch}`, { cwd: folder });
-          execa.shellSync(`git merge origin/${supportSnapshotBranch}`, { cwd: folder });
-          execa.shellSync(`git merge -X theirs ${supportBranch}`, { cwd: folder });
-          execa.shellSync(`git push origin ${supportSnapshotBranch}`, { cwd: folder });
-          execa.shellSync(`git checkout ${supportBranch}`, { cwd: folder });
-        })
-        .then(() => {
-          tools.logSuccess();
-        })
-        .catch((e) => {
-          throw new Error(`Error trying merging ${supportBranch} to ${supportSnapshotBranch} on ${folder}`);
-        })
-    }
+  if (pkg && pkg.build && pkg.build.masterBranchOnly) {
+    tools.logInfo('Merge skipped project config set to master branch only');
+    return Promise.resolve();
+
+  } else {
+    return Promise.resolve()
+      .then(() => {
+        execa.shellSync(`git fetch origin`, { cwd: folder });
+        execa.shellSync(`git checkout ${supportSnapshotBranch}`, { cwd: folder });
+        execa.shellSync(`git merge origin/${supportSnapshotBranch}`, { cwd: folder });
+        execa.shellSync(`git merge -X theirs ${supportBranch}`, { cwd: folder });
+        execa.shellSync(`git push origin ${supportSnapshotBranch}`, { cwd: folder });
+        execa.shellSync(`git checkout ${supportBranch}`, { cwd: folder });
+      })
+      .then(() => {
+        tools.logSuccess();
+      })
+      .catch((e) => {
+        throw new Error(`Error trying merging ${supportBranch} to ${supportSnapshotBranch} on ${folder}`);
+      })
   }
 }
 

package/scripts/utils/pre-build/injection/routes-replacement.js

@@ -8,6 +8,10 @@ const configUtils = require('../../../csdr/config/config-utils');
 
 
 const getEnvTarget = (envTarget, build) => {
+  if (!envTarget) {
+    throw 'ENV_TARGET_NOT_FOUND';
+  }
+
   let envTargetFinal = envTarget.toLowerCase();
 
   if (build) {