Repository: ignite Updated Branches: refs/heads/ignite-2.1 e786beb64 -> 478d3b5d3
IGNITE-5726 Web Console: Fixed duplication of dependencies in maven project. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c5966dd3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c5966dd3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c5966dd3 Branch: refs/heads/ignite-2.1 Commit: c5966dd33e12d9e1855c165854b965a8633b1869 Parents: e786beb Author: Andrey Novikov <anovi...@gridgain.com> Authored: Tue Jul 11 17:02:56 2017 +0700 Committer: Andrey Novikov <anovi...@gridgain.com> Committed: Tue Jul 11 17:02:56 2017 +0700 ---------------------------------------------------------------------- .../app/modules/configuration/generator/Maven.service.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c5966dd3/modules/web-console/frontend/app/modules/configuration/generator/Maven.service.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/configuration/generator/Maven.service.js b/modules/web-console/frontend/app/modules/configuration/generator/Maven.service.js index 700da4a..81d7d10 100644 --- a/modules/web-console/frontend/app/modules/configuration/generator/Maven.service.js +++ b/modules/web-console/frontend/app/modules/configuration/generator/Maven.service.js @@ -39,7 +39,7 @@ export default class IgniteMavenGenerator { } addDependency(deps, groupId, artifactId, version, jar) { - deps.add({groupId, artifactId, version, jar}); + deps.push({groupId, artifactId, version, jar}); } pickDependency(deps, key, dfltVer, igniteVer) { @@ -78,7 +78,7 @@ export default class IgniteMavenGenerator { dependenciesSection(sb, deps) { sb.startBlock('<dependencies>'); - deps.forEach((dep) => { + _.forEach(deps, (dep) => { sb.startBlock('<dependency>'); this.addProperty(sb, 'groupId', dep.groupId); @@ -154,8 +154,8 @@ export default class IgniteMavenGenerator { collectDependencies(cluster, targetVer) { const igniteVer = targetVer.ignite; - const deps = new Set(); - const storeDeps = new Set(); + const deps = []; + const storeDeps = []; this.addDependency(deps, 'org.apache.ignite', 'ignite-core', igniteVer); @@ -204,7 +204,7 @@ export default class IgniteMavenGenerator { if (cluster.logger && cluster.logger.kind) this.pickDependency(deps, cluster.logger.kind, igniteVer); - return new Set([...deps, ...storeDeps]); + return _.uniqWith(deps.concat(...storeDeps), _.isEqual); } /**