Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Update to AtlasMap 1.42.9 #6907

Merged
merged 1 commit into from Oct 14, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/integration/bom/pom.xml
Expand Up @@ -29,7 +29,7 @@
<properties>
<spring-boot.version>1.5.13.RELEASE</spring-boot.version>
<camel.version>2.21.0.fuse-750029</camel.version>
<atlasmap.version>1.42.6</atlasmap.version>
<atlasmap.version>1.42.9</atlasmap.version>
<jackson.databind.version>2.8.11.3</jackson.databind.version>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion app/pom.xml
Expand Up @@ -37,7 +37,7 @@
<syndesis.version>${project.version}</syndesis.version>

<!-- Atlasmap version -->
<atlasmap.version>1.42.6</atlasmap.version>
<atlasmap.version>1.42.9</atlasmap.version>

<!-- Image names -->
<image.s2i>syndesis/syndesis-s2i:%l</image.s2i>
Expand Down
2 changes: 1 addition & 1 deletion app/ui-react/packages/atlasmap-assembly/package.json
Expand Up @@ -91,7 +91,7 @@
"@angular/platform-browser": "7.2.7",
"@angular/platform-browser-dynamic": "7.2.7",
"@angular/router": "7.2.7",
"@atlasmap/atlasmap-data-mapper": "^1.42.6",
"@atlasmap/atlasmap-data-mapper": "^1.42.9",
"@types/jasmine": "^3.3.9",
"@types/jasmine-jquery": "^1.5.32",
"@types/jasminewd2": "^2.0.3",
Expand Down
Expand Up @@ -141,11 +141,9 @@ export class DataMapperHostComponent implements OnInit, OnDestroy, OnChanges {
}

if (this.initialMappings) {
try {
MappingSerializer.deserializeMappingServiceJSON(JSON.parse(this.initialMappings), c);
} catch (err) {
// TODO popup or error alert? At least catch this so we initialize
console.error(err);
c.preloadedMappingJson = this.initialMappings;
if (c.isTraceEnabled()) {
c.logger.trace(`Added mapping definition: ${this.initialMappings}`)
}
}

Expand Down
8 changes: 4 additions & 4 deletions app/ui-react/yarn.lock
Expand Up @@ -313,10 +313,10 @@
dependencies:
tslib "^1.9.0"

"@atlasmap/atlasmap-data-mapper@^1.42.6":
version "1.42.6"
resolved "https://registry.yarnpkg.com/@atlasmap/atlasmap-data-mapper/-/atlasmap-data-mapper-1.42.6.tgz#72fb94d422a222979152e80278e1585d26ce94cf"
integrity sha512-m2xkD097K6D+GM+eVDh2rjMO3dHXMMp6d8PN3CKZdy9oQzlggX/Oj6abik+l8s1R2PyR1uya4DIWQh80t4yD8w==
"@atlasmap/atlasmap-data-mapper@^1.42.9":
version "1.42.9"
resolved "https://registry.yarnpkg.com/@atlasmap/atlasmap-data-mapper/-/atlasmap-data-mapper-1.42.9.tgz#0a34a9201fa1a597ffb6be08f505713167955522"
integrity sha512-eq9FnJOFDTLkpaCphyAduo31sVcmU8xyo9IhtkN5OH2U1sD2yLLgGjxDtHIDLBVfq2tQRQhmzSVkj7JN1oDaTQ==
dependencies:
tslib "^1.9.0"

Expand Down