@eui/tools 5.1.9 → 5.1.12

package/.version.properties

@@ -1 +1 @@
-5.1.9
+5.1.12

package/CHANGELOG.md

@@ -1,7 +1,29 @@
-## 5.1.9 (2022-04-28)
+## 5.1.12 (2022-04-28)
 
 ##### Bug Fixes
 
+* **other:**
+  * wrong non-snapshots dependencies resolutions - EUI-5632 [EUI-5632](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-5632)  ([b151196a](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/b151196a9cb6de530b035cf0d88d03ed80744eaa))
+
+* * *
+* * *
+## 5.1.11 (2022-04-28)
+
+##### Bug Fixes
+
+* **other:**
+  * app getCurrent version wrong declaration - EUI-5632 [EUI-5632](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-5632)  ([28321e68](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/28321e68886f814f49462dec3bf6bfd60fc63088))
+
+* * *
+* * *
+## 5.1.10 (2022-04-28)
+
+##### Chores
+
+* **other:**
+  * force rebuild - EUI-5632 [EUI-5632](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-5632)  ([ce8a71a4](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/ce8a71a4d01b70b12b40851cdb62a59ea481050c))
+##### Bug Fixes
+
 * **other:**
   * wrong git package call - EUI-5632 [EUI-5632](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-5632)  ([a8dfa84b](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/a8dfa84bec87bf6f3bf995aee6e1933c2fc8c30b))
 

package/package.json

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

package/sandbox.js

@@ -823,20 +823,29 @@ const versionUtils = require('./scripts/csdr/version/version-utils');
 //     console.log(metadata);
 //   })
 
-Promise.resolve()
-// getting root composite - dependencies-composite.json content
-.then(() => {
-  const compositeJsonFile = path.join(process.cwd(), 'apps/eui-showcase-dev-guide', 'dependencies-composite.json');
-  var compositeDeps = tools.getJsonFileContent(compositeJsonFile) || {};
-
-  if (compositeDeps.dependencies) {
-    return compositeDeps.dependencies;
-  } else {
-    return compositeDeps;
-  }
-})
-.then((deps) => {
-  console.log(deps);
-})
+// Promise.resolve()
+// // getting root composite - dependencies-composite.json content
+// .then(() => {
+//   const compositeJsonFile = path.join(process.cwd(), 'apps/eui-showcase-dev-guide', 'dependencies-composite.json');
+//   var compositeDeps = tools.getJsonFileContent(compositeJsonFile) || {};
+
+//   if (compositeDeps.dependencies) {
+//     return compositeDeps.dependencies;
+//   } else {
+//     return compositeDeps;
+//   }
+// })
+// .then((deps) => {
+//   console.log(deps);
+// })
+
 
+const pkg = configUtils.packages.getPackage('opsys-epc-esub-bo-ui', true);
 
+Promise.resolve()
+  .then(() => {
+    return metadataUtils.package.getPackageVersionsByMajor(pkg, '10', false)
+  })
+  .then((versions) => {
+    console.log(versions);
+  })

package/scripts/csdr/metadata/package.js

@@ -430,6 +430,12 @@ module.exports.getPackageVersionsByMajor = (pkg, major, isMaster) => {
     } else {
       versions = versions.filter(v => v.version.indexOf('snapshot') !== -1);
       tools.logInfo(`----> ${versions.length} metadata versions found including snapshots`);
+
+      if (versions.length === 0) {
+        versions = pkgVersions.filter(v => v.version.split('.')[0] === major);
+        versions = versions.filter(v => v.version.indexOf('snapshot') === -1);
+        tools.logInfo(`----> ${versions.length} metadata versions non-master release for major`);
+      }
     }
 
     return versions;

package/scripts/csdr/version/app-default.js

@@ -10,6 +10,8 @@ const moment = require('moment');
 // local
 const tools = require('../../utils/tools');
 
+// inner
+const appCommon = require('./app-common');
 
 // fetch args
 const { dryRun } = tools.getArgs();
@@ -21,7 +23,7 @@ const { dryRun } = tools.getArgs();
 module.exports.getNewVersion = (project, isSnapshot, isSupportBranch) => {
   return Promise.resolve()
     .then(() => {
-      return this.getCurrentVersion(project);
+      return appCommon.getCurrentVersion(project);
     })
     .then((version) => {
       // if the project has specific version strategy defined