Merge pull request #17 from axa-group/poveden/updates

Poveden/updates

Author: poveden

CHANGELOG.md

@@ -4,7 +4,20 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
-## [1.1.2](https://github.com/axa-group/arm-template-merge/compare/v1.1.0...v1.1.1) — 2019-08-09
+## [1.1.3](https://github.com/axa-group/arm-template-merge/compare/v1.1.2...v1.1.3) — 2019-09-25
+
+### Security
+
+- Update `npm` dependencies to fix:
+  - [CVE-2019-15657](https://nvd.nist.gov/vuln/detail/CVE-2019-15657)
+  - [CVE-2019-10746](https://nvd.nist.gov/vuln/detail/CVE-2019-10746)
+  - [CVE-2019-10747](https://nvd.nist.gov/vuln/detail/CVE-2019-10747)
+
+### Changed
+
+- Update license's legal entity.
+
+## [1.1.2](https://github.com/axa-group/arm-template-merge/compare/v1.1.1...v1.1.2) — 2019-08-09
 
 ### Security
 

LICENSE.md

@@ -1,6 +1,6 @@
 # MIT License
 
-Copyright (c) AXA Partners
+Copyright (c) AXA Assistance France
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

bin/arm-template-merge

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 
 /**
- * Copyright (c) AXA Partners
+ * Copyright (c) AXA Assistance France
  *
- * Licensed under the AXA Partners License (the "License"); you
+ * Licensed under the AXA Assistance France License (the "License"); you
  * may not use this file except in compliance with the License.
  * A copy of the License can be found in the LICENSE.md file distributed
  * together with this file.
@@ -111,7 +111,7 @@ async function mergeTemplates(inGlobs, outFile) {
 
   const mergedTemplate = {};
 
-  const mergeOps = inFiles.map(inFile => mergeTemplateWith(mergedTemplate, inFile));
+  const mergeOps = inFiles.map((inFile) => mergeTemplateWith(mergedTemplate, inFile));
 
   await Promise.all(mergeOps);
 

index.js

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) AXA Partners
+ * Copyright (c) AXA Assistance France
  *
- * Licensed under the AXA Partners License (the "License"); you
+ * Licensed under the AXA Assistance France License (the "License"); you
  * may not use this file except in compliance with the License.
  * A copy of the License can be found in the LICENSE.md file distributed
  * together with this file.

jest.config.js

@@ -5,7 +5,7 @@ module.exports = {
   coveragePathIgnorePatterns: ['<rootDir>/test/'],
   reporters: [
     'default',
-    ['jest-junit', { output: 'TestResults/testresults.xml' }],
+    ['jest-junit', { outputDirectory: 'TestResults', outputName: 'testresults.xml' }],
   ],
   coverageReporters: ['text', 'html', 'cobertura'],
 };

lib/merge.js

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) AXA Partners
+ * Copyright (c) AXA Assistance France
  *
- * Licensed under the AXA Partners License (the "License"); you
+ * Licensed under the AXA Assistance France License (the "License"); you
  * may not use this file except in compliance with the License.
  * A copy of the License can be found in the LICENSE.md file distributed
  * together with this file.
@@ -26,7 +26,7 @@
 module.exports = function merge(a, b, name, level = 0, maxLevel = 1) {
   if (level <= maxLevel && typeof a === 'object' && typeof b === 'object') {
     if (Array.isArray(a)) {
-      return a.concat(b.filter(x => !a.some(y => JSON.stringify(x) === JSON.stringify(y))));
+      return a.concat(b.filter((x) => !a.some((y) => JSON.stringify(x) === JSON.stringify(y))));
     }
     Object.keys(b).forEach((key) => {
       a[key] = merge(a[key], b[key], name ? `${name}.${key}` : key, level + 1, maxLevel);