diff options
| author |   JulienBe <julien.bertozzi@intl.att.com> | 2020-10-28 11:50:25 -0400 |
|---|---|---|
| committer | JulienBe <julien.bertozzi@intl.att.com> | 2021-02-23 10:57:28 +0100 |
| commit | b485c37b36ddb3ab5e8085c009b26e97c8e62d74 (patch) | |
| tree | dcea5bd91cf72076295d46f430c725d13b42f275 /openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl | |
| parent | 72b29baac0c1f08b610fd4daf2078b43ee74b3d8 (diff) | |
Upgrade Vulnerable Direct Dependencies [snakeyaml]
Change-Id: I84417ab3d4f18634be519b837a34d1f1e774ceff
Signed-off-by: amohamad <a.mohamad@queensu.ca>
Issue-ID: SDC-3051
Updated MVN dependencies in the respective pom.xml files
Updated the signature of some methods to match new version 1.26
Modified test cases to match the new wording of exceptions
Still working on troublshooting other failing test cases
Change-Id: Ifc796574e6d8d4e4fc707db04944d83427b5dbe6
Signed-off-by: amohamad <a.mohamad@queensu.ca>
Signed-off-by: JulienBe <julien.bertozzi@intl.att.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl')
2 files changed, 7 insertions, 4 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/pom.xml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/pom.xml index 351e163336..c35bbc1f0f 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/pom.xml @@ -24,9 +24,8 @@ <parent> <groupId>org.openecomp.sdc</groupId> - <artifactId>openecomp-sdc-lib</artifactId> + <artifactId>openecomp-sdc-enrichment-lib</artifactId> <version>1.8.1-SNAPSHOT</version> - <relativePath>../..</relativePath> </parent> <dependencies> diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/java/org/openecomp/sdc/enrichment/impl/tosca/BaseToscaEnrichmentTest.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/java/org/openecomp/sdc/enrichment/impl/tosca/BaseToscaEnrichmentTest.java index a34f6913c3..cf9ec3c49d 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/java/org/openecomp/sdc/enrichment/impl/tosca/BaseToscaEnrichmentTest.java +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/java/org/openecomp/sdc/enrichment/impl/tosca/BaseToscaEnrichmentTest.java @@ -174,8 +174,8 @@ public class BaseToscaEnrichmentTest { name = entry.getName() .substring(entry.getName().lastIndexOf(File.separator) + 1, entry.getName().length()); if (expectedResultFileNameSet.contains(name)) { - expected = new String(expectedResultMap.get(name)).trim().replace("\r", ""); - actual = new String(FileUtils.toByteArray(zis)).trim().replace("\r", ""); + expected = sanitize(new String(expectedResultMap.get(name))); + actual = sanitize(new String(FileUtils.toByteArray(zis))); assertEquals("difference in file: " + name, expected, actual); expectedResultFileNameSet.remove(name); @@ -187,4 +187,8 @@ public class BaseToscaEnrichmentTest { } assertEquals(0, expectedResultFileNameSet.size()); } + + private static String sanitize(String s) { + return s.trim().replaceAll("\n", "").replaceAll("\r", "").replaceAll("\\s{2,}", " ").trim(); + } } |